balsa r7932 - in trunk: . src

[PeterB svn gnome org]

Author: PeterB
Date: Sun Jun  1 17:58:20 2008
New Revision: 7932
URL: http://svn.gnome.org/viewvc/balsa?rev=7932&view=rev

Log:
reassign icons to get "Expunge" as a toolbar option

Modified:
   trunk/ChangeLog
   trunk/src/main-window.c
   trunk/src/toolbar-factory.c

Modified: trunk/src/main-window.c
==============================================================================
--- trunk/src/main-window.c	(original)
+++ trunk/src/main-window.c	Sun Jun  1 17:58:20 2008
@@ -445,7 +445,7 @@
      "<control><alt>F", N_("Next Flagged Message"),
      G_CALLBACK(bw_next_flagged_message_cb)},
     {"MailboxHideMenu", NULL, N_("_Hide Messages")},
-    {"ResetFilter", GTK_STOCK_CLEAR, N_("_Reset Filter"), NULL,
+    {"ResetFilter", GTK_STOCK_CANCEL, N_("_Reset Filter"), NULL,
      N_("Reset mailbox filter"), G_CALLBACK(bw_reset_filter_cb)},
     {"MailboxSelectAll", BALSA_PIXMAP_MARK_ALL, N_("_Select All"), NULL,
      N_("Select all messages in current mailbox"),
@@ -456,14 +456,14 @@
      N_("Delete the selected mailbox"),
      G_CALLBACK(mailbox_conf_delete_cb)},
 #if !defined(ENABLE_TOUCH_UI)
-    {"Expunge", GTK_STOCK_REMOVE, N_("E_xpunge Deleted Messages"), NULL,
+    {"Expunge", GTK_STOCK_CLEAR, N_("E_xpunge Deleted Messages"), NULL,
      N_("Expunge messages marked as deleted in the current mailbox"),
 #else  /* ENABLE_TOUCH_UI */
     {"Expunge", GTK_STOCK_REMOVE, N_("E_xpunge Deleted Messages"), NULL,
      N_("Expunge messages marked as deleted in the current mailbox"),
 #endif /* ENABLE_TOUCH_UI */
      G_CALLBACK(bw_mailbox_expunge_cb)},
-    {"Close", GTK_STOCK_CANCEL, N_("_Close"), NULL, N_("Close mailbox"),
+    {"Close", GTK_STOCK_CLOSE, N_("_Close"), NULL, N_("Close mailbox"),
      G_CALLBACK(bw_mailbox_close_cb)},
     {"SelectFilters", GTK_STOCK_PROPERTIES, N_("Select _Filters"), NULL,
      N_("Select filters to be applied automatically to current mailbox"),

Modified: trunk/src/toolbar-factory.c
==============================================================================
--- trunk/src/toolbar-factory.c	(original)
+++ trunk/src/toolbar-factory.c	Sun Jun  1 17:58:20 2008
@@ -155,8 +155,7 @@
     {BALSA_PIXMAP_MARKED_NEW, N_("Toggle\nnew")},
     {BALSA_PIXMAP_MARK_ALL, N_("Mark all")},
     {BALSA_PIXMAP_SHOW_HEADERS, N_("All\nheaders")},
-    {BALSA_PIXMAP_TRASH_EMPTY, N_("Empty Trash")},
-    {GTK_STOCK_CANCEL, N_("Close")},
+    {GTK_STOCK_CANCEL, N_("Reset\nFilter")},
     {BALSA_PIXMAP_SHOW_PREVIEW, N_("Msg Preview")},
 #ifdef HAVE_GPGME
     {BALSA_PIXMAP_GPG_SIGN, N_("Sign")},
@@ -164,7 +163,7 @@
 #endif
     {GTK_STOCK_UNDO, N_("Undo")},
     {GTK_STOCK_REDO, N_("Redo")},
-    {GTK_STOCK_CLEAR, N_("Reset\nFilter")},
+    {GTK_STOCK_CLEAR, N_("Expunge")},
     {GTK_STOCK_REMOVE, N_("Empty\nTrash")},
     {GTK_STOCK_EDIT, N_("Edit")},
 };