diff options
| author | Christopher James Lahey <clahey@ximian.com> | 2002-02-07 19:24:08 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2002-02-07 19:24:08 +0800 |
| commit | b7ac37f6b1b54cf9262958a4419f00d00dea554e (patch) | |
| tree | 5abf2d84a4d38a3904c579d60599404428641ec4 /mail/folder-browser.c | |
| parent | 9f83d6d31872f5bce584c52738385bc2ae568a05 (diff) | |
| download | gsoc2013-evolution-b7ac37f6b1b54cf9262958a4419f00d00dea554e.tar.gz gsoc2013-evolution-b7ac37f6b1b54cf9262958a4419f00d00dea554e.tar.zst gsoc2013-evolution-b7ac37f6b1b54cf9262958a4419f00d00dea554e.zip | |
Bumped the required version of gal.
2002-02-07 Christopher James Lahey <clahey@ximian.com>
* configure.in: Bumped the required version of gal.
From addressbook/ChangeLog:
2002-02-07 Christopher James Lahey <clahey@ximian.com>
* gui/widgets/e-addressbook-view.c
(e_addressbook_view_setup_menus): Changed this function to use the
new GalViewMenus which takes a GalViewInstance, instead of a
GalViewCollection.
From calendar/ChangeLog:
2002-02-07 Christopher James Lahey <clahey@ximian.com>
* gui/e-tasks.c (e_tasks_setup_view_menus), gui/gnome-cal.c
(gnome_calendar_setup_view_menus): Made these use the new
GalViewMenus stuff.
From mail/ChangeLog:
2002-02-07 Christopher James Lahey <clahey@ximian.com>
* folder-browser.c, folder-browser.h, folder-browser-ui.c,
folder-browser-ui.h
(folder_browser_ui_setup_view_menus,
folder_browser_ui_discard_view_menus): Changed this to use the new
GalViewMenus stuff. Made these exported functions.
* mail-callbacks.c, message-browser.c: Changed these to not pass
the now removed row parameter to message_list_select.
* mail-config.c, mail-config.h (mail_config_folder_to_safe_url):
Refactored this out of mail_config_folder_to_cachename.
* message-list.c, message-list.h (message_list_select): Removed
the row argument. Changed this to use the new function in ETree
for finding the next cursor row that matches a test.
(message_list_construct): Handle a failed construction of the
ETree here.
(message_list_setup_etree, save_tree_state): Don't load or save
the header state. folder-browser-ui.c deals with this now.
From views/ChangeLog:
2002-02-07 Christopher James Lahey <clahey@ximian.com>
* addressbook/galview.xml, calendar/galview.xml, mail/galview.xml,
tasks/galview.xml: Added default-view parameters.
* mail/As_Sent_Folder.galview: New galview.
* mail/Makefile.am, mail/galview.xml: Added As_Sent_Folder
galview.
From widgets/ChangeLog:
2002-02-07 Christopher James Lahey <clahey@ximian.com>
* menus/gal-view-menus.c, menus/gal-view-menus.h
(gal_view_menus_new): Made this take a GalViewInstance instead of
a GalViewCollection. Reworked most of this to utilize the
interfaces provided by GalViewInstance.
svn path=/trunk/; revision=15592
Diffstat (limited to 'mail/folder-browser.c')
| -rw-r--r-- | mail/folder-browser.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mail/folder-browser.c b/mail/folder-browser.c index c48260a1b6..92ada2f612 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -155,9 +155,9 @@ folder_browser_finalise (GtkObject *object) CORBA_exception_free (&ev); - if (folder_browser->view_collection) { - gtk_object_unref (GTK_OBJECT (folder_browser->view_collection)); - folder_browser->view_collection = NULL; + if (folder_browser->view_instance) { + gtk_object_unref (GTK_OBJECT (folder_browser->view_instance)); + folder_browser->view_instance = NULL; } if (folder_browser->view_menus) { @@ -850,6 +850,11 @@ got_folder(char *uri, CamelFolder *folder, void *data) camel_object_hook_event(CAMEL_OBJECT(fb->folder), "message_changed", folder_changed, fb); + if (fb->view_instance != NULL && fb->view_menus != NULL) + folder_browser_ui_discard_view_menus (fb); + + folder_browser_ui_setup_view_menus (fb); + /* when loading a new folder, nothing is selected initially */ if (fb->uicomp) @@ -1993,7 +1998,7 @@ my_folder_browser_init (GtkObject *object) FolderBrowser *fb = FOLDER_BROWSER (object); int i; - fb->view_collection = NULL; + fb->view_instance = NULL; fb->view_menus = NULL; fb->pref_master = FALSE; |