Coding style and whitespace cleanup.

4 files changed, 28 insertions, 35 deletions

diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 1ce9f17e41..57e0d2e899 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -161,7 +161,9 @@ update_publish_notification (GtkMessageType msg_type,
 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
 			g_timeout_add (500, show_notify_cb, NULL);
 
-			g_signal_connect (notify, "closed", G_CALLBACK (remove_notification), NULL);
+			g_signal_connect (
+				notify, "closed",
+				G_CALLBACK (remove_notification), NULL);
 		}
 	}
 #endif
@@ -426,8 +428,12 @@ mount_first (EPublishUri *uri,
 	ms->mount_op = g_mount_operation_new ();
 	ms->can_report_success = can_report_success;
 
-	g_signal_connect (ms->mount_op, "ask-password", G_CALLBACK (ask_password), ms);
-	g_signal_connect (ms->mount_op, "ask-question", G_CALLBACK (ask_question), ms);
+	g_signal_connect (
+		ms->mount_op, "ask-password",
+		G_CALLBACK (ask_password), ms);
+	g_signal_connect (
+		ms->mount_op, "ask-question",
+		G_CALLBACK (ask_question), ms);
 
 	g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE, ms->mount_op, NULL, mount_ready_cb, ms);
 }
@@ -969,7 +975,9 @@ e_plugin_lib_enable (EPlugin *ep,
 		g_signal_handlers_disconnect_by_func (shell, G_CALLBACK (online_state_changed), NULL);
 		if (enable) {
 			online = e_shell_get_online (shell);
-			g_signal_connect (shell, "notify::online", G_CALLBACK (online_state_changed), NULL);
+			g_signal_connect (
+				shell, "notify::online",
+				G_CALLBACK (online_state_changed), NULL);
 		}
 	}
 
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index b5895ae4c0..7b9e3e1660 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.c
@@ -95,7 +95,9 @@ write_calendar (const gchar *uid,
 		return FALSE;
 	}
 
-	g_signal_connect (client, "authenticate", G_CALLBACK (e_client_utils_authenticate_handler), NULL);
+	g_signal_connect (
+		client, "authenticate",
+		G_CALLBACK (e_client_utils_authenticate_handler), NULL);
 
 	if (!e_client_open_sync (E_CLIENT (client), TRUE, NULL, error)) {
 		g_object_unref (client);
@@ -109,7 +111,9 @@ write_calendar (const gchar *uid,
 
 	top_level = e_cal_util_new_top_level ();
 
-	g_signal_connect (client, "free-busy-data", G_CALLBACK (free_busy_data_cb), &objects);
+	g_signal_connect (
+		client, "free-busy-data",
+		G_CALLBACK (free_busy_data_cb), &objects);
 
 	if (e_cal_client_get_free_busy_sync (client, start, end, users, NULL, error)) {
 		gchar *ical_string;
diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index 4d110aed30..171fd6c1c0 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.c
@@ -92,7 +92,9 @@ write_calendar (const gchar *uid,
 		return FALSE;
 	}
 
-	g_signal_connect (client, "authenticate", G_CALLBACK (e_client_utils_authenticate_handler), NULL);
+	g_signal_connect (
+		client, "authenticate",
+		G_CALLBACK (e_client_utils_authenticate_handler), NULL);
 
 	if (!e_client_open_sync (E_CLIENT (client), TRUE, NULL, error)) {
 		g_object_unref (client);
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 9467705040..db3dd28bdc 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -32,7 +32,10 @@
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
-static GtkDialogClass *parent_class = NULL;
+G_DEFINE_TYPE (
+	UrlEditorDialog,
+	url_editor_dialog,
+	GTK_TYPE_DIALOG)
 
 static void
 create_uri (UrlEditorDialog *dialog)
@@ -540,17 +543,15 @@ url_editor_dialog_dispose (GObject *obj)
 		dialog->builder = NULL;
 	}
 
-	((GObjectClass *)(parent_class))->dispose (obj);
+	G_OBJECT_CLASS (url_editor_dialog_parent_class)->dispose (obj);
 }
 
 static void
-url_editor_dialog_class_init (UrlEditorDialogClass *klass)
+url_editor_dialog_class_init (UrlEditorDialogClass *class)
 {
 	GObjectClass *object_class;
 
-	object_class = (GObjectClass *) klass;
-	parent_class = g_type_class_ref (GTK_TYPE_DIALOG);
-
+	object_class = G_OBJECT_CLASS (class);
 	object_class->dispose = url_editor_dialog_dispose;
 }
 
@@ -559,28 +560,6 @@ url_editor_dialog_init (UrlEditorDialog *dialog)
 {
 }
 
-GType
-url_editor_dialog_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo info = {
-			sizeof (UrlEditorDialogClass),
-			NULL, NULL,
-			(GClassInitFunc) url_editor_dialog_class_init,
-			NULL, NULL,
-			sizeof (UrlEditorDialog),
-			0,
-			(GInstanceInitFunc) url_editor_dialog_init,
-		};
-
-		type = g_type_register_static (GTK_TYPE_DIALOG, "UrlEditorDialog", &info, 0);
-	}
-
-	return type;
-}
-
 gboolean
 url_editor_dialog_run (UrlEditorDialog *dialog)
 {