GNOME.org
 

[balsa] Drop legacy icon names.

commit 6955b88c64fbc3da6bf5b440d1cb270d1cf18ce4
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Fri Jun 4 10:12:43 2010 -0400

    Drop legacy icon names.

 ChangeLog                                          |   15 ++++++++
 images/16x16/Makefile.am                           |    4 +-
 images/16x16/{stock_inbox.png => mail-inbox.png}   |  Bin 626 -> 626 bytes
 images/16x16/{stock_outbox.png => mail-outbox.png} |  Bin 600 -> 600 bytes
 src/balsa-icons.c                                  |   35 +++++++++----------
 src/balsa-print-object-text.c                      |    2 +-
 src/main-window.c                                  |    2 +-
 7 files changed, 36 insertions(+), 22 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 28ab22f..4880fc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-06-04  Peter Bloomfield
+
+	Drop legacy icon names.
+
+	* images/16x16/Makefile.am: rename stock_inbox and stock_outbox.
+	* images/16x16/mail-inbox.png: new name.
+	* images/16x16/mail-outbox.png: ditto.
+	* images/16x16/stock_inbox.png: old name.
+	* images/16x16/stock_outbox.png: ditto.
+	* src/balsa-icons.c (load_balsa_pixmap),
+	(balsa_register_pixmaps): use new names.
+	* src/balsa-print-object-text.c
+	(balsa_print_object_text_calendar): ditto.
+	* src/main-window.c: ditto.
+
 2010-06-01  Peter Bloomfield
 
 	Copy icons removed from gnome-icon-theme-2.30 from an earlier
diff --git a/images/16x16/Makefile.am b/images/16x16/Makefile.am
index a389722..6572cbe 100644
--- a/images/16x16/Makefile.am
+++ b/images/16x16/Makefile.am
@@ -23,8 +23,8 @@ extra_appicons_IMGS = \
 	stock_mail.png		\
 	stock_book_red.png	\
 	stock_book_open.png	\
-	stock_inbox.png		\
-	stock_outbox.png
+	mail-inbox.png		\
+	mail-outbox.png
 
 
 EXTRA_DIST = $(extra_appicons_IMGS)
diff --git a/images/16x16/stock_inbox.png b/images/16x16/mail-inbox.png
similarity index 100%
rename from images/16x16/stock_inbox.png
rename to images/16x16/mail-inbox.png
diff --git a/images/16x16/stock_outbox.png b/images/16x16/mail-outbox.png
similarity index 100%
rename from images/16x16/stock_outbox.png
rename to images/16x16/mail-outbox.png
diff --git a/src/balsa-icons.c b/src/balsa-icons.c
index 00f278e..553bd6d 100644
--- a/src/balsa-icons.c
+++ b/src/balsa-icons.c
@@ -79,13 +79,12 @@ load_balsa_pixmap(GtkIconTheme *icon_theme, GtkIconFactory *factory,
     static pixmap_fallback_t fallback_id[] = {
 	{ "user-trash", GTK_STOCK_DELETE },
 	{ "user-trash-full", GTK_STOCK_DELETE },
-	{ "mail-attachment", "stock_attach" },
 	{ "emblem-important", "stock_mail-flag-for-followup"},
-        { "stock_mail-reply", "stock_mail-replied"}, 
-        { "stock_mail-reply-to-all", "stock_mail-replied"}, 
-        { "stock_mail-forward", "stock_mail-replied"}, 
-        { "gnome-fs-directory-accept", GTK_STOCK_OPEN},
-        { "gnome-fs-directory", GTK_STOCK_DIRECTORY},
+        { "mail-reply-sender", "mail-replied"},
+        { "stock_mail-reply-to-all", "mail-replied"},
+        { "mail-forward", "mail-replied"},
+        { "folder-drag-accept", GTK_STOCK_OPEN},
+        { "folder", GTK_STOCK_DIRECTORY},
 	{ NULL, NULL } };
 
     BICONS_LOG("loading icon %s (stock id %s)", bpixmap->name,
@@ -164,21 +163,21 @@ balsa_register_pixmaps(void)
 {
     const balsa_pixmap_t balsa_icons[] = {
 	/* icons for buttons and menus (24x24 and 16x16) */
-	{ BALSA_PIXMAP_COMPOSE,         "stock_mail-compose", 
+	{ BALSA_PIXMAP_COMPOSE,         "mail-message-new",
 	  { GTK_ICON_SIZE_LARGE_TOOLBAR, GTK_ICON_SIZE_MENU } },
-	{ BALSA_PIXMAP_REPLY,           "stock_mail-reply", 
+	{ BALSA_PIXMAP_REPLY,           "mail-reply-sender",
 	  { GTK_ICON_SIZE_LARGE_TOOLBAR, GTK_ICON_SIZE_MENU } },
 	{ BALSA_PIXMAP_REPLY_GROUP,     "stock_mail-reply-to-all", 
 	  { GTK_ICON_SIZE_LARGE_TOOLBAR, GTK_ICON_SIZE_MENU } },
-	{ BALSA_PIXMAP_REQUEST_MDN,     "stock_mail-reply", 
+	{ BALSA_PIXMAP_REQUEST_MDN,     "mail-reply-sender",
 	  { GTK_ICON_SIZE_LARGE_TOOLBAR, GTK_ICON_SIZE_MENU } },
-	{ BALSA_PIXMAP_SEND,            "stock_mail-send",
+	{ BALSA_PIXMAP_SEND,            "mail-send",
 	  { GTK_ICON_SIZE_LARGE_TOOLBAR, GTK_ICON_SIZE_MENU } },
 	{ BALSA_PIXMAP_RECEIVE,         "stock_mail-receive",
 	  { GTK_ICON_SIZE_LARGE_TOOLBAR, GTK_ICON_SIZE_MENU } },
-	{ BALSA_PIXMAP_SEND_RECEIVE,    "stock_mail-send-receive",
+	{ BALSA_PIXMAP_SEND_RECEIVE,    "mail-send-receive",
 	  { GTK_ICON_SIZE_LARGE_TOOLBAR, GTK_ICON_SIZE_MENU } },
-	{ BALSA_PIXMAP_FORWARD,         "stock_mail-forward",
+	{ BALSA_PIXMAP_FORWARD,         "mail-forward",
 	  { GTK_ICON_SIZE_LARGE_TOOLBAR, GTK_ICON_SIZE_MENU } },
 	{ BALSA_PIXMAP_IDENTITY,        "stock_contact",
 	  { GTK_ICON_SIZE_LARGE_TOOLBAR, GTK_ICON_SIZE_MENU } },
@@ -253,9 +252,9 @@ balsa_register_pixmaps(void)
 #endif
 
 	/* mailbox icons (16x16) */
-        { BALSA_PIXMAP_MBOX_IN,         "stock_inbox",
+        { BALSA_PIXMAP_MBOX_IN,         "mail-inbox",
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
-        { BALSA_PIXMAP_MBOX_OUT,        "stock_outbox",
+        { BALSA_PIXMAP_MBOX_OUT,        "mail-outbox",
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
         { BALSA_PIXMAP_MBOX_DRAFT,      "balsa-mbox-draft",
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
@@ -269,15 +268,15 @@ balsa_register_pixmaps(void)
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
         { BALSA_PIXMAP_MBOX_TRAY_EMPTY, "balsa-mbox-tray-empty",
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
-        { BALSA_PIXMAP_MBOX_DIR_OPEN,   "gnome-fs-directory-accept",
+        { BALSA_PIXMAP_MBOX_DIR_OPEN,   "folder-drag-accept",
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
-        { BALSA_PIXMAP_MBOX_DIR_CLOSED, "gnome-fs-directory",
+        { BALSA_PIXMAP_MBOX_DIR_CLOSED, "folder",
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
 	
 	/* index icons (16x16) */
-        { BALSA_PIXMAP_INFO_REPLIED,    "stock_mail-replied",
+        { BALSA_PIXMAP_INFO_REPLIED,    "mail-replied",
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
-        { BALSA_PIXMAP_INFO_NEW,        "stock_mail-unread",
+        { BALSA_PIXMAP_INFO_NEW,        "mail-unread",
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
 	{ BALSA_PIXMAP_INFO_FLAGGED,    "emblem-important",
 	  { GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_INVALID } },
diff --git a/src/balsa-print-object-text.c b/src/balsa-print-object-text.c
index b39afeb..e39f88e 100644
--- a/src/balsa-print-object-text.c
+++ b/src/balsa-print-object-text.c
@@ -629,7 +629,7 @@ balsa_print_object_text_calendar(GList * list,
     /* get the stock calendar icon or the mime type icon on fail */
     pod->pixbuf =
 	gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-				 "stock_calendar", 48,
+				 "x-office-calendar", 48,
 				 GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
     if (!pod->pixbuf) {
 	gchar *conttype = libbalsa_message_body_get_mime_type(body);
diff --git a/src/main-window.c b/src/main-window.c
index fa5f4ea..d42a248 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -3359,7 +3359,7 @@ bw_display_new_mail_notification(int num_new, int has_new)
         if (!gtk_window_is_active(window)) {
 	    if (!balsa_app.main_window->new_mail_tray) {
 		balsa_app.main_window->new_mail_tray =
-		    gtk_status_icon_new_from_icon_name("stock_mail-compose");
+		    gtk_status_icon_new_from_icon_name("mail-message-new");
                 g_signal_connect_swapped(balsa_app.main_window->
                                          new_mail_tray, "activate",
                                          G_CALLBACK(gtk_window_present),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]