aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/folder-browser-factory.c9
2 files changed, 10 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7aedc1924d..d68b4cb735 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-09 Ettore Perazzoli <ettore@helixcode.com>
+
+ * folder-browser-factory.c (control_activate): Use
+ `GNOME_STOCK_MENU_*' things instead of `GNOME_STOCK_PIXMAP_*'
+ things, that are too big and look bad.
+
2000-08-09 Not Zed <NotZed@HelixCode.com>
* mail-autofilter.c (filter_gui_add_from_message): Helper function to add with confirm.
@@ -6,8 +12,6 @@
* message-list.c (on_right_click): Added menu to install vfolders/filters from message.
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
2000-08-09 Not Zed <NotZed@HelixCode.com>
* mail-autofilter.c: New file to hold auto filter/vfolder stuff.
@@ -67,7 +71,6 @@
(message_list_init): Added a right_click event to trigger a pop-up
menu to be displayed
->>>>>>> 1.379
2000-08-08 Dan Winship <danw@helixcode.com>
* mail-config-gui.c: Add "Don't delete messages from server"
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 1273212185..d1b3d818e4 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -79,26 +79,25 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
bonobo_ui_handler_menu_new_item (uih, "/Actions/Mark all seen",
_("_Mark all messages seen"),
NULL, -1,
- BONOBO_UI_HANDLER_PIXMAP_STOCK,
- GNOME_STOCK_PIXMAP_CLEAR,
+ BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,
0, 0, mark_all_seen, folder_browser);
bonobo_ui_handler_menu_new_item (uih, "/Actions/Edit Message", _("E_dit Message"),
NULL, -1,
BONOBO_UI_HANDLER_PIXMAP_STOCK,
- GNOME_STOCK_PIXMAP_MAIL_NEW,
+ GNOME_STOCK_MENU_MAIL_NEW,
0, 0, edit_message, folder_browser);
bonobo_ui_handler_menu_new_item (uih, "/Actions/View Message", _("_View Message"),
NULL, -1,
BONOBO_UI_HANDLER_PIXMAP_STOCK,
- GNOME_STOCK_PIXMAP_MAIL_NEW,
+ GNOME_STOCK_MENU_MAIL_NEW,
0, 0, view_message, folder_browser);
bonobo_ui_handler_menu_new_item (uih, "/Actions/Expunge", _("_Expunge"),
NULL, -1,
BONOBO_UI_HANDLER_PIXMAP_STOCK,
- GNOME_STOCK_PIXMAP_TRASH,
+ GNOME_STOCK_MENU_TRASH,
0, 0, expunge_folder, folder_browser);
bonobo_ui_handler_menu_new_item (uih, "/Tools/Mail Filters ...", _("Mail _Filters ..."),