using allman style

3 files changed, 93 insertions, 104 deletions

diff --git a/plugins/statusbar-date/eom-statusbar-date-plugin.c b/plugins/statusbar-date/eom-statusbar-date-plugin.c
index f096fcf..84b1524 100644
--- a/plugins/statusbar-date/eom-statusbar-date-plugin.c
+++ b/plugins/statusbar-date/eom-statusbar-date-plugin.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+	#include <config.h>
 #endif
 
 #include "eom-statusbar-date-plugin.h"
@@ -41,140 +41,126 @@
 
 EOM_PLUGIN_REGISTER_TYPE(EomStatusbarDatePlugin, eom_statusbar_date_plugin)
 
-typedef struct
-{
-	GtkWidget *statusbar_date;
+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_load (image, EOM_IMAGE_DATA_EXIF, NULL, NULL)) {
-			gtk_widget_hide (GTK_WIDGET (statusbar));
+	if (!eom_image_has_data(image, EOM_IMAGE_DATA_EXIF))
+	{
+		if (!eom_image_load(image, EOM_IMAGE_DATA_EXIF, NULL, NULL))
+		{
+			gtk_widget_hide(GTK_WIDGET(statusbar));
 		}
 	}
 
-	exif_data = (ExifData *) eom_image_get_exif_info (image);
-	if (exif_data) {
-		date = eom_exif_util_format_date (
-			eom_exif_util_get_value (exif_data, EXIF_TAG_DATE_TIME_ORIGINAL, time_buffer, 32));
-		exif_data_unref (exif_data);
+	exif_data = (ExifData*) eom_image_get_exif_info(image);
+
+	if (exif_data)
+	{
+		date = eom_exif_util_format_date(eom_exif_util_get_value(exif_data, EXIF_TAG_DATE_TIME_ORIGINAL, time_buffer, 32));
+		exif_data_unref(exif_data);
 	}
 
-	if (date) {
-		gtk_statusbar_push (statusbar, 0, date);
-		gtk_widget_show (GTK_WIDGET (statusbar));
-		g_free (date);
-	} else {
-		gtk_widget_hide (GTK_WIDGET (statusbar));
+	if (date)
+	{
+		gtk_statusbar_push(statusbar, 0, date);
+		gtk_widget_show(GTK_WIDGET(statusbar));
+		g_free(date);
+	}
+	else
+	{
+		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;
-
-	eom_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),
-					   FALSE);
-	gtk_widget_set_size_request (data->statusbar_date, 200, 10);
-	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);
-
-	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);
+	GtkWidget* statusbar = eom_window_get_statusbar(window);
+	GtkWidget* thumbview = eom_window_get_thumb_view(window);
+	WindowData* data;
+
+	eom_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), FALSE);
+	gtk_widget_set_size_request(data->statusbar_date, 200, 10);
+	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);
+
+	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);
 }
 
-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 fccb533..0c24ac6 100644
--- a/plugins/statusbar-date/eom-statusbar-date-plugin.h
+++ b/plugins/statusbar-date/eom-statusbar-date-plugin.h
@@ -31,23 +31,28 @@ G_BEGIN_DECLS
 /*
  * Type checking and casting macros
  */
-#define EOM_TYPE_STATUSBAR_DATE_PLUGIN		(eom_statusbar_date_plugin_get_type ())
-#define EOM_STATUSBAR_DATE_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EOM_TYPE_STATUSBAR_DATE_PLUGIN, EomStatusbarDatePlugin))
-#define EOM_STATUSBAR_DATE_PLUGIN_CLASS(k)		G_TYPE_CHECK_CLASS_CAST((k),      EOM_TYPE_STATUSBAR_DATE_PLUGIN, EomStatusbarDatePluginClass))
-#define EOM_IS_STATUSBAR_DATE_PLUGIN(o)	        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EOM_TYPE_STATUSBAR_DATE_PLUGIN))
-#define EOM_IS_STATUSBAR_DATE_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k),    EOM_TYPE_STATUSBAR_DATE_PLUGIN))
-#define EOM_STATUSBAR_DATE_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o),  EOM_TYPE_STATUSBAR_DATE_PLUGIN, EomStatusbarDatePluginClass))
+#define EOM_TYPE_STATUSBAR_DATE_PLUGIN \
+	(eom_statusbar_date_plugin_get_type())
+#define EOM_STATUSBAR_DATE_PLUGIN(o) \
+	(G_TYPE_CHECK_INSTANCE_CAST((o), EOM_TYPE_STATUSBAR_DATE_PLUGIN, EomStatusbarDatePlugin))
+#define EOM_STATUSBAR_DATE_PLUGIN_CLASS(k) \
+	G_TYPE_CHECK_CLASS_CAST((k), EOM_TYPE_STATUSBAR_DATE_PLUGIN, EomStatusbarDatePluginClass))
+#define EOM_IS_STATUSBAR_DATE_PLUGIN(o) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((o), EOM_TYPE_STATUSBAR_DATE_PLUGIN))
+#define EOM_IS_STATUSBAR_DATE_PLUGIN_CLASS(k) \
+	(G_TYPE_CHECK_CLASS_TYPE((k), EOM_TYPE_STATUSBAR_DATE_PLUGIN))
+#define EOM_STATUSBAR_DATE_PLUGIN_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS((o), EOM_TYPE_STATUSBAR_DATE_PLUGIN, EomStatusbarDatePluginClass))
 
 /* Private structure type */
-typedef struct _EomStatusbarDatePluginPrivate	EomStatusbarDatePluginPrivate;
+typedef struct _EomStatusbarDatePluginPrivate EomStatusbarDatePluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _EomStatusbarDatePlugin		EomStatusbarDatePlugin;
+typedef struct _EomStatusbarDatePlugin EomStatusbarDatePlugin;
 
-struct _EomStatusbarDatePlugin
-{
+struct _EomStatusbarDatePlugin {
 	EomPlugin parent_instance;
 };
 
@@ -56,18 +61,17 @@ struct _EomStatusbarDatePlugin
  */
 typedef struct _EomStatusbarDatePluginClass	EomStatusbarDatePluginClass;
 
-struct _EomStatusbarDatePluginClass
-{
+struct _EomStatusbarDatePluginClass {
 	EomPluginClass parent_class;
 };
 
 /*
  * 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
 
diff --git a/plugins/statusbar-date/statusbar-date.eom-plugin.desktop.in b/plugins/statusbar-date/statusbar-date.eom-plugin.desktop.in
index c90c0f0..b947fe3 100644
--- a/plugins/statusbar-date/statusbar-date.eom-plugin.desktop.in
+++ b/plugins/statusbar-date/statusbar-date.eom-plugin.desktop.in
@@ -1,4 +1,3 @@
-
 [Eom Plugin]
 Module=statusbar-date
 IAge=2