diff options
| -rw-r--r-- | jpegutils/transupp-6b.c | 2 | ||||
| -rw-r--r-- | jpegutils/transupp-6b.h | 12 | ||||
| -rw-r--r-- | src/eom-application-activatable.c | 2 | ||||
| -rw-r--r-- | src/eom-application-activatable.h | 2 | ||||
| -rw-r--r-- | src/eom-application.c | 8 | ||||
| -rw-r--r-- | src/eom-close-confirmation-dialog.c | 104 | ||||
| -rw-r--r-- | src/eom-close-confirmation-dialog.h | 12 | ||||
| -rw-r--r-- | src/eom-image.c | 8 | ||||
| -rw-r--r-- | src/eom-metadata-sidebar.c | 8 | ||||
| -rw-r--r-- | src/eom-preferences-dialog.c | 2 | ||||
| -rw-r--r-- | src/eom-properties-dialog.c | 2 | ||||
| -rw-r--r-- | src/eom-scroll-view.c | 4 | ||||
| -rw-r--r-- | src/eom-transform.c | 2 | ||||
| -rw-r--r-- | src/eom-window-activatable.c | 2 | ||||
| -rw-r--r-- | src/eom-window-activatable.h | 2 | ||||
| -rw-r--r-- | src/eom-window.c | 16 | ||||
| -rw-r--r-- | src/main.c | 2 |
17 files changed, 95 insertions, 95 deletions
diff --git a/jpegutils/transupp-6b.c b/jpegutils/transupp-6b.c index 9b2f08f..2bb9133 100644 --- a/jpegutils/transupp-6b.c +++ b/jpegutils/transupp-6b.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* based upon file transupp.c from the libjpeg package, original copyright +/* based upon file transupp.c from the libjpeg package, original copyright * note follows: .* * diff --git a/jpegutils/transupp-6b.h b/jpegutils/transupp-6b.h index 33d7a08..a42e4c1 100644 --- a/jpegutils/transupp-6b.h +++ b/jpegutils/transupp-6b.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* based upon file transupp.h from the libjpeg package, original copyright +/* based upon file transupp.h from the libjpeg package, original copyright * note follows: * * transupp.h @@ -113,18 +113,18 @@ typedef struct { /* Request any required workspace */ -void jtransform_request_workspace (j_decompress_ptr srcinfo, +void jtransform_request_workspace (j_decompress_ptr srcinfo, jpeg_transform_info *info); /* Adjust output image parameters */ -jvirt_barray_ptr * jtransform_adjust_parameters (j_decompress_ptr srcinfo, +jvirt_barray_ptr * jtransform_adjust_parameters (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jpeg_transform_info *info); /* Execute the actual transformation, if any */ -void jtransform_execute_transformation (j_decompress_ptr srcinfo, +void jtransform_execute_transformation (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jpeg_transform_info *info); @@ -143,11 +143,11 @@ typedef enum { #define JCOPYOPT_DEFAULT JCOPYOPT_COMMENTS /* recommended default */ /* Setup decompression object to save desired markers in memory */ -void jcopy_markers_setup (j_decompress_ptr srcinfo, +void jcopy_markers_setup (j_decompress_ptr srcinfo, JCOPY_OPTION option); /* Copy markers saved in the given source object to the destination object */ -void jcopy_markers_execute (j_decompress_ptr srcinfo, +void jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JCOPY_OPTION option); diff --git a/src/eom-application-activatable.c b/src/eom-application-activatable.c index 5433ad5..a63a87f 100644 --- a/src/eom-application-activatable.c +++ b/src/eom-application-activatable.c @@ -5,7 +5,7 @@ * Author: Felix Riemann <[email protected]> * * Copyright (C) 2012 Felix Riemann - * + * * Base on code by: * - Steve Frécinaux <[email protected]> * diff --git a/src/eom-application-activatable.h b/src/eom-application-activatable.h index 5ab09dc..03e371e 100644 --- a/src/eom-application-activatable.h +++ b/src/eom-application-activatable.h @@ -5,7 +5,7 @@ * Author: Felix Riemann <[email protected]> * * Copyright (C) 2012 Felix Riemann - * + * * Base on code by: * - Steve Frécinaux <[email protected]> * diff --git a/src/eom-application.c b/src/eom-application.c index f49d37c..a46ead7 100644 --- a/src/eom-application.c +++ b/src/eom-application.c @@ -333,7 +333,7 @@ static void eom_application_show_window (EomWindow *window, gpointer user_data) { guint32 timestamp = GPOINTER_TO_UINT (user_data); - + /* set the proper interaction time on the window. * Fall back to roundtripping to the X server when we * don't have the timestamp, e.g. when launched from @@ -342,13 +342,13 @@ eom_application_show_window (EomWindow *window, gpointer user_data) */ if (!gtk_widget_get_realized (GTK_WIDGET (window))) gtk_widget_realize (GTK_WIDGET (window)); - + if (timestamp <= 0) timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window))); - + gdk_x11_window_set_user_time (gtk_widget_get_window (GTK_WIDGET (window)), timestamp); - + gtk_window_present (GTK_WINDOW (window)); } diff --git a/src/eom-close-confirmation-dialog.c b/src/eom-close-confirmation-dialog.c index 004bc2c..a035f57 100644 --- a/src/eom-close-confirmation-dialog.c +++ b/src/eom-close-confirmation-dialog.c @@ -6,7 +6,7 @@ * * Based on gedit code (gedit/gedit-close-confirmation.c) by gedit Team * - * Copyright (C) 2004-2009 GNOME Foundation + * Copyright (C) 2004-2009 GNOME Foundation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,8 +20,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H @@ -34,9 +34,9 @@ #include <eom-window.h> /* Properties */ -enum +enum { - PROP_0, + PROP_0, PROP_UNSAVED_IMAGES }; @@ -57,10 +57,10 @@ enum N_COLUMNS }; -struct _EomCloseConfirmationDialogPrivate +struct _EomCloseConfirmationDialogPrivate { GList *unsaved_images; - + GList *selected_images; GtkTreeModel *list_store; @@ -111,7 +111,7 @@ get_nothumb_pixbuf (void) return GDK_PIXBUF (g_object_ref (nothumb_once.retval)); } -/* Since we connect in the costructor we are sure this handler will be called +/* Since we connect in the costructor we are sure this handler will be called * before the user ones */ static void @@ -124,7 +124,7 @@ response_cb (EomCloseConfirmationDialog *dlg, g_return_if_fail (EOM_IS_CLOSE_CONFIRMATION_DIALOG (dlg)); priv = dlg->priv; - + if (priv->selected_images != NULL) g_list_free (priv->selected_images); @@ -132,7 +132,7 @@ response_cb (EomCloseConfirmationDialog *dlg, { if (GET_MODE (priv) == SINGLE_IMG_MODE) { - priv->selected_images = + priv->selected_images = g_list_copy (priv->unsaved_images); } else @@ -156,27 +156,27 @@ add_buttons (EomCloseConfirmationDialog *dlg) gtk_dialog_add_button (GTK_DIALOG (dlg), "gtk-cancel", GTK_RESPONSE_CANCEL); - + gtk_dialog_add_button (GTK_DIALOG (dlg), "gtk-save", GTK_RESPONSE_YES); - gtk_dialog_set_default_response (GTK_DIALOG (dlg), + gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_YES); } -static void +static void eom_close_confirmation_dialog_init (EomCloseConfirmationDialog *dlg) { AtkObject *atk_obj; dlg->priv = eom_close_confirmation_dialog_get_instance_private (dlg); - gtk_container_set_border_width (GTK_CONTAINER (dlg), 5); + gtk_container_set_border_width (GTK_CONTAINER (dlg), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), 14); gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dlg), TRUE); - + gtk_window_set_title (GTK_WINDOW (dlg), ""); gtk_window_set_modal (GTK_WINDOW (dlg), TRUE); @@ -185,14 +185,14 @@ eom_close_confirmation_dialog_init (EomCloseConfirmationDialog *dlg) atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dlg)); atk_object_set_role (atk_obj, ATK_ROLE_ALERT); atk_object_set_name (atk_obj, _("Question")); - + g_signal_connect (dlg, "response", G_CALLBACK (response_cb), NULL); } -static void +static void eom_close_confirmation_dialog_finalize (GObject *object) { EomCloseConfirmationDialogPrivate *priv; @@ -210,9 +210,9 @@ eom_close_confirmation_dialog_finalize (GObject *object) } static void -eom_close_confirmation_dialog_set_property (GObject *object, - guint prop_id, - const GValue *value, +eom_close_confirmation_dialog_set_property (GObject *object, + guint prop_id, + const GValue *value, GParamSpec *pspec) { EomCloseConfirmationDialog *dlg; @@ -224,7 +224,7 @@ eom_close_confirmation_dialog_set_property (GObject *object, case PROP_UNSAVED_IMAGES: set_unsaved_image (dlg, g_value_get_pointer (value)); break; - + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -232,9 +232,9 @@ eom_close_confirmation_dialog_set_property (GObject *object, } static void -eom_close_confirmation_dialog_get_property (GObject *object, - guint prop_id, - GValue *value, +eom_close_confirmation_dialog_get_property (GObject *object, + guint prop_id, + GValue *value, GParamSpec *pspec) { EomCloseConfirmationDialogPrivate *priv; @@ -253,7 +253,7 @@ eom_close_confirmation_dialog_get_property (GObject *object, } } -static void +static void eom_close_confirmation_dialog_class_init (EomCloseConfirmationDialogClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -267,7 +267,7 @@ eom_close_confirmation_dialog_class_init (EomCloseConfirmationDialogClass *klass g_param_spec_pointer ("unsaved_images", "Unsaved Images", "List of Unsaved Images", - (G_PARAM_READWRITE | + (G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY))); } @@ -286,7 +286,7 @@ get_selected_imgs (GtkTreeModel *store) gboolean to_save; EomImage *img; - gtk_tree_model_get (store, &iter, + gtk_tree_model_get (store, &iter, SAVE_COLUMN, &to_save, IMG_COLUMN, &img, -1); @@ -310,7 +310,7 @@ eom_close_confirmation_dialog_get_selected_images (EomCloseConfirmationDialog *d } GtkWidget * -eom_close_confirmation_dialog_new (GtkWindow *parent, +eom_close_confirmation_dialog_new (GtkWindow *parent, GList *unsaved_images) { GtkWidget *dlg; @@ -333,26 +333,26 @@ eom_close_confirmation_dialog_new (GtkWindow *parent, * group. It makes no difference if it is already. */ gtk_window_group_add_window (wg, parent); gtk_window_group_add_window (wg, GTK_WINDOW (dlg)); - - gtk_window_set_transient_for (GTK_WINDOW (dlg), parent); + + gtk_window_set_transient_for (GTK_WINDOW (dlg), parent); } return dlg; } GtkWidget * -eom_close_confirmation_dialog_new_single (GtkWindow *parent, +eom_close_confirmation_dialog_new_single (GtkWindow *parent, EomImage *image) { GtkWidget *dlg; GList *unsaved_images; g_return_val_if_fail (image != NULL, NULL); - + unsaved_images = g_list_prepend (NULL, image); - dlg = eom_close_confirmation_dialog_new (parent, + dlg = eom_close_confirmation_dialog_new (parent, unsaved_images); - + g_list_free (unsaved_images); return dlg; @@ -362,9 +362,9 @@ static gchar * get_text_secondary_label (EomImage *image) { gchar *secondary_msg; - + secondary_msg = g_strdup (_("If you don't save, your changes will be lost.")); - + return secondary_msg; } @@ -422,17 +422,17 @@ build_single_img_dialog (EomCloseConfirmationDialog *dlg) gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), primary_label, FALSE, FALSE, 0); - + gtk_box_pack_start (GTK_BOX (vbox), secondary_label, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), - hbox, - FALSE, - FALSE, + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + hbox, + FALSE, + FALSE, 0); add_buttons (dlg); @@ -518,7 +518,7 @@ create_treeview (EomCloseConfirmationDialogPrivate *priv) g_object_unref (store); priv->list_store = GTK_TREE_MODEL (store); - + /* Add columns */ priv->toggle_renderer = renderer = gtk_cell_renderer_toggle_new (); g_signal_connect (renderer, "toggled", @@ -540,7 +540,7 @@ 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", @@ -573,7 +573,7 @@ build_multiple_imgs_dialog (EomCloseConfirmationDialog *dlg) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), hbox, TRUE, TRUE, 0); /* Image */ @@ -603,11 +603,11 @@ build_multiple_imgs_dialog (EomCloseConfirmationDialog *dlg) markup_str = g_strconcat ("<span weight=\"bold\" size=\"larger\">", str, "</span>", NULL); g_free (str); - + gtk_label_set_markup (GTK_LABEL (primary_label), markup_str); g_free (markup_str); gtk_box_pack_start (GTK_BOX (vbox), primary_label, FALSE, FALSE, 0); - + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); @@ -619,10 +619,10 @@ build_multiple_imgs_dialog (EomCloseConfirmationDialog *dlg) scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_box_pack_start (GTK_BOX (vbox2), scrolledwindow, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), - GTK_POLICY_AUTOMATIC, + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow), + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_SHADOW_IN); treeview = create_treeview (priv); @@ -651,7 +651,7 @@ set_unsaved_image (EomCloseConfirmationDialog *dlg, { EomCloseConfirmationDialogPrivate *priv; - g_return_if_fail (list != NULL); + g_return_if_fail (list != NULL); priv = dlg->priv; g_return_if_fail (priv->unsaved_images == NULL); @@ -665,7 +665,7 @@ set_unsaved_image (EomCloseConfirmationDialog *dlg, else { build_multiple_imgs_dialog (dlg); - } + } } const GList * diff --git a/src/eom-close-confirmation-dialog.h b/src/eom-close-confirmation-dialog.h index a843a9a..c712f7f 100644 --- a/src/eom-close-confirmation-dialog.h +++ b/src/eom-close-confirmation-dialog.h @@ -6,7 +6,7 @@ * * Based on gedit code (gedit/gedit-close-confirmation.h) by gedit Team * - * Copyright (C) 2004-2009 GNOME Foundation + * Copyright (C) 2004-2009 GNOME Foundation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,8 +20,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. */ #ifndef __EOM_CLOSE_CONFIRMATION_DIALOG_H__ @@ -43,7 +43,7 @@ typedef struct _EomCloseConfirmationDialog EomCloseConfirmationDialog; typedef struct _EomCloseConfirmationDialogClass EomCloseConfirmationDialogClass; typedef struct _EomCloseConfirmationDialogPrivate EomCloseConfirmationDialogPrivate; -struct _EomCloseConfirmationDialog +struct _EomCloseConfirmationDialog { GtkDialog parent; @@ -51,7 +51,7 @@ struct _EomCloseConfirmationDialog EomCloseConfirmationDialogPrivate *priv; }; -struct _EomCloseConfirmationDialogClass +struct _EomCloseConfirmationDialogClass { GtkDialogClass parent_class; }; @@ -63,7 +63,7 @@ G_GNUC_INTERNAL GtkWidget *eom_close_confirmation_dialog_new (GtkWindow *parent, GList *unsaved_documents); G_GNUC_INTERNAL -GtkWidget *eom_close_confirmation_dialog_new_single (GtkWindow *parent, +GtkWidget *eom_close_confirmation_dialog_new_single (GtkWindow *parent, EomImage *image); G_GNUC_INTERNAL diff --git a/src/eom-image.c b/src/eom-image.c index 1cd2690..a6f07e4 100644 --- a/src/eom-image.c +++ b/src/eom-image.c @@ -1102,7 +1102,7 @@ eom_image_real_load (EomImage *img, priv->image = rsvg_handle_get_pixbuf (priv->svg); } else #endif - + { priv->anim = gdk_pixbuf_loader_get_animation (loader); @@ -2246,7 +2246,7 @@ eom_image_iter_advance (EomImage *img) priv = img->priv; - if ((new_frame = gdk_pixbuf_animation_iter_advance (img->priv->anim_iter, NULL)) == TRUE) { + if ((new_frame = gdk_pixbuf_animation_iter_advance (img->priv->anim_iter, NULL)) == TRUE) { g_mutex_lock (&priv->status_mutex); g_object_unref (priv->image); priv->image = gdk_pixbuf_animation_iter_get_pixbuf (priv->anim_iter); @@ -2275,7 +2275,7 @@ eom_image_iter_advance (EomImage *img) * Checks whether a given image is animated. * * Returns: #TRUE if it is an animated image, #FALSE otherwise. - * + * **/ gboolean eom_image_is_animation (EomImage *img) @@ -2290,7 +2290,7 @@ private_timeout (gpointer data) EomImage *img = EOM_IMAGE (data); EomImagePrivate *priv = img->priv; - if (eom_image_is_animation (img) && + if (eom_image_is_animation (img) && !g_source_is_destroyed (g_main_current_source ()) && priv->is_playing) { while (eom_image_iter_advance (img) != TRUE) {}; /* cpu-sucking ? */ diff --git a/src/eom-metadata-sidebar.c b/src/eom-metadata-sidebar.c index 384a49e..ba31937 100644 --- a/src/eom-metadata-sidebar.c +++ b/src/eom-metadata-sidebar.c @@ -146,7 +146,7 @@ eom_metadata_sidebar_update_general_section (EomMetadataSidebar *sidebar) gtk_label_set_text (GTK_LABEL (priv->type_label), NULL); gtk_label_set_text (GTK_LABEL (priv->filesize_label), NULL); gtk_label_set_text (GTK_LABEL (priv->folder_label), NULL); - return; + return; } eom_image_get_size (img, &width, &height); @@ -277,13 +277,13 @@ eom_metadata_sidebar_set_image (EomMetadataSidebar *sidebar, EomImage *image) if (priv->image) { g_object_ref (priv->image); - priv->thumb_changed_id = + priv->thumb_changed_id = g_signal_connect (priv->image, "thumbnail-changed", G_CALLBACK (_thumbnail_changed_cb), sidebar); eom_metadata_sidebar_update (sidebar); } - + g_object_notify (G_OBJECT (sidebar), "image"); } @@ -366,7 +366,7 @@ eom_metadata_sidebar_set_parent_window (EomMetadataSidebar *sidebar, sidebar); g_object_notify (G_OBJECT (sidebar), "parent-window"); - + } static void diff --git a/src/eom-preferences-dialog.c b/src/eom-preferences-dialog.c index 3236596..e13d0a4 100644 --- a/src/eom-preferences-dialog.c +++ b/src/eom-preferences-dialog.c @@ -196,7 +196,7 @@ eom_preferences_dialog_class_init (EomPreferencesDialogClass *klass) EomPreferencesDialog, plugin_manager); } - + static void eom_preferences_dialog_init (EomPreferencesDialog *pref_dlg) { diff --git a/src/eom-properties-dialog.c b/src/eom-properties-dialog.c index 2747e92..ae856f2 100644 --- a/src/eom-properties-dialog.c +++ b/src/eom-properties-dialog.c @@ -449,7 +449,7 @@ pd_folder_button_clicked_cb (GtkButton *button, gpointer data) if (!priv->folder_button_uri) return; - + timestamp = gtk_get_current_event_time (); window = GTK_WINDOW (data); diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c index fd030a2..aa06906 100644 --- a/src/eom-scroll-view.c +++ b/src/eom-scroll-view.c @@ -1682,7 +1682,7 @@ display_next_frame_cb (EomImage *image, gint delay, gpointer data) priv = view->priv; update_pixbuf (view, eom_image_get_pixbuf (image)); - gtk_widget_queue_draw (GTK_WIDGET (priv->display)); + gtk_widget_queue_draw (GTK_WIDGET (priv->display)); } void @@ -1719,7 +1719,7 @@ eom_scroll_view_set_image (EomScrollView *view, EomImage *image) (GCallback) image_changed_cb, view); if (eom_image_is_animation (image) == TRUE ) { eom_image_start_animation (image); - priv->frame_changed_id = g_signal_connect (image, "next-frame", + priv->frame_changed_id = g_signal_connect (image, "next-frame", (GCallback) display_next_frame_cb, view); } } diff --git a/src/eom-transform.c b/src/eom-transform.c index 04e6de0..e1dd683 100644 --- a/src/eom-transform.c +++ b/src/eom-transform.c @@ -45,7 +45,7 @@ typedef struct { } EomPoint; /* Convert degrees into radians */ -#define EOM_DEG_TO_RAD(degree) ((degree) * (G_PI/180.0)) +#define EOM_DEG_TO_RAD(degree) ((degree) * (G_PI/180.0)) G_DEFINE_TYPE_WITH_PRIVATE (EomTransform, eom_transform, G_TYPE_OBJECT) diff --git a/src/eom-window-activatable.c b/src/eom-window-activatable.c index 9acc0ef..57c01ac 100644 --- a/src/eom-window-activatable.c +++ b/src/eom-window-activatable.c @@ -5,7 +5,7 @@ * Author: Felix Riemann <[email protected]> * * Copyright (C) 2011 Felix Riemann - * + * * Base on code by: * - Steve Frécinaux <[email protected]> * diff --git a/src/eom-window-activatable.h b/src/eom-window-activatable.h index 0302aa2..332161b 100644 --- a/src/eom-window-activatable.h +++ b/src/eom-window-activatable.h @@ -5,7 +5,7 @@ * Author: Felix Riemann <[email protected]> * * Copyright (C) 2011 Felix Riemann - * + * * Base on code by: * - Steve Frécinaux <[email protected]> * diff --git a/src/eom-window.c b/src/eom-window.c index 62624b7..ac29086 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -2326,7 +2326,7 @@ close_confirmation_dialog_response_handler (EomCloseConfirmationDialog *dlg, /* Cancel */ gtk_widget_destroy (GTK_WIDGET (dlg)); break; - } + } } static gboolean @@ -2361,7 +2361,7 @@ eom_window_unsaved_images_confirm (EomWindow *window) list = g_list_prepend (list, image); } } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->store), &iter)); - } + } if (list) { list = g_list_reverse (list); @@ -3016,18 +3016,18 @@ static void eom_window_cmd_open_containing_folder (GtkAction *action, gpointer user_data) { EomWindowPrivate *priv; - + GFile *file; g_return_if_fail (EOM_IS_WINDOW (user_data)); priv = EOM_WINDOW (user_data)->priv; - - g_return_if_fail (priv->image != NULL); - + + g_return_if_fail (priv->image != NULL); + file = eom_image_get_file (priv->image); g_return_if_fail (file != NULL); - + eom_util_show_file_in_filemanager (file, GTK_WINDOW (user_data)); } @@ -3256,7 +3256,7 @@ show_move_to_trash_confirm_dialog (EomWindow *window, GList *images, gboolean ca * asked and the trash is available */ if (can_trash && (dontaskagain || neverask)) return GTK_RESPONSE_OK; - + n_images = g_list_length (images); if (n_images == 1) { @@ -107,7 +107,7 @@ main (int argc, char **argv) ctx = g_option_context_new (_("[FILE…]")); g_option_context_add_main_entries (ctx, goption_options, PACKAGE); - /* Option groups are free'd together with the context + /* Option groups are free'd together with the context * Using gtk_get_option_group here initializes gtk during parsing */ g_option_context_add_group (ctx, gtk_get_option_group (TRUE)); #ifdef HAVE_INTROSPECTION |