aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnny Jacob <jjohnny@src.gnome.org>2007-09-07 20:16:07 +0800
committerJohnny Jacob <jjohnny@src.gnome.org>2007-09-07 20:16:07 +0800
commit6cfab2cd69ffb13d27011522271970352e1c3957 (patch)
tree32d6a560858a60e860ef4ddb6ee22be18d65d9bd
parent90abadc84d317fe7804b0c7d239bdbccdde5ba31 (diff)
downloadgsoc2013-evolution-6cfab2cd69ffb13d27011522271970352e1c3957.tar.gz
gsoc2013-evolution-6cfab2cd69ffb13d27011522271970352e1c3957.tar.zst
gsoc2013-evolution-6cfab2cd69ffb13d27011522271970352e1c3957.zip
Partial Fix for #467581.
svn path=/trunk/; revision=34194
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-component.c13
2 files changed, 12 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f2e16cbb9d..4230b241a1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-07 Johnny Jacob <jjohnny@novell.com>
+
+ ** Partial Fix for #467581.
+
+ * mail-component.c : (enable_folder_tree) : Get the right URIs for
+ selected and current folders.
+
2007-09-07 Milan Crha <mcrha@redhat.com>
** Fix for bug #473903
diff --git a/mail/mail-component.c b/mail/mail-component.c
index fb690161c9..e3adcc9b09 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -651,6 +651,7 @@ enable_folder_tree (GtkWidget *emfb, GtkWidget *emft)
{
EMFolderView *emfv = (EMFolderView *) emfb;
CamelURL *selected_curl, *current_curl;
+ CamelFolder *selected_folder;
gchar *uri;
/* Get the currently displayed folder. */
@@ -659,20 +660,16 @@ enable_folder_tree (GtkWidget *emfb, GtkWidget *emft)
g_free (uri);
/* Get the selected folder in the folder tree. */
- uri = em_folder_tree_get_selected_uri (EM_FOLDER_TREE (emft));
+ selected_folder = em_folder_tree_get_selected_folder(EM_FOLDER_TREE (emft));
+ uri = mail_tools_folder_to_url (selected_folder);
+
selected_curl = uri ? camel_url_new (uri, NULL) : NULL;
if (current_curl && selected_curl && !camel_url_equal (selected_curl, current_curl)) {
- CamelFolder *folder;
- CamelException ex;
-
- camel_exception_init (&ex);
- folder = mail_tool_uri_to_folder (uri, 0, &ex);
- camel_exception_clear (&ex);
g_signal_emit_by_name (
emft, "folder-selected", emft, uri,
- folder->full_name, uri, folder->folder_flags);
+ selected_folder->full_name, uri, selected_folder->folder_flags);
}
gtk_widget_set_sensitive (emft, TRUE);