diff options
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 4 | ||||
| -rw-r--r-- | shell/test/e-test-shell-backend.c | 20 |
2 files changed, 3 insertions, 21 deletions
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 99ab2f9340..e0cd35b069 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -129,7 +129,7 @@ unmount_done_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { GError *error = NULL; -#if GLIB_CHECK_VERSION(2,21,4) +#if GLIB_CHECK_VERSION(2,21,3) g_mount_unmount_with_operation_finish (G_MOUNT (source_object), res, &error); #else g_mount_unmount_finish (G_MOUNT (source_object), res, &error); @@ -181,7 +181,7 @@ mount_ready_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) mount = g_file_find_enclosing_mount (G_FILE (source_object), NULL, NULL); if (mount) -#if GLIB_CHECK_VERSION(2,21,4) +#if GLIB_CHECK_VERSION(2,21,3) g_mount_unmount_with_operation (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, unmount_done_cb, NULL); #else g_mount_unmount (mount, G_MOUNT_UNMOUNT_NONE, NULL, unmount_done_cb, NULL); diff --git a/shell/test/e-test-shell-backend.c b/shell/test/e-test-shell-backend.c index e5fd3c6a43..6a6c03bddd 100644 --- a/shell/test/e-test-shell-backend.c +++ b/shell/test/e-test-shell-backend.c @@ -80,22 +80,6 @@ test_shell_backend_start (EShellBackend *shell_backend) } static gboolean -test_shell_backend_is_busy (EShellBackend *shell_backend) -{ - g_debug ("%s", G_STRFUNC); - - return FALSE; -} - -static gboolean -test_shell_backend_shutdown (EShellBackend *shell_backend) -{ - g_debug ("%s", G_STRFUNC); - - return TRUE; -} - -static gboolean test_shell_backend_migrate (EShellBackend *shell_backend, gint major, gint minor, @@ -151,7 +135,7 @@ test_shell_backend_window_destroyed_cb (EShellBackend *shell_backend) g_debug ("%s", G_STRFUNC); } -void +static void test_shell_backend_constructed (GObject *object) { EShell *shell; @@ -200,8 +184,6 @@ test_shell_backend_class_init (ETestShellBackendClass *class) shell_backend_class->schemes = ""; shell_backend_class->sort_order = 100; shell_backend_class->start = test_shell_backend_start; - shell_backend_class->is_busy = test_shell_backend_is_busy; - shell_backend_class->shutdown = test_shell_backend_shutdown; shell_backend_class->migrate = test_shell_backend_migrate; } |