From 4272acb80703d2227695b40fd74e0ec906a9ef5e Mon Sep 17 00:00:00 2001 From: Bharath Acharya Date: Fri, 7 Nov 2008 04:36:22 +0000 Subject: ** Fix for bug #557246 2008-10-22 Bharath Acharya ** Fix for bug #557246 * exchange-folder.c: * (org_gnome_exchange_check_inbox_subscribed): Pop up the "Unsubscribe Folder" option only for the subscribed folders and not to the Other's folder hierarchy. svn path=/trunk/; revision=36748 --- plugins/exchange-operations/ChangeLog | 8 ++++++++ plugins/exchange-operations/exchange-folder.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 785857400a..0d526d6245 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,11 @@ +2008-10-22 Bharath Acharya + + ** Fix for bug #557246 + + * exchange-folder.c: (org_gnome_exchange_check_inbox_subscribed): Pop + up the "Unsubscribe Folder" option only for the subscribed folders and + not to the Other's folder hierarchy. + 2008-10-08 Milan Crha ** Fix for bug #530606 diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index 3f2dc421fc..b2b53d1bb3 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -223,7 +223,7 @@ org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *tar g_free (path); - if (!sub_folder) + if (!sub_folder || !g_strrstr(sub_folder, "/")) return; for (i = 0; i < sizeof (popup_inbox_items) / sizeof (popup_inbox_items[0]); i++) -- cgit