GObject boilerplate cleanup.

Prefer thread-safe G_DEFINE_TYPE and G_DEFINE_INTERFACE macros over
manual GType registration.

This is just a start... lots more to do.

7 files changed, 37 insertions, 15 deletions

diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index 7b1fe4e5aa..5173ee8c83 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -62,8 +62,11 @@ enum {
 };
 
 G_DEFINE_TYPE_WITH_CODE (
-	EShellContent, e_shell_content, GTK_TYPE_BIN,
-	G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL));
+	EShellContent,
+	e_shell_content,
+	GTK_TYPE_BIN,
+	G_IMPLEMENT_INTERFACE (
+		E_TYPE_EXTENSIBLE, NULL));
 
 static void
 shell_content_dialog_rule_changed (GtkWidget *dialog,
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index a42fa18adc..cb525f8f85 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -92,8 +92,11 @@ enum {
 };
 
 G_DEFINE_TYPE_WITH_CODE (
-	EShellSearchbar, e_shell_searchbar, GTK_TYPE_BOX,
-	G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL))
+	EShellSearchbar,
+	e_shell_searchbar,
+	GTK_TYPE_BOX,
+	G_IMPLEMENT_INTERFACE (
+		E_TYPE_EXTENSIBLE, NULL))
 
 static void
 shell_searchbar_save_search_filter (EShellSearchbar *searchbar)
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index b5c3879c50..61a688360f 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -56,8 +56,11 @@ enum {
 };
 
 G_DEFINE_TYPE_WITH_CODE (
-	EShellSidebar, e_shell_sidebar, GTK_TYPE_BIN,
-	G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL))
+	EShellSidebar,
+	e_shell_sidebar,
+	GTK_TYPE_BIN,
+	G_IMPLEMENT_INTERFACE (
+		E_TYPE_EXTENSIBLE, NULL))
 
 static void
 shell_sidebar_set_shell_view (EShellSidebar *shell_sidebar,
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 0568c85b18..9569a51a12 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -63,9 +63,13 @@ static guint signals[LAST_SIGNAL];
 static void shell_switcher_tool_shell_iface_init (GtkToolShellIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
-	EShellSwitcher, e_shell_switcher, GTK_TYPE_BIN,
-	G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)
-	G_IMPLEMENT_INTERFACE (GTK_TYPE_TOOL_SHELL,
+	EShellSwitcher,
+	e_shell_switcher,
+	GTK_TYPE_BIN,
+	G_IMPLEMENT_INTERFACE (
+		E_TYPE_EXTENSIBLE, NULL)
+	G_IMPLEMENT_INTERFACE (
+		GTK_TYPE_TOOL_SHELL,
 		shell_switcher_tool_shell_iface_init))
 
 static gint
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 43865470de..a82d3d6246 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -57,8 +57,11 @@ enum {
 };
 
 G_DEFINE_TYPE_WITH_CODE (
-	EShellTaskbar, e_shell_taskbar, GTK_TYPE_HBOX,
-	G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL))
+	EShellTaskbar,
+	e_shell_taskbar,
+	GTK_TYPE_HBOX,
+	G_IMPLEMENT_INTERFACE (
+		E_TYPE_EXTENSIBLE, NULL))
 
 static void
 shell_taskbar_activity_remove (EShellTaskbar *shell_taskbar,
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index de6cda0e76..5480903f6b 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -55,8 +55,11 @@ enum {
 static gulong signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE_WITH_CODE (
-	EShellWindow, e_shell_window, GTK_TYPE_WINDOW,
-	G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL))
+	EShellWindow,
+	e_shell_window,
+	GTK_TYPE_WINDOW,
+	G_IMPLEMENT_INTERFACE (
+		E_TYPE_EXTENSIBLE, NULL))
 
 static void
 shell_window_menubar_update_new_menu (EShellWindow *shell_window)
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 9ed43fc110..fcb3d9abf3 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -113,8 +113,11 @@ static gpointer default_shell;
 static guint signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE_WITH_CODE (
-	EShell, e_shell, UNIQUE_TYPE_APP,
-	G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL))
+	EShell,
+	e_shell,
+	UNIQUE_TYPE_APP,
+	G_IMPLEMENT_INTERFACE (
+		E_TYPE_EXTENSIBLE, NULL))
 
 static void
 shell_parse_debug_string (EShell *shell)