diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-03 09:54:12 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:42:05 +0800 |
| commit | 4139e132c1d11b75d7741b0750d9d7535834327f (patch) | |
| tree | 1a07c6b42cdb960d4a01ff581d61912f371a33bc /mail/message-list.c | |
| parent | d6ef84d4112306810fe1d6873605ffb723a9e853 (diff) | |
| download | gsoc2013-evolution-4139e132c1d11b75d7741b0750d9d7535834327f.tar gsoc2013-evolution-4139e132c1d11b75d7741b0750d9d7535834327f.tar.gz gsoc2013-evolution-4139e132c1d11b75d7741b0750d9d7535834327f.tar.bz2 gsoc2013-evolution-4139e132c1d11b75d7741b0750d9d7535834327f.tar.lz gsoc2013-evolution-4139e132c1d11b75d7741b0750d9d7535834327f.tar.xz gsoc2013-evolution-4139e132c1d11b75d7741b0750d9d7535834327f.tar.zst gsoc2013-evolution-4139e132c1d11b75d7741b0750d9d7535834327f.zip | |
Drop 'folder_uri' param from message_list_set_folder().
Diffstat (limited to 'mail/message-list.c')
| -rw-r--r-- | mail/message-list.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/mail/message-list.c b/mail/message-list.c index 214740b99c..ba1808838b 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -3763,7 +3763,6 @@ folder_changed (CamelFolder *folder, * message_list_set_folder: * @message_list: Message List widget * @folder: folder backend to be set - * @uri: uri of @folder. * @outgoing: whether this is an outgoing folder * * Sets @folder to be the backend folder for @message_list. If @@ -3771,7 +3770,9 @@ folder_changed (CamelFolder *folder, * the "Outgoing folder" column view. **/ void -message_list_set_folder (MessageList *message_list, CamelFolder *folder, const gchar *uri, gboolean outgoing) +message_list_set_folder (MessageList *message_list, + CamelFolder *folder, + gboolean outgoing) { ETreeModel *etm = message_list->model; gboolean hide_deleted; @@ -3818,9 +3819,15 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g message_list->thread_tree = NULL; } - if (message_list->folder_uri != uri) { - g_free (message_list->folder_uri); - message_list->folder_uri = uri ? g_strdup (uri):NULL; + g_free (message_list->folder_uri); + message_list->folder_uri = NULL; + + /* XXX Not sure if MESSAGE_SELECTED signal handlers rely on + * folder_uri being set, so avoid temptation to move this + * logic down until verifying it's safe. */ + if (CAMEL_IS_FOLDER (folder)) { + const gchar *uri = camel_folder_get_uri (folder); + message_list->folder_uri = g_strdup (uri); } if (message_list->cursor_uid) { |