diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2002-03-27 06:51:26 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-03-27 06:51:26 +0800 |
commit | 3cdefcba37d640670c9bb6e290bc6f55229fac7a (patch) | |
tree | 1bbcf2be6e7ea597b467900e5de59c469841f6e8 /mail/folder-browser.c | |
parent | 81e7580909f5eebdfa6af5ea30ffd5d08913b9e4 (diff) | |
download | gsoc2013-evolution-3cdefcba37d640670c9bb6e290bc6f55229fac7a.tar.gz gsoc2013-evolution-3cdefcba37d640670c9bb6e290bc6f55229fac7a.tar.zst gsoc2013-evolution-3cdefcba37d640670c9bb6e290bc6f55229fac7a.zip |
Sync with yet-another-mail-config branch.
2002-03-26 Jeffrey Stedfast <fejj@ximian.com>
Sync with yet-another-mail-config branch.
* mail-composer-prefs.c: Updated to get the right widgets and
whatnot. Also updated to tell the evolution-config-control that
stuff has changed.
* mail-preferences.c: Updated to get the right widgets and
whatnot. Also updated to tell the evolution-config-control that
stuff has changed.
* mail-accounts.etspec: New file needed by mail-accounts.c
svn path=/trunk/; revision=16257
Diffstat (limited to 'mail/folder-browser.c')
-rw-r--r-- | mail/folder-browser.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mail/folder-browser.c b/mail/folder-browser.c index afa530b11a..17136f2bc8 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -882,7 +882,7 @@ folder_browser_set_folder (FolderBrowser *fb, CamelFolder *folder, const char *u fb->uri = g_strdup (uri); gtk_object_ref (GTK_OBJECT (fb)); - got_folder (uri, folder, fb); + got_folder (NULL, folder, fb); } void @@ -1964,14 +1964,16 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event } setup_popup_icons (); - + for (i=0;i<sizeof(filter_menu)/sizeof(filter_menu[0]);i++) filter_menu[i].closure = fdata; menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, fb); e_auto_kill_popup_menu_on_hide (menu); - gtk_object_set_data_full (GTK_OBJECT (menu), "colour_closures", closures, (GtkDestroyNotify)colour_closures_free); + gtk_object_set_data_full (GTK_OBJECT (menu), "colour_closures", + closures, (GtkDestroyNotify) colour_closures_free); + if (fdata) gtk_object_set_data_full(GTK_OBJECT(menu), "filter_data", fdata, (GtkDestroyNotify)filter_data_free); |