[balsa/gtk3] Use symbolic icons

[Peter Bloomfield <peterb src gnome org>]

commit 64fa4736fa5d45115fa015be8a2799d9fb8a153f
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Mar 12 20:50:34 2015 -0400

    Use symbolic icons
    
        * src/balsa-icons.c (balsa_register_pixbufs): use
        window-close-symbolic instead of window-close.
        * src/message-window.c: ditto.
        * src/sendmsg-window.c: ditto.
        * src/toolbar-factory.c: ditto.
        * src/main-window.c (bw_notebook_label_new): ditto, and give up
        on making close-button small--it's not working.

 ChangeLog             |   12 ++++++++++++
 src/balsa-icons.c     |    2 +-
 src/main-window.c     |   24 ++----------------------
 src/message-window.c  |    2 +-
 src/sendmsg-window.c  |    4 ++--
 src/toolbar-factory.c |    2 +-
 6 files changed, 19 insertions(+), 27 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 41c56d0..a3aa1aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2015-03-12  Peter Bloomfield  <pbloomfield bellsouth net>
 
+       Use symbolic icons
+
+       * src/balsa-icons.c (balsa_register_pixbufs): use
+       window-close-symbolic instead of window-close.
+       * src/message-window.c: ditto.
+       * src/sendmsg-window.c: ditto.
+       * src/toolbar-factory.c: ditto.
+       * src/main-window.c (bw_notebook_label_new): ditto, and give up
+       on making close-button small--it's not working.
+
+2015-03-12  Peter Bloomfield  <pbloomfield bellsouth net>
+
        Clean up spell checker
 
        * src/spell-check.c (balsa_spell_check_new): set the window
diff --git a/src/balsa-icons.c b/src/balsa-icons.c
index 441c2a2..46b1f5e 100644
--- a/src/balsa-icons.c
+++ b/src/balsa-icons.c
@@ -218,7 +218,7 @@ balsa_register_pixbufs(GtkWidget * widget)
 #endif
         {
         libbalsa_address_view_set_book_icon,  BALSA_PIXMAP_BOOK_RED}, {
-        libbalsa_address_view_set_close_icon, "window-close"}, {
+        libbalsa_address_view_set_close_icon, "window-close-symbolic"}, {
         libbalsa_address_view_set_drop_down_icon, BALSA_PIXMAP_DROP_DOWN},
     };
     guint i;
diff --git a/src/main-window.c b/src/main-window.c
index 15e569f..292e277 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -651,7 +651,7 @@ static const BalsaToolbarEntry main_toolbar_extras[] = {
     { "send-and-receive-mail", BALSA_PIXMAP_SEND_RECEIVE  },
     { "save-part",         "document-save"             },
     { "identities",         BALSA_PIXMAP_IDENTITY      },
-    { "mailbox-close",     "window-close"              },
+    { "mailbox-close",     "window-close-symbolic"     },
     { "mailbox-select-all", BALSA_PIXMAP_MARK_ALL      },
     { "show-all-headers",   BALSA_PIXMAP_SHOW_HEADERS  },
     { "reset-filter",      "gtk-cancel"                },
@@ -2839,26 +2839,6 @@ bw_notebook_label_new(BalsaMailboxNode * mbnode)
     but = gtk_button_new();
     gtk_button_set_focus_on_click(GTK_BUTTON(but), FALSE);
     gtk_button_set_relief(GTK_BUTTON(but), GTK_RELIEF_NONE);
-    gtk_widget_set_name(but, "balsa-notebook-tab-button");
-
-    /* Try to make small close buttons: */
-    css_provider = gtk_css_provider_new();
-    if (!gtk_css_provider_load_from_data(css_provider,
-                                         "#balsa-notebook-tab-button"
-                                         "{"
-                                           "-GtkWidget-focus-padding: 0px;"
-                                           "-GtkWidget-focus-line-width: 0px;"
-                                           "border-width: 0px;"
-                                           "padding: 0px;"
-                                           "margin: 0px;"
-                                         "}",
-                                         -1, NULL))
-        g_print("Could not load CSS data.\n");
-
-    gtk_style_context_add_provider(gtk_widget_get_style_context(but) ,
-                                   GTK_STYLE_PROVIDER(css_provider),
-                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    g_object_unref(css_provider);
 
     gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h);
     gtk_widget_set_size_request(but, w, h);
@@ -2866,7 +2846,7 @@ bw_notebook_label_new(BalsaMailboxNode * mbnode)
     g_signal_connect(but, "clicked",
                      G_CALLBACK(bw_mailbox_tab_close_cb), mbnode);
 
-    close_pix = gtk_image_new_from_icon_name("window-close",
+    close_pix = gtk_image_new_from_icon_name("window-close-symbolic",
                                              GTK_ICON_SIZE_MENU);
     gtk_container_add(GTK_CONTAINER(but), close_pix);
     gtk_box_pack_start(GTK_BOX(box), but, FALSE, FALSE, 0);
diff --git a/src/message-window.c b/src/message-window.c
index 7b667fc..c74b67c 100644
--- a/src/message-window.c
+++ b/src/message-window.c
@@ -175,7 +175,7 @@ static const BalsaToolbarEntry message_toolbar_extras[] = {
     { "next-message",     BALSA_PIXMAP_NEXT          },
     { "next-flagged",     BALSA_PIXMAP_NEXT_FLAGGED  },
     { "previous-part",    BALSA_PIXMAP_PREVIOUS_PART },
-    { "close",           "window-close"              },
+    { "close",           "window-close-symbolic"     },
     { "show-all-headers", BALSA_PIXMAP_SHOW_HEADERS  }
 };
 
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 9ff40f2..2493fe7 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -4190,7 +4190,7 @@ static const BalsaToolbarEntry compose_toolbar[] = {
     "",
     BALSA_PIXMAP_SEND,
     "",
-    "window-close",
+    "window-close-symbolic",
     "",
     BALSA_PIXMAP_IDENTITY,
 #else /* ENABLE_TOUCH_UI */
@@ -4209,7 +4209,7 @@ static const BalsaToolbarEntry compose_toolbar[] = {
     { "", ""                                  },
     {"print",        "document-print"         },
     { "", ""                                  },
-    {"close",        "window-close"           }
+    {"close",        "window-close-symbolic"  }
 #endif /* ENABLE_TOUCH_UI */
 };
 
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index f5122a5..b2c0707 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -164,7 +164,7 @@ button_data toolbar_buttons[]={
     {"document-save",             N_("Save"),            TRUE},
     {BALSA_PIXMAP_IDENTITY,      N_("Identity"),        FALSE},
     {"tools-check-spelling",      N_("Spelling"),        TRUE},
-    {"window-close",            N_("Close"),           FALSE},
+    {"window-close-symbolic",    N_("Close"),           FALSE},
     {BALSA_PIXMAP_MARKED_NEW,    N_("Toggle\nnew"),     FALSE},
     {BALSA_PIXMAP_MARK_ALL,      N_("Mark all"),        FALSE},
     {BALSA_PIXMAP_SHOW_HEADERS,  N_("All\nheaders"),    FALSE},