diff options
author | monsta <[email protected]> | 2016-11-30 19:09:58 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2016-11-30 19:28:44 +0300 |
commit | 7e98726da7fe9d9c1cc86a26d93752fea351e1c9 (patch) | |
tree | 8a305d2ea451a3f720d835cb2ec1e5d89dfe1fcd /plugins | |
parent | d4850871903c7c44dfaa0a4bccc4068ec2c69b12 (diff) | |
download | eom-7e98726da7fe9d9c1cc86a26d93752fea351e1c9.tar.bz2 eom-7e98726da7fe9d9c1cc86a26d93752fea351e1c9.tar.xz |
fix indent in some places
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/fullscreen/eom-fullscreen-plugin.c | 73 | ||||
-rw-r--r-- | plugins/fullscreen/eom-fullscreen-plugin.h | 4 | ||||
-rw-r--r-- | plugins/reload/eom-reload-plugin.c | 91 | ||||
-rw-r--r-- | plugins/reload/eom-reload-plugin.h | 4 | ||||
-rw-r--r-- | plugins/statusbar-date/eom-statusbar-date-plugin.c | 117 | ||||
-rw-r--r-- | plugins/statusbar-date/eom-statusbar-date-plugin.h | 4 |
6 files changed, 166 insertions, 127 deletions
diff --git a/plugins/fullscreen/eom-fullscreen-plugin.c b/plugins/fullscreen/eom-fullscreen-plugin.c index 5f7d4c9..dd31d82 100644 --- a/plugins/fullscreen/eom-fullscreen-plugin.c +++ b/plugins/fullscreen/eom-fullscreen-plugin.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H - #include <config.h> +#include <config.h> #endif #include "eom-fullscreen-plugin.h" @@ -12,25 +12,28 @@ #define WINDOW_DATA_KEY "EomFullscreenWindowData" -EOM_PLUGIN_REGISTER_TYPE(EomFullscreenPlugin, eom_fullscreen_plugin) +EOM_PLUGIN_REGISTER_TYPE (EomFullscreenPlugin, eom_fullscreen_plugin) typedef struct { gulong signal_id; } WindowData; -static gboolean on_button_press(GtkWidget* button, GdkEventButton* event, EomWindow* window) +static gboolean +on_button_press (GtkWidget *button, + GdkEventButton *event, + EomWindow *window) { if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) { - EomWindowMode mode = eom_window_get_mode(window); + EomWindowMode mode = eom_window_get_mode (window); if (mode == EOM_WINDOW_MODE_SLIDESHOW || mode == EOM_WINDOW_MODE_FULLSCREEN) { - eom_window_set_mode(window, EOM_WINDOW_MODE_NORMAL); + eom_window_set_mode (window, EOM_WINDOW_MODE_NORMAL); } else if (mode == EOM_WINDOW_MODE_NORMAL) { - eom_window_set_mode(window, EOM_WINDOW_MODE_FULLSCREEN); + eom_window_set_mode (window, EOM_WINDOW_MODE_FULLSCREEN); } return TRUE; @@ -39,60 +42,70 @@ static gboolean on_button_press(GtkWidget* button, GdkEventButton* event, EomWin return FALSE; } -static void free_window_data(WindowData* data) +static void +free_window_data (WindowData *data) { - g_return_if_fail(data != NULL); + g_return_if_fail (data != NULL); - eom_debug(DEBUG_PLUGINS); + eom_debug (DEBUG_PLUGINS); - g_free(data); + g_free (data); } -static void eom_fullscreen_plugin_init (EomFullscreenPlugin* plugin) +static void +eom_fullscreen_plugin_init (EomFullscreenPlugin *plugin) { - eom_debug_message(DEBUG_PLUGINS, "EomFullscreenPlugin initializing"); + eom_debug_message (DEBUG_PLUGINS, "EomFullscreenPlugin initializing"); } -static void eom_fullscreen_plugin_finalize(GObject* object) +static void +eom_fullscreen_plugin_finalize (GObject *object) { eom_debug_message (DEBUG_PLUGINS, "EomFullscreenPlugin finalizing"); - G_OBJECT_CLASS(eom_fullscreen_plugin_parent_class)->finalize(object); + G_OBJECT_CLASS (eom_fullscreen_plugin_parent_class)->finalize (object); } -static void impl_activate(EomPlugin* plugin, EomWindow* window) +static void +impl_activate (EomPlugin *plugin, + EomWindow *window) { - GtkWidget* view = eom_window_get_view(window); - WindowData* data; + GtkWidget *view = eom_window_get_view (window); + WindowData *data; - eom_debug(DEBUG_PLUGINS); + eom_debug (DEBUG_PLUGINS); - data = g_new(WindowData, 1); + data = g_new (WindowData, 1); - data->signal_id = g_signal_connect(G_OBJECT(view), "button-press-event", G_CALLBACK(on_button_press), window); + data->signal_id = g_signal_connect (G_OBJECT (view), "button-press-event", + G_CALLBACK (on_button_press), window); - g_object_set_data_full(G_OBJECT(window), WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); + g_object_set_data_full (G_OBJECT(window), WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); } -static void impl_deactivate(EomPlugin* plugin, EomWindow* window) +static void +impl_deactivate (EomPlugin *plugin, EomWindow *window) { - GtkWidget* view = eom_window_get_view(window); - WindowData* data = (WindowData*) g_object_get_data(G_OBJECT(window), WINDOW_DATA_KEY); + GtkWidget *view = eom_window_get_view (window); + WindowData *data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); - g_signal_handler_disconnect(view, data->signal_id); + g_signal_handler_disconnect (view, data->signal_id); - g_object_set_data(G_OBJECT(window), WINDOW_DATA_KEY, NULL); + g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL); } -static void impl_update_ui(EomPlugin* plugin, EomWindow* window) +static void +impl_update_ui (EomPlugin *plugin, + EomWindow *window) { /* Nothing */ } -static void eom_fullscreen_plugin_class_init(EomFullscreenPluginClass* klass) +static void +eom_fullscreen_plugin_class_init (EomFullscreenPluginClass *klass) { - GObjectClass* object_class = G_OBJECT_CLASS(klass); - EomPluginClass* plugin_class = EOM_PLUGIN_CLASS(klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + EomPluginClass *plugin_class = EOM_PLUGIN_CLASS (klass); object_class->finalize = eom_fullscreen_plugin_finalize; diff --git a/plugins/fullscreen/eom-fullscreen-plugin.h b/plugins/fullscreen/eom-fullscreen-plugin.h index defe3b5..17db056 100644 --- a/plugins/fullscreen/eom-fullscreen-plugin.h +++ b/plugins/fullscreen/eom-fullscreen-plugin.h @@ -47,10 +47,10 @@ struct _EomFullscreenPluginClass { /* * Public methods */ -GType eom_fullscreen_plugin_get_type(void) G_GNUC_CONST; +GType eom_fullscreen_plugin_get_type (void) G_GNUC_CONST; /* All the plugins must implement this function */ -G_MODULE_EXPORT GType register_eom_plugin(GTypeModule* module); +G_MODULE_EXPORT GType register_eom_plugin (GTypeModule* module); G_END_DECLS diff --git a/plugins/reload/eom-reload-plugin.c b/plugins/reload/eom-reload-plugin.c index 5dcd865..b3b05f1 100644 --- a/plugins/reload/eom-reload-plugin.c +++ b/plugins/reload/eom-reload-plugin.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H - #include <config.h> +#include <config.h> #endif #include "eom-reload-plugin.h" @@ -14,16 +14,18 @@ #define WINDOW_DATA_KEY "EomReloadWindowData" -EOM_PLUGIN_REGISTER_TYPE(EomReloadPlugin, eom_reload_plugin) +EOM_PLUGIN_REGISTER_TYPE (EomReloadPlugin, eom_reload_plugin) typedef struct { GtkActionGroup* ui_action_group; guint ui_id; } WindowData; -static void reload_cb(GtkAction* action, EomWindow* window) +static void +reload_cb (GtkAction *action, + EomWindow *window) { - eom_window_reload_image(window); + eom_window_reload_image (window); } static const gchar* const ui_definition = "<ui><menubar name=\"MainMenu\">" @@ -35,80 +37,89 @@ static const gchar* const ui_definition = "<ui><menubar name=\"MainMenu\">" "</popup></ui>"; static const GtkActionEntry action_entries[] = { - {"EomPluginRunReload", GTK_STOCK_REFRESH, N_("Reload Image"), "R", N_("Reload current image"), G_CALLBACK(reload_cb)} + { "EomPluginRunReload", GTK_STOCK_REFRESH, N_("Reload Image"), "R", N_("Reload current image"), G_CALLBACK (reload_cb) } }; -static void free_window_data(WindowData* data) +static void +free_window_data (WindowData *data) { - g_return_if_fail(data != NULL); + g_return_if_fail (data != NULL); - eom_debug(DEBUG_PLUGINS); + eom_debug (DEBUG_PLUGINS); - g_object_unref(data->ui_action_group); + g_object_unref (data->ui_action_group); - g_free(data); + g_free (data); } -static void eom_reload_plugin_init(EomReloadPlugin* plugin) +static void +eom_reload_plugin_init (EomReloadPlugin *plugin) { - eom_debug_message(DEBUG_PLUGINS, "EomReloadPlugin initializing"); + eom_debug_message (DEBUG_PLUGINS, "EomReloadPlugin initializing"); } -static void eom_reload_plugin_finalize(GObject* object) +static void +eom_reload_plugin_finalize (GObject *object) { - eom_debug_message(DEBUG_PLUGINS, "EomReloadPlugin finalizing"); + eom_debug_message (DEBUG_PLUGINS, "EomReloadPlugin finalizing"); - G_OBJECT_CLASS(eom_reload_plugin_parent_class)->finalize(object); + G_OBJECT_CLASS (eom_reload_plugin_parent_class)->finalize (object); } -static void impl_activate(EomPlugin* plugin, EomWindow* window) +static void +impl_activate (EomPlugin *plugin, + EomWindow *window) { - GtkUIManager* manager; - WindowData* data; + GtkUIManager *manager; + WindowData *data; - eom_debug(DEBUG_PLUGINS); + eom_debug (DEBUG_PLUGINS); - data = g_new(WindowData, 1); + data = g_new (WindowData, 1); - manager = eom_window_get_ui_manager(window); + manager = eom_window_get_ui_manager (window); - data->ui_action_group = gtk_action_group_new("EomReloadPluginActions"); + data->ui_action_group = gtk_action_group_new ("EomReloadPluginActions"); - gtk_action_group_set_translation_domain(data->ui_action_group, GETTEXT_PACKAGE); + gtk_action_group_set_translation_domain (data->ui_action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions(data->ui_action_group, action_entries, G_N_ELEMENTS(action_entries), window); + gtk_action_group_add_actions (data->ui_action_group, action_entries, + G_N_ELEMENTS (action_entries), window); - gtk_ui_manager_insert_action_group(manager, data->ui_action_group, -1); + gtk_ui_manager_insert_action_group (manager, data->ui_action_group, -1); - g_object_set_data_full(G_OBJECT(window), WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); + g_object_set_data_full (G_OBJECT (window), WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); - data->ui_id = gtk_ui_manager_add_ui_from_string(manager, ui_definition, -1, NULL); + data->ui_id = gtk_ui_manager_add_ui_from_string (manager, ui_definition, -1, NULL); g_warn_if_fail (data->ui_id != 0); } -static void impl_deactivate(EomPlugin* plugin, EomWindow* window) +static void +impl_deactivate (EomPlugin *plugin, + EomWindow *window) { - GtkUIManager* manager; - WindowData* data; + GtkUIManager *manager; + WindowData *data; - eom_debug(DEBUG_PLUGINS); + eom_debug (DEBUG_PLUGINS); - manager = eom_window_get_ui_manager(window); + manager = eom_window_get_ui_manager (window); - data = (WindowData*) g_object_get_data(G_OBJECT(window), WINDOW_DATA_KEY); - g_return_if_fail(data != NULL); + data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); + g_return_if_fail (data != NULL); - gtk_ui_manager_remove_ui(manager, data->ui_id); + gtk_ui_manager_remove_ui (manager, data->ui_id); - gtk_ui_manager_remove_action_group(manager, data->ui_action_group); + gtk_ui_manager_remove_action_group (manager, data->ui_action_group); - g_object_set_data(G_OBJECT(window), WINDOW_DATA_KEY, NULL); + g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL); } -static void eom_reload_plugin_class_init(EomReloadPluginClass* klass) +static void +eom_reload_plugin_class_init (EomReloadPluginClass *klass) { - GObjectClass* object_class = G_OBJECT_CLASS(klass); - EomPluginClass* plugin_class = EOM_PLUGIN_CLASS(klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + EomPluginClass *plugin_class = EOM_PLUGIN_CLASS (klass); object_class->finalize = eom_reload_plugin_finalize; diff --git a/plugins/reload/eom-reload-plugin.h b/plugins/reload/eom-reload-plugin.h index 721448b..5f285d2 100644 --- a/plugins/reload/eom-reload-plugin.h +++ b/plugins/reload/eom-reload-plugin.h @@ -47,10 +47,10 @@ struct _EomReloadPluginClass { /* * Public methods */ -GType eom_reload_plugin_get_type(void) G_GNUC_CONST; +GType eom_reload_plugin_get_type (void) G_GNUC_CONST; /* All the plugins must implement this function */ -G_MODULE_EXPORT GType register_eom_plugin(GTypeModule* module); +G_MODULE_EXPORT GType register_eom_plugin (GTypeModule* module); G_END_DECLS diff --git a/plugins/statusbar-date/eom-statusbar-date-plugin.c b/plugins/statusbar-date/eom-statusbar-date-plugin.c index ee0e648..3a14d23 100644 --- a/plugins/statusbar-date/eom-statusbar-date-plugin.c +++ b/plugins/statusbar-date/eom-statusbar-date-plugin.c @@ -37,43 +37,46 @@ #define WINDOW_DATA_KEY "EomStatusbarDateWindowData" -EOM_PLUGIN_REGISTER_TYPE(EomStatusbarDatePlugin, eom_statusbar_date_plugin) +EOM_PLUGIN_REGISTER_TYPE (EomStatusbarDatePlugin, eom_statusbar_date_plugin) typedef struct { GtkWidget* statusbar_date; gulong signal_id; } WindowData; -static void free_window_data(WindowData* data) +static void +free_window_data (WindowData *data) { - g_return_if_fail(data != NULL); + g_return_if_fail (data != NULL); - eom_debug(DEBUG_PLUGINS); + eom_debug (DEBUG_PLUGINS); - g_free(data); + g_free (data); } -static void statusbar_set_date(GtkStatusbar* statusbar, EomThumbView* view) +static void +statusbar_set_date (GtkStatusbar *statusbar, + EomThumbView *view) { - EomImage* image; - gchar* date = NULL; + EomImage *image; + gchar *date = NULL; gchar time_buffer[32]; - ExifData* exif_data; + ExifData *exif_data; - if (eom_thumb_view_get_n_selected(view) == 0) + if (eom_thumb_view_get_n_selected (view) == 0) { return; } - image = eom_thumb_view_get_first_selected_image(view); + image = eom_thumb_view_get_first_selected_image (view); - gtk_statusbar_pop(statusbar, 0); + gtk_statusbar_pop (statusbar, 0); - if (!eom_image_has_data(image, EOM_IMAGE_DATA_EXIF)) + if (!eom_image_has_data (image, EOM_IMAGE_DATA_EXIF)) { - if (!eom_image_load(image, EOM_IMAGE_DATA_EXIF, NULL, NULL)) + if (!eom_image_load (image, EOM_IMAGE_DATA_EXIF, NULL, NULL)) { - gtk_widget_hide(GTK_WIDGET(statusbar)); + gtk_widget_hide (GTK_WIDGET (statusbar)); } } @@ -81,85 +84,97 @@ static void statusbar_set_date(GtkStatusbar* statusbar, EomThumbView* view) if (exif_data) { - date = eom_exif_util_format_date(eom_exif_data_get_value(exif_data, EXIF_TAG_DATE_TIME_ORIGINAL, time_buffer, 32)); + date = eom_exif_util_format_date (eom_exif_data_get_value (exif_data, EXIF_TAG_DATE_TIME_ORIGINAL, time_buffer, 32)); eom_exif_data_free (exif_data); } if (date) { - gtk_statusbar_push(statusbar, 0, date); - gtk_widget_show(GTK_WIDGET(statusbar)); - g_free(date); + gtk_statusbar_push (statusbar, 0, date); + gtk_widget_show (GTK_WIDGET (statusbar)); + g_free (date); } else { - gtk_widget_hide(GTK_WIDGET(statusbar)); + gtk_widget_hide (GTK_WIDGET (statusbar)); } } -static void selection_changed_cb(EomThumbView* view, WindowData* data) +static void +selection_changed_cb (EomThumbView *view, + WindowData *data) { - statusbar_set_date(GTK_STATUSBAR(data->statusbar_date), view); + statusbar_set_date (GTK_STATUSBAR (data->statusbar_date), view); } -static void eom_statusbar_date_plugin_init(EomStatusbarDatePlugin* plugin) +static void +eom_statusbar_date_plugin_init (EomStatusbarDatePlugin *plugin) { - eom_debug_message(DEBUG_PLUGINS, "EomStatusbarDatePlugin initializing"); + eom_debug_message (DEBUG_PLUGINS, "EomStatusbarDatePlugin initializing"); } -static void eom_statusbar_date_plugin_finalize(GObject* object) +static void +eom_statusbar_date_plugin_finalize (GObject *object) { - eom_debug_message(DEBUG_PLUGINS, "EomStatusbarDatePlugin finalizing"); + eom_debug_message (DEBUG_PLUGINS, "EomStatusbarDatePlugin finalizing"); - G_OBJECT_CLASS(eom_statusbar_date_plugin_parent_class)->finalize(object); + G_OBJECT_CLASS (eom_statusbar_date_plugin_parent_class)->finalize (object); } -static void impl_activate(EomPlugin* plugin, EomWindow* window) +static void +impl_activate (EomPlugin *plugin, + EomWindow *window) { - GtkWidget* statusbar = eom_window_get_statusbar(window); - GtkWidget* thumbview = eom_window_get_thumb_view(window); - WindowData* data; + GtkWidget *statusbar = eom_window_get_statusbar (window); + GtkWidget *thumbview = eom_window_get_thumb_view (window); + WindowData *data; - eom_debug(DEBUG_PLUGINS); + eom_debug (DEBUG_PLUGINS); - data = g_new(WindowData, 1); - data->statusbar_date = gtk_statusbar_new(); - gtk_widget_set_size_request(data->statusbar_date, 200, 10); + data = g_new (WindowData, 1); + data->statusbar_date = gtk_statusbar_new (); + gtk_widget_set_size_request (data->statusbar_date, 200, 10); gtk_widget_set_margin_top (GTK_WIDGET (data->statusbar_date), 0); gtk_widget_set_margin_bottom (GTK_WIDGET (data->statusbar_date), 0); - gtk_box_pack_end(GTK_BOX(statusbar), data->statusbar_date, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (statusbar), data->statusbar_date, FALSE, FALSE, 0); - data->signal_id = g_signal_connect_after(G_OBJECT(thumbview), "selection_changed", G_CALLBACK(selection_changed_cb), data); + data->signal_id = g_signal_connect_after (G_OBJECT (thumbview), "selection_changed", + G_CALLBACK (selection_changed_cb), data); - statusbar_set_date(GTK_STATUSBAR(data->statusbar_date), EOM_THUMB_VIEW(eom_window_get_thumb_view(window))); + statusbar_set_date (GTK_STATUSBAR (data->statusbar_date), EOM_THUMB_VIEW (eom_window_get_thumb_view (window))); - g_object_set_data_full(G_OBJECT(window), WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); + g_object_set_data_full (G_OBJECT (window), WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); } -static void impl_deactivate(EomPlugin* plugin, EomWindow* window) +static void +impl_deactivate (EomPlugin *plugin, + EomWindow *window) { - GtkWidget* statusbar = eom_window_get_statusbar(window); - GtkWidget* view = eom_window_get_thumb_view(window); - WindowData* data; + GtkWidget *statusbar = eom_window_get_statusbar (window); + GtkWidget *view = eom_window_get_thumb_view (window); + WindowData *data; - data = (WindowData*) g_object_get_data(G_OBJECT (window), WINDOW_DATA_KEY); + data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); - g_signal_handler_disconnect(view, data->signal_id); + g_signal_handler_disconnect (view, data->signal_id); - gtk_container_remove(GTK_CONTAINER(statusbar), data->statusbar_date); + gtk_container_remove (GTK_CONTAINER (statusbar), data->statusbar_date); - g_object_set_data(G_OBJECT(window), WINDOW_DATA_KEY, NULL); + g_object_set_data (G_OBJECT(window), WINDOW_DATA_KEY, NULL); } -static void impl_update_ui(EomPlugin* plugin, EomWindow* window) +static void +impl_update_ui (EomPlugin *plugin, + EomWindow *window) { /* nothing */ } -static void eom_statusbar_date_plugin_class_init (EomStatusbarDatePluginClass* klass) +static void +eom_statusbar_date_plugin_class_init (EomStatusbarDatePluginClass *klass) { - GObjectClass* object_class = G_OBJECT_CLASS(klass); - EomPluginClass* plugin_class = EOM_PLUGIN_CLASS(klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + EomPluginClass *plugin_class = EOM_PLUGIN_CLASS (klass); object_class->finalize = eom_statusbar_date_plugin_finalize; diff --git a/plugins/statusbar-date/eom-statusbar-date-plugin.h b/plugins/statusbar-date/eom-statusbar-date-plugin.h index 84bfeaf..0718bbe 100644 --- a/plugins/statusbar-date/eom-statusbar-date-plugin.h +++ b/plugins/statusbar-date/eom-statusbar-date-plugin.h @@ -68,10 +68,10 @@ struct _EomStatusbarDatePluginClass { /* * Public methods */ -GType eom_statusbar_date_plugin_get_type(void) G_GNUC_CONST; +GType eom_statusbar_date_plugin_get_type (void) G_GNUC_CONST; /* All the plugins must implement this function */ -G_MODULE_EXPORT GType register_eom_plugin(GTypeModule* module); +G_MODULE_EXPORT GType register_eom_plugin (GTypeModule* module); G_END_DECLS |