diff options
author | Felix Riemann <friemann@svn.gnome.org> | 2009-02-19 15:01:20 +0000 |
---|---|---|
committer | Felix Riemann <friemann@src.gnome.org> | 2009-02-19 15:01:20 +0000 |
commit | 58fde865d0f472355784d4db9b647e43829b2645 (patch) | |
tree | a14ffd6c64842be89df9b7700384966610254aec /plugins | |
parent | 622ea29c7c67ee78b6b02948cc33df220ce4be24 (diff) | |
download | eog-58fde865d0f472355784d4db9b647e43829b2645.tar.gz |
Update to latest toolbareditor from libegg.
2009-02-19 Felix Riemann <friemann@svn.gnome.org>
* cut-n-paste/toolbar-editor/*:
Update to latest toolbareditor from libegg.
* */*.c:
* */Makefile.am:
* configure.ac:
Strip lots of trailing whitespaces from more files
than I am able to list here.
svn path=/trunk/; revision=5016
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/fullscreen/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/fullscreen/eog-fullscreen-plugin.c | 10 | ||||
-rw-r--r-- | plugins/reload/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/reload/eog-reload-plugin.c | 24 | ||||
-rw-r--r-- | plugins/statusbar-date/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/statusbar-date/eog-statusbar-date-plugin.c | 14 |
7 files changed, 28 insertions, 28 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 1a9df987..175e7152 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -8,4 +8,4 @@ plugindir = $(libdir)/eog/plugins DISTCLEANFILES = -EXTRA_DIST = +EXTRA_DIST = diff --git a/plugins/fullscreen/Makefile.am b/plugins/fullscreen/Makefile.am index c9d664cd..763813f1 100644 --- a/plugins/fullscreen/Makefile.am +++ b/plugins/fullscreen/Makefile.am @@ -11,7 +11,7 @@ plugin_LTLIBRARIES = libfullscreen.la libfullscreen_la_SOURCES = \ eog-fullscreen-plugin.h \ - eog-fullscreen-plugin.c + eog-fullscreen-plugin.c libfullscreen_la_LDFLAGS = \ -avoid-version -module diff --git a/plugins/fullscreen/eog-fullscreen-plugin.c b/plugins/fullscreen/eog-fullscreen-plugin.c index 3636a6fc..dcd4400e 100644 --- a/plugins/fullscreen/eog-fullscreen-plugin.c +++ b/plugins/fullscreen/eog-fullscreen-plugin.c @@ -30,7 +30,7 @@ on_button_press (GtkWidget *button, GdkEventButton *event, EogWindow *window) eog_window_set_mode (window, EOG_WINDOW_MODE_NORMAL); else if (mode == EOG_WINDOW_MODE_NORMAL) eog_window_set_mode (window, EOG_WINDOW_MODE_FULLSCREEN); - + return TRUE; } @@ -41,7 +41,7 @@ static void free_window_data (WindowData *data) { g_return_if_fail (data != NULL); - + eog_debug (DEBUG_PLUGINS); g_free (data); @@ -77,8 +77,8 @@ impl_activate (EogPlugin *plugin, G_CALLBACK (on_button_press), window); - g_object_set_data_full (G_OBJECT (window), - WINDOW_DATA_KEY, + g_object_set_data_full (G_OBJECT (window), + WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); } @@ -90,7 +90,7 @@ impl_deactivate (EogPlugin *plugin, GtkWidget *view = eog_window_get_view (window); WindowData *data; - data = (WindowData *) g_object_get_data (G_OBJECT (window), + data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); g_signal_handler_disconnect (view, data->signal_id); diff --git a/plugins/reload/Makefile.am b/plugins/reload/Makefile.am index a375032e..f1af67a1 100644 --- a/plugins/reload/Makefile.am +++ b/plugins/reload/Makefile.am @@ -11,7 +11,7 @@ plugin_LTLIBRARIES = libreload.la libreload_la_SOURCES = \ eog-reload-plugin.h \ - eog-reload-plugin.c + eog-reload-plugin.c libreload_la_LDFLAGS = \ -avoid-version -module diff --git a/plugins/reload/eog-reload-plugin.c b/plugins/reload/eog-reload-plugin.c index 53c3aa5d..10752da3 100644 --- a/plugins/reload/eog-reload-plugin.c +++ b/plugins/reload/eog-reload-plugin.c @@ -45,11 +45,11 @@ static void free_window_data (WindowData *data) { g_return_if_fail (data != NULL); - + eog_debug (DEBUG_PLUGINS); g_object_unref (data->ui_action_group); - + g_free (data); } @@ -74,18 +74,18 @@ impl_activate (EogPlugin *plugin, GtkUIManager *manager; GList *action_groups; WindowData *data; - + eog_debug (DEBUG_PLUGINS); data = g_new (WindowData, 1); manager = eog_window_get_ui_manager (window); - action_groups = gtk_ui_manager_get_action_groups (manager); + action_groups = gtk_ui_manager_get_action_groups (manager); data->ui_action_group = gtk_action_group_new ("EogReloadPluginActions"); - - gtk_action_group_set_translation_domain (data->ui_action_group, + + gtk_action_group_set_translation_domain (data->ui_action_group, GETTEXT_PACKAGE); gtk_action_group_add_actions (data->ui_action_group, @@ -99,17 +99,17 @@ impl_activate (EogPlugin *plugin, data->ui_id = gtk_ui_manager_new_merge_id (manager); - g_object_set_data_full (G_OBJECT (window), - WINDOW_DATA_KEY, + g_object_set_data_full (G_OBJECT (window), + WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); - gtk_ui_manager_add_ui (manager, - data->ui_id, + gtk_ui_manager_add_ui (manager, + data->ui_id, MENU_PATH, - "RunReload", "RunReload", - GTK_UI_MANAGER_MENUITEM, + "RunReload", + GTK_UI_MANAGER_MENUITEM, FALSE); } diff --git a/plugins/statusbar-date/Makefile.am b/plugins/statusbar-date/Makefile.am index f13b639f..da1f5705 100644 --- a/plugins/statusbar-date/Makefile.am +++ b/plugins/statusbar-date/Makefile.am @@ -10,7 +10,7 @@ plugin_LTLIBRARIES = libstatusbar-date.la libstatusbar_date_la_SOURCES = \ eog-statusbar-date-plugin.h \ - eog-statusbar-date-plugin.c + eog-statusbar-date-plugin.c libstatusbar_date_la_LDFLAGS = \ -avoid-version -module diff --git a/plugins/statusbar-date/eog-statusbar-date-plugin.c b/plugins/statusbar-date/eog-statusbar-date-plugin.c index 11cde265..f69990ee 100644 --- a/plugins/statusbar-date/eog-statusbar-date-plugin.c +++ b/plugins/statusbar-date/eog-statusbar-date-plugin.c @@ -51,7 +51,7 @@ static void free_window_data (WindowData *data) { g_return_if_fail (data != NULL); - + eog_debug (DEBUG_PLUGINS); g_free (data); @@ -67,14 +67,14 @@ statusbar_set_date (GtkStatusbar *statusbar, EogThumbView *view) if (eog_thumb_view_get_n_selected (view) == 0) return; - + image = eog_thumb_view_get_first_selected_image (view); gtk_statusbar_pop (statusbar, 0); if (!eog_image_has_data (image, EOG_IMAGE_DATA_EXIF)) { if (!eog_image_load (image, EOG_IMAGE_DATA_EXIF, NULL, NULL)) { - gtk_widget_hide (GTK_WIDGET (statusbar)); + gtk_widget_hide (GTK_WIDGET (statusbar)); } } @@ -122,7 +122,7 @@ impl_activate (EogPlugin *plugin, WindowData *data; eog_debug (DEBUG_PLUGINS); - + data = g_new (WindowData, 1); data->statusbar_date = gtk_statusbar_new (); gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (data->statusbar_date), @@ -138,8 +138,8 @@ impl_activate (EogPlugin *plugin, statusbar_set_date (GTK_STATUSBAR (data->statusbar_date), EOG_THUMB_VIEW (eog_window_get_thumb_view (window))); - g_object_set_data_full (G_OBJECT (window), - WINDOW_DATA_KEY, + g_object_set_data_full (G_OBJECT (window), + WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); } @@ -152,7 +152,7 @@ impl_deactivate (EogPlugin *plugin, GtkWidget *view = eog_window_get_thumb_view (window); WindowData *data; - data = (WindowData *) g_object_get_data (G_OBJECT (window), + data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); g_signal_handler_disconnect (view, data->signal_id); |