From 7812029bcf75f7ee0ca1887e38cef6010b4b6e07 Mon Sep 17 00:00:00 2001 From: Shakti Sen Date: Fri, 26 Aug 2005 10:28:30 +0000 Subject: Fixes the 'Label disappears' problem in Tasks, Calendar and Contacts. 2005-08-26 Shakti Sen * exchange-folder.c (org_gnome_exchange_folder_unsubscribe): Fixes the 'Label disappears' problem in Tasks, Calendar and Contacts. Fixes bug #311959. svn path=/trunk/; revision=30258 --- plugins/exchange-operations/ChangeLog | 7 +++++++ plugins/exchange-operations/exchange-folder.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 42939e4aec..e55420b3b7 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,10 @@ +2005-08-26 Shakti Sen + + * exchange-folder.c (org_gnome_exchange_folder_unsubscribe): Fixes the + 'Label disappears' problem in Tasks, Calendar and Contacts. + + Fixes bug #311959. + 2005-08-25 Arunprakash * exchange-config-listener.c (account_added) : Need to set the diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index f9b2dfa68c..4e48a66dfd 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -486,7 +486,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data) ESource *source = NULL; ExchangeAccount *account = NULL; gchar *title = NULL; - gchar *displayed_folder_name = NULL; + const gchar *displayed_folder_name; gint response; gint mode; ExchangeConfigListenerStatus status; @@ -512,7 +512,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data) } source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (target->selector)); - displayed_folder_name = (gchar *) e_source_peek_name (source); + displayed_folder_name = e_source_peek_name (source); dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, @@ -533,7 +533,6 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data) gtk_window_set_title (GTK_WINDOW (dialog), title); response = gtk_dialog_run (GTK_DIALOG (dialog)); g_free (title); - g_free (displayed_folder_name); gtk_widget_show (dialog); unsubscribe_dialog_response (GTK_DIALOG (dialog), response, data); -- cgit