diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-04 07:24:58 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-04 07:27:07 +0800 |
| commit | 324a7da5d7c9af29f18431b197f2caa3a0d40ec6 (patch) | |
| tree | 6b27e4eeb486f021cceed3f198038012edb20a02 /mail/e-mail-notebook-view.c | |
| parent | 99680d557b5763ae01e1a674ce8f3810936cd2c7 (diff) | |
| download | gsoc2013-evolution-324a7da5d7c9af29f18431b197f2caa3a0d40ec6.tar.gz gsoc2013-evolution-324a7da5d7c9af29f18431b197f2caa3a0d40ec6.tar.zst gsoc2013-evolution-324a7da5d7c9af29f18431b197f2caa3a0d40ec6.zip | |
Use e_mail_folder_uri_from_folder() instead of camel_folder_get_uri().
Diffstat (limited to 'mail/e-mail-notebook-view.c')
| -rw-r--r-- | mail/e-mail-notebook-view.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c index d6e4b4a9aa..582e0af166 100644 --- a/mail/e-mail-notebook-view.c +++ b/mail/e-mail-notebook-view.c @@ -1099,7 +1099,7 @@ mail_notebook_view_set_folder (EMailReader *reader, { EMailNotebookViewPrivate *priv; GtkWidget *new_view; - const gchar *folder_uri; + gchar *folder_uri; #if HAVE_CLUTTER EMailTab *tab; ClutterActor *clone; @@ -1111,8 +1111,10 @@ mail_notebook_view_set_folder (EMailReader *reader, priv = E_MAIL_NOTEBOOK_VIEW (reader)->priv; - folder_uri = camel_folder_get_uri (folder); + folder_uri = e_mail_folder_uri_from_folder (folder); new_view = g_hash_table_lookup (priv->views, folder_uri); + g_free (folder_uri); + if (new_view) { gint curr = emnv_get_page_num (E_MAIL_NOTEBOOK_VIEW (reader), new_view); #if HAVE_CLUTTER @@ -1241,7 +1243,9 @@ mail_notebook_view_set_folder (EMailReader *reader, #endif e_mail_reader_set_folder (E_MAIL_READER (priv->current_view), folder); - g_hash_table_insert (priv->views, g_strdup (folder_uri), priv->current_view); + + folder_uri = e_mail_folder_uri_from_folder (folder); + g_hash_table_insert (priv->views, folder_uri, priv->current_view); g_signal_connect ( priv->current_view, "changed", G_CALLBACK (reconnect_changed_event), reader); |