Coding style and whitespace cleanups.

4 files changed, 31 insertions, 129 deletions

diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c
index 0845e63735..6b5c0f22d0 100644
--- a/shell/e-shell-meego.c
+++ b/shell/e-shell-meego.c
@@ -90,24 +90,30 @@ 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 (display);
 
 		gdk_error_trap_push ();
 
 		/* get the window manager's supporting window */
-		fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display),
-					GDK_WINDOW_XID (gdk_screen_get_root_window (screen)),
-					gdk_x11_atom_to_xatom_for_display (display, wm_win),
-					0, 1, False, XA_WINDOW, &dummy_t, &dummy_i,
-					&dummy_l, &dummy_l, (guchar **)(&wm_window_v));
+		fns.XGetWindowProperty (
+			gdk_x11_display_get_xdisplay (display),
+			GDK_WINDOW_XID (gdk_screen_get_root_window (screen)),
+			gdk_x11_atom_to_xatom_for_display (display, wm_win),
+			0, 1, False, XA_WINDOW,
+			&dummy_t, &dummy_i,
+			&dummy_l, &dummy_l,
+			(guchar **) (&wm_window_v));
 
 		/* get the '_Moblin' setting */
 		if (wm_window_v && (*wm_window_v != None))
-			fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), *wm_window_v,
-						gdk_x11_atom_to_xatom_for_display (display, mob_atom),
-						0, 8192, False, XA_STRING,
-						&dummy_t, &dummy_i, &dummy_l, &dummy_l,
-						&moblin_string);
+			fns.XGetWindowProperty (
+				gdk_x11_display_get_xdisplay (display),
+				*wm_window_v,
+				gdk_x11_atom_to_xatom_for_display (display, mob_atom),
+				0, 8192, False, XA_STRING,
+				&dummy_t, &dummy_i,
+				&dummy_l, &dummy_l,
+				&moblin_string);
 
 		gdk_error_trap_pop_ignored ();
 	}
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 5863e1c4a0..f5e1174729 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -846,7 +846,8 @@ merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key)
 				if (g_strcmp0 (val1, val2) == 0)
 					break;
 
-				/* relative uri should not be empty (but adressbook can have it empty) */
+				/* relative uri should not be empty
+				 * (but adressbook can have it empty) */
 				val1 = e_source_peek_relative_uri (dupe_source);
 				val2 = e_source_peek_relative_uri (my_source);
 				if (g_strcmp0 (val1, val2) == 0 && val1 && *val1)
diff --git a/shell/es-event.c b/shell/es-event.c
index 7628f64869..9d31f390e9 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -34,36 +34,14 @@ static GObjectClass *eme_parent;
 static ESEvent *es_event;
 
 static void
-eme_init (GObject *o)
-{
-	/*ESEvent *eme = (ESEvent *)o; */
-}
-
-static void
-eme_finalise (GObject *o)
+eme_class_init (GObjectClass *class)
 {
-	((GObjectClass *) eme_parent)->finalize (o);
 }
 
 static void
-eme_target_free (EEvent *ep, EEventTarget *t)
-{
-	switch (t->type) {
-	case ES_EVENT_TARGET_STATE: {
-		ESEventTargetState *s = (ESEventTargetState *) t;
-
-		s = s;
-		break; }
-	}
-
-	((EEventClass *) eme_parent)->target_free (ep, t);
-}
-
-static void
-eme_class_init (GObjectClass *klass)
+eme_init (GObject *o)
 {
-	klass->finalize = eme_finalise;
-	((EEventClass *) klass)->target_free = eme_target_free;
+	/*ESEvent *eme = (ESEvent *)o; */
 }
 
 GType
@@ -109,34 +87,6 @@ ESEvent *es_event_peek (void)
 	return es_event;
 }
 
-ESEventTargetShell *
-es_event_target_new (ESEvent *eme)
-{
-	return e_event_target_new (
-		&eme->event, ES_EVENT_TARGET_SHELL,
-		sizeof (ESEventTargetShell));
-}
-
-ESEventTargetState *
-es_event_target_new_state (ESEvent *eme, gint state)
-{
-	ESEventTargetState *t;
-	guint32 mask = ~0;
-
-	t = e_event_target_new (
-		&eme->event, ES_EVENT_TARGET_STATE, sizeof (*t));
-	t->state = state;
-
-	if (state)
-		mask &= ~ES_EVENT_STATE_ONLINE;
-	else
-		mask &= ~ES_EVENT_STATE_OFFLINE;
-
-	t->target.mask = mask;
-
-	return t;
-}
-
 ESEventTargetUpgrade *
 es_event_target_new_upgrade (ESEvent *eme, gint major, gint minor, gint revision)
 {
@@ -151,34 +101,13 @@ es_event_target_new_upgrade (ESEvent *eme, gint major, gint minor, gint revision
 	return t;
 }
 
-ESEventTargetComponent *
-es_event_target_new_component (ESEvent *eme, const gchar *id)
-{
-	ESEventTargetComponent *t;
-
-	t = e_event_target_new (
-		&eme->event, ES_EVENT_TARGET_COMPONENT, sizeof (*t));
-	t->id = id;
-
-	return t;
-}
-
 /* ********************************************************************** */
 
 static gpointer emeh_parent_class;
 #define emeh ((ESEventHook *)eph)
 
-static const EEventHookTargetMask emeh_state_masks[] = {
-	{ "online", ES_EVENT_STATE_ONLINE },
-	{ "offline", ES_EVENT_STATE_OFFLINE },
-	{ NULL }
-};
-
 static const EEventHookTargetMap emeh_targets[] = {
-	{ "state", ES_EVENT_TARGET_STATE, emeh_state_masks },
 	{ "upgrade", ES_EVENT_TARGET_UPGRADE, NULL },
-	{ "shell", ES_EVENT_TARGET_SHELL, NULL },
-	{ "component", ES_EVENT_TARGET_COMPONENT, NULL },
 	{ NULL }
 };
 
@@ -191,7 +120,7 @@ emeh_finalise (GObject *o)
 }
 
 static void
-emeh_class_init (EPluginHookClass *klass)
+emeh_class_init (EPluginHookClass *class)
 {
 	gint i;
 
@@ -202,13 +131,14 @@ emeh_class_init (EPluginHookClass *klass)
 	 * A hook for events coming from the shell.
 	 **/
 
-	((GObjectClass *) klass)->finalize = emeh_finalise;
-	((EPluginHookClass *)klass)->id = "org.gnome.evolution.shell.events:1.0";
+	((GObjectClass *) class)->finalize = emeh_finalise;
+	((EPluginHookClass *)class)->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 *) class, &emeh_targets[i]);
 
-	((EEventHookClass *) klass)->event = (EEvent *) es_event_peek ();
+	((EEventHookClass *) class)->event = (EEvent *) es_event_peek ();
 }
 
 GType
@@ -227,7 +157,8 @@ es_event_hook_get_type (void)
 		};
 
 		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);
+		type = g_type_register_static (
+			e_event_hook_get_type(), "ESEventHook", &info, 0);
 	}
 
 	return type;
diff --git a/shell/es-event.h b/shell/es-event.h
index 31823d118f..eba3f3d6b6 100644
--- a/shell/es-event.h
+++ b/shell/es-event.h
@@ -33,32 +33,10 @@ typedef struct _ESEventClass ESEventClass;
 
 /* Current target description */
 enum _es_event_target_t {
-	ES_EVENT_TARGET_STATE,
-	ES_EVENT_TARGET_UPGRADE,
-	ES_EVENT_TARGET_SHELL,
-	ES_EVENT_TARGET_COMPONENT
+	ES_EVENT_TARGET_UPGRADE
 };
 
-/* Flags that qualify TARGET_STATE */
-enum {
-	ES_EVENT_STATE_ONLINE = 1<<0,
-	ES_EVENT_STATE_OFFLINE = 1<<1
-};
-
-typedef struct _ESEventTargetState ESEventTargetState;
 typedef struct _ESEventTargetUpgrade ESEventTargetUpgrade;
-typedef struct _ESEventTargetShell ESEventTargetShell;
-typedef struct _ESEventTargetComponent ESEventTargetComponent;
-
-struct _ESEventTargetShell {
-	EEventTarget target;
-};
-
-struct _ESEventTargetState {
-	EEventTarget target;
-
-	gint state;
-};
 
 struct _ESEventTargetUpgrade {
 	EEventTarget target;
@@ -68,12 +46,6 @@ struct _ESEventTargetUpgrade {
 	gint revision;
 };
 
-struct _ESEventTargetComponent {
-	EEventTarget target;
-
-	const gchar *id;
-};
-
 typedef struct _EEventItem ESEventItem;
 
 /* The object */
@@ -89,19 +61,11 @@ struct _ESEventClass {
 
 GType		es_event_get_type		(void);
 ESEvent *	es_event_peek			(void);
-ESEventTargetShell *
-		es_event_target_new		(ESEvent *eme);
-ESEventTargetState *
-		es_event_target_new_state	(ESEvent *emp,
-						 gint state);
 ESEventTargetUpgrade *
 		es_event_target_new_upgrade	(ESEvent *event,
 						 gint major,
 						 gint minor,
 						 gint revision);
-ESEventTargetComponent *
-		es_event_target_new_component	(ESEvent *event,
-						 const gchar *id);
 
 /* ********************************************************************** */