diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-04-22 02:52:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-04-22 05:07:15 +0800 |
| commit | 7950d6a0c6efd6c4d48afd99c138f38952bdd1bb (patch) | |
| tree | 3a8fd7957dd29441120d2db18ccb1cc23f5935f2 /calendar/gui/dialogs/memo-page.c | |
| parent | 397b15ff4aa5afd1d5c7e0a093a33616624401cf (diff) | |
| download | gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.gz gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.zst gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.zip | |
Adapt to libedataserver[ui] changes.
Diffstat (limited to 'calendar/gui/dialogs/memo-page.c')
| -rw-r--r-- | calendar/gui/dialogs/memo-page.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 5348a19328..58d3d3b207 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -947,7 +947,7 @@ mpage_client_opened_cb (GObject *source_object, dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Unable to open memos in '%s': %s"), - e_source_peek_name (source), + e_source_get_display_name (source), error ? error->message : _("Unknown error")); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -993,7 +993,8 @@ source_changed_cb (ESourceComboBox *source_combo_box, if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (mpage))) return; - source = e_source_combo_box_get_active (source_combo_box); + source = e_source_combo_box_ref_active (source_combo_box); + g_return_if_fail (source != NULL); if (priv->open_cancellable) { g_cancellable_cancel (priv->open_cancellable); @@ -1001,9 +1002,13 @@ source_changed_cb (ESourceComboBox *source_combo_box, } priv->open_cancellable = g_cancellable_new (); - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_MEMOS, FALSE, priv->open_cancellable, - e_client_utils_authenticate_handler, NULL, - mpage_client_opened_cb, mpage); + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_MEMOS, + FALSE, priv->open_cancellable, + e_client_utils_authenticate_handler, NULL, + mpage_client_opened_cb, mpage); + + g_object_unref (source); } static void |