Support migration in the new shell design.

Some code got duplicated for calendars and tasks.  Made a note to revisit.

svn path=/branches/kill-bonobo/; revision=36560

1 files changed, 26 insertions, 13 deletions

diff --git a/shell/test/e-test-shell-module.c b/shell/test/e-test-shell-module.c
index 32de51a650..19b5d3bd96 100644
--- a/shell/test/e-test-shell-module.c
+++ b/shell/test/e-test-shell-module.c
@@ -86,8 +86,20 @@ test_module_shutdown (EShellModule *shell_module)
 }
 
 static gboolean
-test_module_handle_uri (EShellModule *shell_module,
-                        const gchar *uri)
+test_module_migrate (EShellModule *shell_module,
+                     gint major,
+                     gint minor,
+                     gint micro,
+                     GError **error)
+{
+	g_debug ("%s (from %d.%d.%d)", G_STRFUNC, major, minor, micro);
+
+	return TRUE;
+}
+
+static gboolean
+test_module_handle_uri_cb (EShellModule *shell_module,
+                           const gchar *uri)
 {
 	g_debug ("%s (uri=%s)", G_STRFUNC, uri);
 
@@ -95,15 +107,15 @@ test_module_handle_uri (EShellModule *shell_module,
 }
 
 static void
-test_module_send_receive (EShellModule *shell_module,
-                          GtkWindow *parent_window)
+test_module_send_receive_cb (EShellModule *shell_module,
+                             GtkWindow *parent_window)
 {
 	g_debug ("%s (window=%p)", G_STRFUNC, parent_window);
 }
 
 static void
-test_module_window_created (EShellModule *shell_module,
-                            EShellWindow *shell_window)
+test_module_window_created_cb (EShellModule *shell_module,
+                               EShellWindow *shell_window)
 {
 	const gchar *module_name;
 
@@ -121,8 +133,8 @@ test_module_window_created (EShellModule *shell_module,
 }
 
 static void
-test_module_window_destroyed (EShellModule *shell_module,
-                              gboolean last_window)
+test_module_window_destroyed_cb (EShellModule *shell_module,
+                                 gboolean last_window)
 {
 	g_debug ("%s (last=%d)", G_STRFUNC, last_window);
 }
@@ -136,7 +148,8 @@ static EShellModuleInfo module_info = {
 
 	/* Methods */
 	test_module_is_busy,
-	test_module_shutdown
+	test_module_shutdown,
+	test_module_migrate
 };
 
 void
@@ -153,17 +166,17 @@ e_shell_module_init (GTypeModule *type_module)
 
 	g_signal_connect_swapped (
 		shell, "handle-uri",
-		G_CALLBACK (test_module_handle_uri), shell_module);
+		G_CALLBACK (test_module_handle_uri_cb), shell_module);
 
 	g_signal_connect_swapped (
 		shell, "send-receive",
-		G_CALLBACK (test_module_send_receive), shell_module);
+		G_CALLBACK (test_module_send_receive_cb), shell_module);
 
 	g_signal_connect_swapped (
 		shell, "window-created",
-		G_CALLBACK (test_module_window_created), shell_module);
+		G_CALLBACK (test_module_window_created_cb), shell_module);
 
 	g_signal_connect_swapped (
 		shell, "window-destroyed",
-		G_CALLBACK (test_module_window_destroyed), shell_module);
+		G_CALLBACK (test_module_window_destroyed_cb), shell_module);
 }