From 68c35c4bedc4cd36cf2396121921f2e781b631fb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 13 Dec 2010 16:05:32 -0500 Subject: Adapt calendar/gui to the new ESource API. --- calendar/gui/e-task-list-selector.c | 52 ++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 15 deletions(-) (limited to 'calendar/gui/e-task-list-selector.c') diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c index 433bec9d25..0adae5b031 100644 --- a/calendar/gui/e-task-list-selector.c +++ b/calendar/gui/e-task-list-selector.c @@ -24,6 +24,7 @@ #include #include +#include #include #include "e-util/e-selection.h" #include "calendar/gui/comp-util.h" @@ -162,8 +163,8 @@ task_list_selector_process_data (ESourceSelector *selector, icalcomponent *icalcomp, GdkDragAction action) { - ESourceList *source_list; ESource *source; + ESourceRegistry *registry; icalcomponent *tmp_icalcomp = NULL; const gchar *uid; gchar *old_uid = NULL; @@ -204,18 +205,17 @@ task_list_selector_process_data (ESourceSelector *selector, if (!success || action != GDK_ACTION_MOVE) goto exit; - source_list = e_source_selector_get_source_list (selector); - source = e_source_list_peek_source_by_uid (source_list, source_uid); + registry = e_source_selector_get_registry (selector); + source = e_source_registry_ref_source (registry, source_uid); - if (!E_IS_SOURCE (source) || e_source_get_readonly (source)) - goto exit; - - e_client_utils_open_new ( - source, E_CLIENT_SOURCE_TYPE_MEMOS, TRUE, NULL, - e_client_utils_authenticate_handler, NULL, - client_opened_cb, g_strdup (old_uid)); + if (source != NULL) { + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_MEMOS, TRUE, NULL, + client_opened_cb, g_strdup (old_uid)); + g_object_unref (source); + } - exit: +exit: g_free (old_uid); return success; @@ -288,6 +288,24 @@ exit: g_free (dd); } +static void +task_list_selector_constructed (GObject *object) +{ + ESourceSelector *selector; + ESourceRegistry *registry; + ESource *source; + + selector = E_SOURCE_SELECTOR (object); + registry = e_source_selector_get_registry (selector); + source = e_source_registry_ref_default_task_list (registry); + e_source_selector_set_primary_selection (selector, source); + g_object_unref (source); + + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_task_list_selector_parent_class)-> + constructed (object); +} + static gboolean task_list_selector_data_dropped (ESourceSelector *selector, GtkSelectionData *selection_data, @@ -304,7 +322,6 @@ task_list_selector_data_dropped (ESourceSelector *selector, e_client_utils_open_new ( destination, E_CLIENT_SOURCE_TYPE_TASKS, TRUE, NULL, - e_client_utils_authenticate_handler, NULL, client_opened_for_drop_cb, dd); return TRUE; @@ -313,10 +330,14 @@ task_list_selector_data_dropped (ESourceSelector *selector, static void e_task_list_selector_class_init (ETaskListSelectorClass *class) { + GObjectClass *object_class; ESourceSelectorClass *source_selector_class; g_type_class_add_private (class, sizeof (ETaskListSelectorPrivate)); + object_class = G_OBJECT_CLASS (class); + object_class->constructed = task_list_selector_constructed; + source_selector_class = E_SOURCE_SELECTOR_CLASS (class); source_selector_class->data_dropped = task_list_selector_data_dropped; } @@ -334,11 +355,12 @@ e_task_list_selector_init (ETaskListSelector *selector) } GtkWidget * -e_task_list_selector_new (ESourceList *source_list) +e_task_list_selector_new (ESourceRegistry *registry) { - g_return_val_if_fail (E_IS_SOURCE_LIST (source_list), NULL); + g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL); return g_object_new ( E_TYPE_TASK_LIST_SELECTOR, - "source-list", source_list, NULL); + "extension-name", E_SOURCE_EXTENSION_TASK_LIST, + "registry", registry, NULL); } -- cgit v1.2.3