diff options
35 files changed, 0 insertions, 118 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c index 135b3bd..6ed923f 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -506,7 +506,6 @@ configure_item_cursor (GtkToolItem *item, } } - static void configure_item_tooltip (GtkToolItem *item) { @@ -522,7 +521,6 @@ configure_item_tooltip (GtkToolItem *item) } } - static void connect_widget_signals (GtkWidget *proxy, EggEditableToolbar *etoolbar) { diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c index d852f86..acc72e7 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c @@ -36,7 +36,6 @@ static const GtkTargetEntry source_drag_types[] = { {EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0}, }; - static void egg_toolbar_editor_finalize (GObject *object); static void update_editor_sheet (EggToolbarEditor *editor); diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h index 89bb185..d9f8786 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h @@ -34,7 +34,6 @@ typedef struct EggToolbarEditorClass EggToolbarEditorClass; #define EGG_IS_TOOLBAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TOOLBAR_EDITOR)) #define EGG_TOOLBAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TOOLBAR_EDITOR, EggToolbarEditorClass)) - typedef struct EggToolbarEditor EggToolbarEditor; typedef struct EggToolbarEditorPrivate EggToolbarEditorPrivate; @@ -51,7 +50,6 @@ struct EggToolbarEditorClass GtkVBoxClass parent_class; }; - GType egg_toolbar_editor_get_type (void); GtkWidget *egg_toolbar_editor_new (GtkUIManager *manager, EggToolbarsModel *model); diff --git a/cut-n-paste/toolbar-editor/egg-toolbars-model.c b/cut-n-paste/toolbar-editor/egg-toolbars-model.c index 78bf829..7d1b4d4 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c +++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c @@ -213,7 +213,6 @@ is_unique (EggToolbarsModel *model, EggToolbarsItem *idata2; GNode *toolbar, *item; - for(toolbar = g_node_first_child (model->priv->toolbars); toolbar != NULL; toolbar = g_node_next_sibling (toolbar)) { @@ -330,7 +329,6 @@ egg_toolbars_model_set_flags (EggToolbarsModel *model, 0, toolbar_position); } - char * egg_toolbars_model_get_data (EggToolbarsModel *model, GdkAtom type, diff --git a/jpegutils/jpegint-8a.h b/jpegutils/jpegint-8a.h index 0c27a4e..142f311 100644 --- a/jpegutils/jpegint-8a.h +++ b/jpegutils/jpegint-8a.h @@ -11,7 +11,6 @@ * applications using the library shouldn't need to include this file. */ - /* Declarations for both compression & decompression */ typedef enum { /* Operating modes for buffer controllers */ @@ -39,7 +38,6 @@ typedef enum { /* Operating modes for buffer controllers */ #define DSTATE_RDCOEFS 209 /* reading file in jpeg_read_coefficients */ #define DSTATE_STOPPING 210 /* looking for EOI in jpeg_finish_decompress */ - /* Declarations for compression modules */ /* Master control module */ @@ -133,7 +131,6 @@ struct jpeg_marker_writer { JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val)); }; - /* Declarations for decompression modules */ /* Master control module */ @@ -259,7 +256,6 @@ struct jpeg_color_quantizer { JMETHOD(void, new_color_map, (j_decompress_ptr cinfo)); }; - /* Miscellaneous useful macros */ #undef MAX @@ -267,7 +263,6 @@ struct jpeg_color_quantizer { #undef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) - /* We assume that right shift corresponds to signed division by 2 with * rounding towards minus infinity. This is correct for typical "arithmetic * shift" instructions that shift in copies of the sign bit. But some @@ -289,7 +284,6 @@ struct jpeg_color_quantizer { #define RIGHT_SHIFT(x,shft) ((x) >> (shft)) #endif - /* Short forms of external names for systems with brain-damaged linkers. */ #ifdef NEED_SHORT_EXTERNAL_NAMES @@ -335,7 +329,6 @@ struct jpeg_color_quantizer { #define jpeg_aritab jAriTab #endif /* NEED_SHORT_EXTERNAL_NAMES */ - /* Compression module initialization routines */ EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo)); EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo, diff --git a/jpegutils/transupp-6b.c b/jpegutils/transupp-6b.c index 2bb9133..7edd4de 100644 --- a/jpegutils/transupp-6b.c +++ b/jpegutils/transupp-6b.c @@ -59,7 +59,6 @@ enum { ((cinfo)->err->msg_code = (code), \ (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo))) - static long jround_up (long a, long b) /* Compute a rounded up to next multiple of b, ie, ceil(a/b)*b */ @@ -69,7 +68,6 @@ jround_up (long a, long b) return a - (a % b); } - static void jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row, JDIMENSION num_blocks) @@ -85,7 +83,6 @@ jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row, } } - /* * Lossless image transformation routines. These routines work on DCT * coefficient arrays and thus do not require any lossy decompression @@ -123,7 +120,6 @@ jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row, * dimensions and ignore the source's. */ - static void do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays) @@ -172,7 +168,6 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -243,7 +238,6 @@ do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -287,7 +281,6 @@ do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -351,7 +344,6 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -415,7 +407,6 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -516,7 +507,6 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -615,7 +605,6 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - /* Request any required workspace. * * We allocate the workspace virtual arrays from the source decompression @@ -695,7 +684,6 @@ jtransform_request_workspace (j_decompress_ptr srcinfo, info->workspace_coef_arrays = coef_arrays; } - /* Transpose destination image parameters */ static void @@ -735,7 +723,6 @@ transpose_critical_parameters (j_compress_ptr dstinfo) } } - /* Trim off any partial iMCUs on the indicated destination edge */ static void @@ -778,7 +765,6 @@ trim_bottom_edge (j_compress_ptr dstinfo) dstinfo->image_height = MCU_rows * (max_v_samp_factor * DCTSIZE); } - /* Adjust output image parameters as needed. * * This must be called after jpeg_copy_critical_parameters() @@ -867,7 +853,6 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo, return src_coef_arrays; } - /* Execute the actual transformation, if any. * * This must be called *after* jpeg_write_coefficients, because it depends @@ -912,7 +897,6 @@ jtransform_execute_transformation (j_decompress_ptr srcinfo, } } - /* Setup decompression object to save desired markers in memory. * This must be called before jpeg_read_header() to have the desired effect. */ @@ -988,5 +972,4 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - #endif /* HAVE_LIBJPEG */ diff --git a/jpegutils/transupp-6b.h b/jpegutils/transupp-6b.h index a42e4c1..21f3839 100644 --- a/jpegutils/transupp-6b.h +++ b/jpegutils/transupp-6b.h @@ -47,13 +47,11 @@ #ifdef HAVE_LIBJPEG - #ifndef TRANSUPP_H #define TRANSUPP_H #include <jpeglib.h> - typedef enum { JXFORM_NONE, /* no transformation */ JXFORM_FLIP_H, /* horizontal flip */ @@ -111,7 +109,6 @@ typedef struct { jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */ } jpeg_transform_info; - /* Request any required workspace */ void jtransform_request_workspace (j_decompress_ptr srcinfo, jpeg_transform_info *info); @@ -129,7 +126,6 @@ void jtransform_execute_transformation (j_decompress_ptr srcinfo, jvirt_barray_ptr *src_coef_arrays, jpeg_transform_info *info); - /* * Support for copying optional markers from source to destination file. */ @@ -151,7 +147,6 @@ void jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JCOPY_OPTION option); - #endif /* TRANSUPP_H */ #endif /* HAVE_LIBJPEG */ diff --git a/jpegutils/transupp-8a.c b/jpegutils/transupp-8a.c index 58af4a2..bffa9c7 100644 --- a/jpegutils/transupp-8a.c +++ b/jpegutils/transupp-8a.c @@ -48,7 +48,6 @@ #include "transupp-8a.h" /* My own external interface */ #include <ctype.h> /* to declare isdigit() */ - #if TRANSFORMS_SUPPORTED /* @@ -100,7 +99,6 @@ * source buffer it is an undocumented property of jdcoefct.c. */ - LOCAL(void) do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -138,7 +136,6 @@ do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, @@ -205,7 +202,6 @@ do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -267,7 +263,6 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -347,7 +342,6 @@ do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -395,7 +389,6 @@ do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -476,7 +469,6 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -547,7 +539,6 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -655,7 +646,6 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -770,7 +760,6 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - /* Parse an unsigned integer: subroutine for jtransform_parse_crop_spec. * Returns TRUE if valid integer found, FALSE if not. * *strptr is advanced over the digit string, and *result is set to its value. @@ -792,7 +781,6 @@ jt_read_integer (const char ** strptr, JDIMENSION * result) return TRUE; } - /* Parse a crop specification (written in X11 geometry style). * The routine returns TRUE if the spec string is valid, FALSE if not. * @@ -849,7 +837,6 @@ jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec) return TRUE; } - /* Trim off any partial iMCUs on the indicated destination edge */ LOCAL(void) @@ -874,7 +861,6 @@ trim_bottom_edge (jpeg_transform_info *info, JDIMENSION full_height) info->output_height = MCU_rows * info->iMCU_sample_height; } - /* Request any required workspace. * * This routine figures out the size that the output image will be @@ -1120,7 +1106,6 @@ jtransform_request_workspace (j_decompress_ptr srcinfo, return TRUE; } - /* Transpose destination image parameters */ LOCAL(void) @@ -1163,7 +1148,6 @@ transpose_critical_parameters (j_compress_ptr dstinfo) } } - /* Adjust Exif image parameters. * * We try to adjust the Tags ExifImageWidth and ExifImageHeight if possible. @@ -1319,7 +1303,6 @@ adjust_exif_parameters (JOCTET FAR * data, unsigned int length, } while (--number_of_tags); } - /* Adjust output image parameters as needed. * * This must be called after jpeg_copy_critical_parameters() @@ -1416,7 +1399,6 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo, return src_coef_arrays; } - /* Execute the actual transformation, if any. * * This must be called *after* jpeg_write_coefficients, because it depends @@ -1533,7 +1515,6 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, #endif /* TRANSFORMS_SUPPORTED */ - /* Setup decompression object to save desired markers in memory. * This must be called before jpeg_read_header() to have the desired effect. */ diff --git a/jpegutils/transupp-8a.h b/jpegutils/transupp-8a.h index d7baf00..d87de0b 100644 --- a/jpegutils/transupp-8a.h +++ b/jpegutils/transupp-8a.h @@ -78,7 +78,6 @@ #ifndef TRANSUPP_H #define TRANSUPP_H - /* Short forms of external names for systems with brain-damaged linkers. */ #ifdef NEED_SHORT_EXTERNAL_NAMES @@ -91,7 +90,6 @@ #define jcopy_markers_execute jCMrkExec #endif /* NEED_SHORT_EXTERNAL_NAMES */ - /* * Codes for supported types of image transformations. */ @@ -155,7 +153,6 @@ typedef struct { int iMCU_sample_height; } jpeg_transform_info; - #if TRANSFORMS_SUPPORTED /* Parse a crop specification (written in X11 geometry style) */ @@ -191,7 +188,6 @@ EXTERN(boolean) jtransform_perfect_transform #endif /* TRANSFORMS_SUPPORTED */ - /* * Support for copying optional markers from source to destination file. */ diff --git a/src/eom-application-internal.h b/src/eom-application-internal.h index 720ef77..c782f29 100644 --- a/src/eom-application-internal.h +++ b/src/eom-application-internal.h @@ -48,7 +48,6 @@ struct _EomApplicationPrivate { PeasExtensionSet *extensions; }; - EggToolbarsModel *eom_application_get_toolbars_model (EomApplication *application); void eom_application_save_toolbars_model (EomApplication *application); diff --git a/src/eom-close-confirmation-dialog.c b/src/eom-close-confirmation-dialog.c index a035f57..ad8dc63 100644 --- a/src/eom-close-confirmation-dialog.c +++ b/src/eom-close-confirmation-dialog.c @@ -540,8 +540,6 @@ create_treeview (EomCloseConfirmationDialogPrivate *priv) NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); - - renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Name", renderer, diff --git a/src/eom-file-chooser.c b/src/eom-file-chooser.c index 342c600..5d82901 100644 --- a/src/eom-file-chooser.c +++ b/src/eom-file-chooser.c @@ -354,7 +354,6 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data) gchar *mime_type = g_content_type_get_mime_type ( g_file_info_get_content_type (file_info)); - if (G_LIKELY (mime_type)) { gboolean can_thumbnail, has_failed; diff --git a/src/eom-file-chooser.h b/src/eom-file-chooser.h index f642b6d..9ee5529 100644 --- a/src/eom-file-chooser.h +++ b/src/eom-file-chooser.h @@ -47,14 +47,12 @@ struct _EomFileChooserClass GtkFileChooserDialogClass parent_class; }; - GType eom_file_chooser_get_type (void) G_GNUC_CONST; GtkWidget *eom_file_chooser_new (GtkFileChooserAction action); GdkPixbufFormat *eom_file_chooser_get_format (EomFileChooser *chooser); - G_END_DECLS #endif /* _EOM_FILE_CHOOSER_H_ */ diff --git a/src/eom-image-jpeg.c b/src/eom-image-jpeg.c index 21f67ff..4118d15 100644 --- a/src/eom-image-jpeg.c +++ b/src/eom-image-jpeg.c @@ -73,7 +73,6 @@ struct error_handler_data { char *filename; }; - static void fatal_error_handler (j_common_ptr cinfo) { @@ -103,7 +102,6 @@ fatal_error_handler (j_common_ptr cinfo) g_assert_not_reached (); } - static void output_message_handler (j_common_ptr cinfo) { diff --git a/src/eom-image.c b/src/eom-image.c index cc667a8..f24b528 100644 --- a/src/eom-image.c +++ b/src/eom-image.c @@ -700,7 +700,6 @@ eom_image_set_icc_data (EomImage *img, EomMetadataReader *md_reader) priv->profile = eom_metadata_reader_get_icc_profile (md_reader); - } #endif @@ -897,7 +896,6 @@ eom_image_real_load (EomImage *img, gboolean read_only_dimension = (data2read & EOM_IMAGE_DATA_DIMENSION) && ((data2read ^ EOM_IMAGE_DATA_DIMENSION) == 0); - priv = img->priv; g_assert (!read_image_data || priv->image == NULL); @@ -1878,7 +1876,6 @@ eom_image_save_as_by_info (EomImage *img, EomImageSaveInfo *source, EomImageSave return success; } - /* * This function is extracted from * File: caja/libcaja-private/caja-file.c @@ -2070,7 +2067,6 @@ eom_image_get_xmp_info (EomImage *img) return data; } - /** * eom_image_get_file: * @img: a #EomImage diff --git a/src/eom-jobs.h b/src/eom-jobs.h index 1667d43..df2283e 100644 --- a/src/eom-jobs.h +++ b/src/eom-jobs.h @@ -115,7 +115,6 @@ typedef struct _EomJobCopyClass EomJobCopyClass; #define EOM_JOB_COPY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EOM_TYPE_JOB_COPY, EomJobCopyClass)) #define EOM_IS_JOB_COPY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), EOM_TYPE_JOB_COPY)) - struct _EomJob { GObject parent; diff --git a/src/eom-list-store.c b/src/eom-list-store.c index 900cbdf..0115b1d 100644 --- a/src/eom-list-store.c +++ b/src/eom-list-store.c @@ -821,7 +821,6 @@ eom_list_store_remove_thumbnail_job (EomListStore *store, g_mutex_unlock (&store->priv->mutex); } - } static void diff --git a/src/eom-metadata-details.c b/src/eom-metadata-details.c index 9947300..032de24 100644 --- a/src/eom-metadata-details.c +++ b/src/eom-metadata-details.c @@ -375,7 +375,6 @@ eom_exif_entry_get_value (ExifEntry *e, ExifRational r; gfloat h = 0., m = 0., s = 0.; - rational_size = exif_format_get_size (EXIF_FORMAT_RATIONAL); if (G_UNLIKELY (e->components != 3 || e->format != EXIF_FORMAT_RATIONAL)) diff --git a/src/eom-metadata-reader-jpg.c b/src/eom-metadata-reader-jpg.c index 9c1897e..b21f3c1 100644 --- a/src/eom-metadata-reader-jpg.c +++ b/src/eom-metadata-reader-jpg.c @@ -52,7 +52,6 @@ typedef enum { EJA_OTHER } EomJpegApp1Type; - #define EOM_JPEG_MARKER_START 0xFF #define EOM_JPEG_MARKER_APP1 0xE1 #define EOM_JPEG_MARKER_APP2 0xE2 @@ -89,14 +88,12 @@ struct _EomMetadataReaderJpgPrivate { static void eom_metadata_reader_jpg_init_emr_iface (gpointer g_iface, gpointer iface_data); - G_DEFINE_TYPE_WITH_CODE (EomMetadataReaderJpg, eom_metadata_reader_jpg, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (EOM_TYPE_METADATA_READER, eom_metadata_reader_jpg_init_emr_iface) \ G_ADD_PRIVATE (EomMetadataReaderJpg)) - static void eom_metadata_reader_jpg_dispose (GObject *object) { @@ -155,7 +152,6 @@ eom_metadata_reader_jpg_finished (EomMetadataReaderJpg *emr) return (emr->priv->state == EMR_FINISHED); } - static EomJpegApp1Type eom_metadata_identify_app1 (gchar *buf, guint len) { @@ -467,7 +463,6 @@ eom_metadata_reader_jpg_get_exif_data (EomMetadataReaderJpg *emr) } #endif - #ifdef HAVE_EXEMPI /* skip the signature */ diff --git a/src/eom-metadata-reader-png.c b/src/eom-metadata-reader-png.c index a0ca172..7093144 100644 --- a/src/eom-metadata-reader-png.c +++ b/src/eom-metadata-reader-png.c @@ -158,7 +158,6 @@ eom_metadata_reader_png_finished (EomMetadataReaderPng *emr) return (emr->priv->state == EMR_FINISHED); } - static void eom_metadata_reader_png_get_next_block (EomMetadataReaderPngPrivate* priv, guchar *chunk, diff --git a/src/eom-metadata-reader.c b/src/eom-metadata-reader.c index 2c93a14..d7b3e9b 100644 --- a/src/eom-metadata-reader.c +++ b/src/eom-metadata-reader.c @@ -60,7 +60,6 @@ eom_metadata_reader_finished (EomMetadataReader *emr) return EOM_METADATA_READER_GET_INTERFACE (emr)->finished (emr); } - void eom_metadata_reader_consume (EomMetadataReader *emr, const guchar *buf, guint len) { diff --git a/src/eom-metadata-sidebar.c b/src/eom-metadata-sidebar.c index ba31937..982a937 100644 --- a/src/eom-metadata-sidebar.c +++ b/src/eom-metadata-sidebar.c @@ -263,7 +263,6 @@ eom_metadata_sidebar_set_image (EomMetadataSidebar *sidebar, EomImage *image) if (image == priv->image) return; - if (priv->thumb_changed_id != 0) { g_signal_handler_disconnect (priv->image, priv->thumb_changed_id); @@ -525,7 +524,6 @@ eom_metadata_sidebar_class_init (EomMetadataSidebarClass *klass) #endif /* HAVE_METADATA */ } - GtkWidget* eom_metadata_sidebar_new (EomWindow *window) { diff --git a/src/eom-print-image-setup.c b/src/eom-print-image-setup.c index 2fde257..b7b86f2 100644 --- a/src/eom-print-image-setup.c +++ b/src/eom-print-image-setup.c @@ -781,7 +781,6 @@ set_initial_values (EomPrintImageSetup *setup) update_image_pos_ranges (setup, page_width, page_height, width, height); - } static void @@ -973,7 +972,6 @@ eom_print_image_setup_init (EomPrintImageSetup *setup) gtk_widget_show_all (GTK_WIDGET (setup)); } - /** * eom_print_image_setup_new: * @image: the #EomImage to print diff --git a/src/eom-properties-dialog.c b/src/eom-properties-dialog.c index 67c3d6b..0bad997 100644 --- a/src/eom-properties-dialog.c +++ b/src/eom-properties-dialog.c @@ -120,7 +120,6 @@ parent_file_display_name_query_info_cb (GObject *source_object, GFileInfo *file_info; gchar *display_name; - file_info = g_file_query_info_finish (parent_file, res, NULL); if (file_info == NULL) { display_name = g_file_get_basename (parent_file); @@ -346,7 +345,6 @@ pd_update_metadata_tab (EomPropertiesDialog *prop_dlg, eom_exif_util_set_label_text (GTK_LABEL (priv->exif_iso_label), exif_data, EXIF_TAG_ISO_SPEED_RATINGS); - eom_exif_util_set_label_text (GTK_LABEL (priv->exif_metering_label), exif_data, EXIF_TAG_METERING_MODE); diff --git a/src/eom-save-as-dialog-helper.h b/src/eom-save-as-dialog-helper.h index dd72fa9..9374ea8 100644 --- a/src/eom-save-as-dialog-helper.h +++ b/src/eom-save-as-dialog-helper.h @@ -5,7 +5,6 @@ #include <gio/gio.h> #include "eom-uri-converter.h" - G_BEGIN_DECLS G_GNUC_INTERNAL @@ -14,7 +13,6 @@ GtkWidget* eom_save_as_dialog_new (GtkWindow *main, GList *images, GFil G_GNUC_INTERNAL EomURIConverter* eom_save_as_dialog_get_converter (GtkWidget *dlg); - G_END_DECLS #endif /* _EOM_SAVE_DIALOG_HELPER_H_ */ diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c index f35e022..d438021 100644 --- a/src/eom-scroll-view.c +++ b/src/eom-scroll-view.c @@ -558,7 +558,6 @@ create_background_surface (EomScrollView *view) --------------------------------------*/ - /* Scrolls the view to the specified offsets. */ static void scroll_to (EomScrollView *view, int x, int y, gboolean change_adjustments) @@ -640,7 +639,6 @@ scroll_by (EomScrollView *view, int xofs, int yofs) scroll_to (view, priv->xofs + xofs, priv->yofs + yofs, TRUE); } - /* Callback used when an adjustment is changed */ static void adjustment_changed_cb (GtkAdjustment *adj, gpointer data) @@ -657,7 +655,6 @@ adjustment_changed_cb (GtkAdjustment *adj, gpointer data) gtk_widget_queue_resize (GTK_WIDGET (view)); } - /* Drags the image to the specified position */ static void drag_to (EomScrollView *view, int x, int y) @@ -923,7 +920,6 @@ display_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer data) return TRUE; } - /* Button press event handler for the image view */ static gboolean eom_scroll_view_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer data) @@ -1158,7 +1154,6 @@ display_size_change (GtkWidget *widget, GdkEventConfigure *event, gpointer data) update_scrollbar_values (view); } - static gboolean eom_scroll_view_focus_in_event (GtkWidget *widget, GdkEventFocus *event, @@ -1370,7 +1365,6 @@ display_draw (GtkWidget *widget, cairo_t *cr, gpointer data) return TRUE; } - /*================================== image loading callbacks @@ -2075,7 +2069,6 @@ eom_scroll_view_set_property (GObject *object, guint property_id, } } - static void eom_scroll_view_class_init (EomScrollViewClass *klass) { @@ -2248,7 +2241,6 @@ eom_scroll_view_new (void) "column-homogeneous", FALSE, NULL); - return widget; } diff --git a/src/eom-scroll-view.h b/src/eom-scroll-view.h index 2dffec3..2f10e3e 100644 --- a/src/eom-scroll-view.h +++ b/src/eom-scroll-view.h @@ -16,7 +16,6 @@ typedef struct _EomScrollViewPrivate EomScrollViewPrivate; #define EOM_IS_SCROLL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EOM_TYPE_SCROLL_VIEW)) #define EOM_IS_SCROLL_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EOM_TYPE_SCROLL_VIEW)) - struct _EomScrollView { GtkGrid base_instance; @@ -72,4 +71,3 @@ G_END_DECLS #endif /* _EOM_SCROLL_VIEW_H_ */ - diff --git a/src/eom-sidebar.h b/src/eom-sidebar.h index 6986f41..3a1a3a2 100644 --- a/src/eom-sidebar.h +++ b/src/eom-sidebar.h @@ -79,4 +79,3 @@ G_END_DECLS #endif /* __EOM_SIDEBAR_H__ */ - diff --git a/src/eom-thumb-view.c b/src/eom-thumb-view.c index bc1184e..3a2ddf4 100644 --- a/src/eom-thumb-view.c +++ b/src/eom-thumb-view.c @@ -1024,7 +1024,6 @@ eom_thumb_view_select_single (EomThumbView *thumbview, gtk_tree_path_free (path); } - /** * eom_thumb_view_set_thumbnail_popup: * @thumbview: An #EomThumbView. @@ -1052,7 +1051,6 @@ eom_thumb_view_set_thumbnail_popup (EomThumbView *thumbview, NULL); } - static void eom_thumb_view_popup_menu (EomThumbView *thumbview, GdkEventButton *event) { diff --git a/src/eom-transform.h b/src/eom-transform.h index a321e03..7df2df4 100644 --- a/src/eom-transform.h +++ b/src/eom-transform.h @@ -72,4 +72,3 @@ G_END_DECLS #endif /* _EOM_TRANSFORM_H_ */ - diff --git a/src/eom-uri-converter.c b/src/eom-uri-converter.c index 68c5714..345cf54 100644 --- a/src/eom-uri-converter.c +++ b/src/eom-uri-converter.c @@ -26,7 +26,6 @@ typedef struct { } data; } EomUCToken; - struct _EomURIConverterPrivate { GFile *base_file; GList *token_list; @@ -88,7 +87,6 @@ eom_uri_converter_dispose (GObject *object) priv->suffix = NULL; } - G_OBJECT_CLASS (eom_uri_converter_parent_class)->dispose (object); } @@ -148,7 +146,6 @@ eom_uri_converter_class_init (EomURIConverterClass *klass) 1, G_PARAM_READWRITE)); - g_object_class_install_property ( object_class, PROP_N_IMAGES, @@ -169,7 +166,6 @@ eom_uc_error_quark (void) return q; } - static void eom_uri_converter_set_property (GObject *object, guint property_id, @@ -418,7 +414,6 @@ eom_uri_converter_parse_string (EomURIConverter *conv, const char *string) g_assert_not_reached (); } - if (token != NULL) { list = g_list_append (list, token); } @@ -500,7 +495,6 @@ eom_uri_converter_print_list (EomURIConverter *conv) } } - EomURIConverter* eom_uri_converter_new (GFile *base_file, GdkPixbufFormat *img_format, const char *format_str) { @@ -615,7 +609,6 @@ append_counter (GString *str, gulong counter, EomURIConverter *conv) return str; } - static void build_absolute_file (EomURIConverter *conv, EomImage *image, GString *str, /* input */ GFile **file, GdkPixbufFormat **format) /* output */ @@ -671,7 +664,6 @@ build_absolute_file (EomURIConverter *conv, EomImage *image, GString *str, /* i g_object_unref (dir_file); } - static GString* replace_remove_chars (GString *str, gboolean convert_spaces, gunichar space_char) { @@ -801,11 +793,9 @@ eom_uri_converter_do (EomURIConverter *conv, EomImage *image, g_string_free (repl_str, TRUE); g_string_free (str, TRUE); - return (*file != NULL); } - char* eom_uri_converter_preview (const char *format_str, EomImage *img, GdkPixbufFormat *format, gulong counter, guint n_images, @@ -888,7 +878,6 @@ eom_uri_converter_preview (const char *format_str, EomImage *img, GdkPixbufForma } } - filename = NULL; repl_str = replace_remove_chars (str, convert_spaces, space_char); diff --git a/src/eom-uri-converter.h b/src/eom-uri-converter.h index b1cbe94..5168466 100644 --- a/src/eom-uri-converter.h +++ b/src/eom-uri-converter.h @@ -52,7 +52,6 @@ typedef enum { #define EOM_UC_ERROR eom_uc_error_quark () - struct _EomURIConverter { GObject parent; diff --git a/src/eom-util.c b/src/eom-util.c index 324b7f3..e914223 100644 --- a/src/eom-util.c +++ b/src/eom-util.c @@ -311,7 +311,6 @@ eom_util_filename_get_extension (const char * filename) return g_strdup (begin); } - /** * eom_util_file_is_persistent: * @file: a #GFile diff --git a/src/eom-window.c b/src/eom-window.c index 607b2fb..6c4b5d2 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -2814,7 +2814,6 @@ eom_window_set_wallpaper (EomWindow *window, const gchar *filename, const gchar gtk_widget_show_all (hbox); gtk_widget_show (info_bar); - eom_window_set_message_area (window, info_bar); gtk_info_bar_set_default_response (GTK_INFO_BAR (info_bar), GTK_RESPONSE_YES); @@ -130,7 +130,6 @@ main (int argc, char **argv) } g_option_context_free (ctx); - set_startup_flags (); #ifdef HAVE_EXEMPI |