diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/folder-browser.c | 9 | ||||
| -rw-r--r-- | mail/folder-browser.h | 3 |
3 files changed, 15 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 6c247fe954..450e057719 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2003-01-10 Not Zed <NotZed@Ximian.com> + + * folder-browser.c (folder_browser_gui_init): Save the paned_size + notify handle. + (folder_browser_destroy): Remove gconf notify handler. + 2003-01-09 Chris Toshok <toshok@ximian.com> * mail-config-druid.c (wizard_finish_cb): enable the account diff --git a/mail/folder-browser.c b/mail/folder-browser.c index ee23c54c0b..96e202e4b2 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -194,6 +194,11 @@ folder_browser_destroy (GtkObject *object) g_object_unref (folder_browser->view_menus); folder_browser->view_menus = NULL; } + + if (folder_browser->paned_size_notify_id != 0) { + gconf_client_notify_remove(gconf_client_get_default (), folder_browser->paned_size_notify_id); + folder_browser->paned_size_notify_id = 0; + } /* wait for all outstanding async events against us */ mail_async_event_destroy (folder_browser->async_event); @@ -2402,8 +2407,8 @@ folder_browser_gui_init (FolderBrowser *fb) gconf_client_add_dir (gconf, "/apps/evolution/mail/display/paned_size", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - gconf_client_notify_add (gconf, "/apps/evolution/mail/display/paned_size", - paned_size_changed, fb, NULL, NULL); + fb->paned_size_notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/display/paned_size", + paned_size_changed, fb, NULL, NULL); paned_size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL); diff --git a/mail/folder-browser.h b/mail/folder-browser.h index dd83d05d87..f50a1230de 100644 --- a/mail/folder-browser.h +++ b/mail/folder-browser.h @@ -60,7 +60,8 @@ struct _FolderBrowser { guint seen_id; gulong resize_id; - + guint paned_size_notify_id; + /* a folder we are expunging, dont use other than to compare the pointer value */ CamelFolder *expunging; |