Coding style and whitespace cleanup.

6 files changed, 41 insertions, 37 deletions

diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c
index a9128c1b9b..29c7f293fd 100644
--- a/shell/e-shell-meego.c
+++ b/shell/e-shell-meego.c
@@ -87,7 +87,7 @@ e_shell_detect_meego (gboolean *is_meego,
 		}
 
 		display = gdk_display_get_default ();
-		screen = gdk_display_get_default_screen (gdk_display_get_default());
+		screen = gdk_display_get_default_screen (gdk_display_get_default ());
 
 		gdk_error_trap_push ();
 
diff --git a/shell/e-shell-searchbar.h b/shell/e-shell-searchbar.h
index 84049e99e0..a5cb2506cf 100644
--- a/shell/e-shell-searchbar.h
+++ b/shell/e-shell-searchbar.h
@@ -68,7 +68,8 @@ struct _EShellSearchbarClass {
 
 GType		e_shell_searchbar_get_type	(void);
 GtkWidget *	e_shell_searchbar_new		(EShellView *shell_view);
-EShellView *	e_shell_searchbar_get_shell_view(EShellSearchbar *searchbar);
+EShellView *	e_shell_searchbar_get_shell_view
+						(EShellSearchbar *searchbar);
 gboolean	e_shell_searchbar_get_express_mode
 						(EShellSearchbar *searchbar);
 void		e_shell_searchbar_set_express_mode
diff --git a/shell/e-shell-sidebar.h b/shell/e-shell-sidebar.h
index 95f2e97dad..4b22258b63 100644
--- a/shell/e-shell-sidebar.h
+++ b/shell/e-shell-sidebar.h
@@ -77,8 +77,10 @@ struct _EShellView *
 const gchar *	e_shell_sidebar_get_icon_name	(EShellSidebar *shell_sidebar);
 void		e_shell_sidebar_set_icon_name	(EShellSidebar *shell_sidebar,
 						 const gchar *icon_name);
-const gchar *	e_shell_sidebar_get_primary_text(EShellSidebar *shell_sidebar);
-void		e_shell_sidebar_set_primary_text(EShellSidebar *shell_sidebar,
+const gchar *	e_shell_sidebar_get_primary_text
+						(EShellSidebar *shell_sidebar);
+void		e_shell_sidebar_set_primary_text
+						(EShellSidebar *shell_sidebar,
 						 const gchar *primary_text);
 const gchar *	e_shell_sidebar_get_secondary_text
 						(EShellSidebar *shell_sidebar);
diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h
index 9baa3cf8e9..8e29093ed7 100644
--- a/shell/e-shell-window.h
+++ b/shell/e-shell-window.h
@@ -96,7 +96,8 @@ struct _EShellView *
 GtkAction *	e_shell_window_get_shell_view_action
 						(EShellWindow *shell_window,
 						 const gchar *view_name);
-EFocusTracker *	e_shell_window_get_focus_tracker(EShellWindow *shell_window);
+EFocusTracker *	e_shell_window_get_focus_tracker
+						(EShellWindow *shell_window);
 GtkUIManager *	e_shell_window_get_ui_manager	(EShellWindow *shell_window);
 GtkAction *	e_shell_window_get_action	(EShellWindow *shell_window,
 						 const gchar *action_name);
diff --git a/shell/es-event.c b/shell/es-event.c
index c647827586..71381c1cfd 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -36,19 +36,19 @@ static GObjectClass *eme_parent;
 static ESEvent *es_event;
 
 static void
-eme_init(GObject *o)
+eme_init (GObject *o)
 {
 	/*ESEvent *eme = (ESEvent *)o; */
 }
 
 static void
-eme_finalise(GObject *o)
+eme_finalise (GObject *o)
 {
-	((GObjectClass *)eme_parent)->finalize(o);
+	((GObjectClass *)eme_parent)->finalize (o);
 }
 
 static void
-eme_target_free(EEvent *ep, EEventTarget *t)
+eme_target_free (EEvent *ep, EEventTarget *t)
 {
 	switch (t->type) {
 	case ES_EVENT_TARGET_STATE: {
@@ -58,31 +58,31 @@ eme_target_free(EEvent *ep, EEventTarget *t)
 		break; }
 	}
 
-	((EEventClass *)eme_parent)->target_free(ep, t);
+	((EEventClass *)eme_parent)->target_free (ep, t);
 }
 
 static void
-eme_class_init(GObjectClass *klass)
+eme_class_init (GObjectClass *klass)
 {
 	klass->finalize = eme_finalise;
 	((EEventClass *)klass)->target_free = eme_target_free;
 }
 
 GType
-es_event_get_type(void)
+es_event_get_type (void)
 {
 	static GType type = 0;
 
 	if (type == 0) {
 		static const GTypeInfo info = {
-			sizeof(ESEventClass),
+			sizeof (ESEventClass),
 			NULL, NULL,
 			(GClassInitFunc)eme_class_init,
 			NULL, NULL,
-			sizeof(ESEvent), 0,
+			sizeof (ESEvent), 0,
 			(GInstanceInitFunc)eme_init
 		};
-		eme_parent = g_type_class_ref(e_event_get_type());
+		eme_parent = g_type_class_ref (e_event_get_type ());
 		type = g_type_register_static(e_event_get_type(), "ESEvent", &info, 0);
 	}
 
@@ -96,10 +96,10 @@ es_event_get_type(void)
  *
  * Return: the shell event handler
  **/
-ESEvent *es_event_peek(void)
+ESEvent *es_event_peek (void)
 {
 	if (es_event == NULL) {
-		es_event = g_object_new(es_event_get_type(), NULL);
+		es_event = g_object_new (es_event_get_type (), NULL);
 		/** @HookPoint: Shell Events Hookpoint
 		 * Id: org.gnome.evolution.shell.events
 		 *
@@ -120,9 +120,9 @@ es_event_target_new (ESEvent *eme)
 }
 
 ESEventTargetState *
-es_event_target_new_state(ESEvent *eme, gint state)
+es_event_target_new_state (ESEvent *eme, gint state)
 {
-	ESEventTargetState *t = e_event_target_new(&eme->event, ES_EVENT_TARGET_STATE, sizeof(*t));
+	ESEventTargetState *t = e_event_target_new (&eme->event, ES_EVENT_TARGET_STATE, sizeof (*t));
 	guint32 mask = ~0;
 
 	t->state = state;
@@ -138,9 +138,9 @@ es_event_target_new_state(ESEvent *eme, gint state)
 }
 
 ESEventTargetUpgrade *
-es_event_target_new_upgrade(ESEvent *eme, gint major, gint minor, gint revision)
+es_event_target_new_upgrade (ESEvent *eme, gint major, gint minor, gint revision)
 {
-	ESEventTargetUpgrade *t = e_event_target_new(&eme->event, ES_EVENT_TARGET_UPGRADE, sizeof(*t));
+	ESEventTargetUpgrade *t = e_event_target_new (&eme->event, ES_EVENT_TARGET_UPGRADE, sizeof (*t));
 
 	t->major = major;
 	t->minor = minor;
@@ -179,15 +179,15 @@ static const EEventHookTargetMap emeh_targets[] = {
 };
 
 static void
-emeh_finalise(GObject *o)
+emeh_finalise (GObject *o)
 {
 	/*EPluginHook *eph = (EPluginHook *)o;*/
 
-	((GObjectClass *)emeh_parent_class)->finalize(o);
+	((GObjectClass *)emeh_parent_class)->finalize (o);
 }
 
 static void
-emeh_class_init(EPluginHookClass *klass)
+emeh_class_init (EPluginHookClass *klass)
 {
 	gint i;
 
@@ -202,23 +202,23 @@ emeh_class_init(EPluginHookClass *klass)
 	((EPluginHookClass *)klass)->id = "org.gnome.evolution.shell.events:1.0";
 
 	for (i=0;emeh_targets[i].type;i++)
-		e_event_hook_class_add_target_map((EEventHookClass *)klass, &emeh_targets[i]);
+		e_event_hook_class_add_target_map ((EEventHookClass *)klass, &emeh_targets[i]);
 
-	((EEventHookClass *)klass)->event = (EEvent *)es_event_peek();
+	((EEventHookClass *)klass)->event = (EEvent *)es_event_peek ();
 }
 
 GType
-es_event_hook_get_type(void)
+es_event_hook_get_type (void)
 {
 	static GType type = 0;
 
 	if (!type) {
 		static const GTypeInfo info = {
-			sizeof(ESEventHookClass), NULL, NULL, (GClassInitFunc) emeh_class_init, NULL, NULL,
-			sizeof(ESEventHook), 0, (GInstanceInitFunc) NULL,
+			sizeof (ESEventHookClass), NULL, NULL, (GClassInitFunc) emeh_class_init, NULL, NULL,
+			sizeof (ESEventHook), 0, (GInstanceInitFunc) NULL,
 		};
 
-		emeh_parent_class = g_type_class_ref(e_event_hook_get_type());
+		emeh_parent_class = g_type_class_ref (e_event_hook_get_type ());
 		type = g_type_register_static(e_event_hook_get_type(), "ESEventHook", &info, 0);
 	}
 
diff --git a/shell/main.c b/shell/main.c
index 55af1fd4cc..167f7f5e84 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -140,7 +140,7 @@ categories_icon_theme_hack (void)
 /* Warning dialog to scare people off a little bit.  */
 
 static gboolean
-show_development_warning(void)
+show_development_warning (void)
 {
 	GtkWidget *action_area;
 	GtkWidget *content_area;
@@ -173,7 +173,7 @@ show_development_warning(void)
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 	gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 
-	text = g_strdup_printf(
+	text = g_strdup_printf (
 		/* xgettext:no-c-format */
 		/* Preview/Alpha/Beta version warning message */
 		_("Hi.  Thanks for taking the time to download this preview release\n"
@@ -193,7 +193,7 @@ show_development_warning(void)
 		  "eagerly await your contributions!\n"),
 		STABLE_VERSION);
 	label = gtk_label_new (text);
-	g_free(text);
+	g_free (text);
 
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
@@ -202,8 +202,8 @@ show_development_warning(void)
 
 	label = gtk_label_new (_("Thanks\n"
 				 "The Evolution Team\n"));
-	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-	gtk_misc_set_alignment(GTK_MISC(label), 1, .5);
+	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
+	gtk_misc_set_alignment (GTK_MISC (label), 1, .5);
 
 	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
 
@@ -524,8 +524,8 @@ main (gint argc, gchar **argv)
 	}
 
 	if (unregister_handlers) {
-		_e_win32_unregister_mailer();
-		_e_win32_unregister_addressbook();
+		_e_win32_unregister_mailer ();
+		_e_win32_unregister_addressbook ();
 		exit (0);
 	}