[balsa/gtk3] New render-icon API

[Peter Bloomfield <PeterB src gnome org>]

commit 358dccefa910b61e6e95f20bc04644551bd832aa
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Jan 17 17:27:57 2011 -0500

    New render-icon API

 ChangeLog               |   10 +++++++++-
 src/balsa-icons.c       |    6 ++----
 src/balsa-mime-widget.c |    8 +++-----
 src/toolbar-prefs.c     |   12 ++++++------
 4 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index db98aaf..957d5ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-01-17  Peter Bloomfield
 
+	* src/balsa-icons.c (balsa_register_pixbufs): new icon-render
+	API.
+	* src/balsa-mime-widget.c (balsa_mime_widget_new),
+	(balsa_mime_widget_new_unknown): ditto.
+	* src/toolbar-prefs.c (tp_store_set): ditto.
+
+2011-01-17  Peter Bloomfield
+
 	* src/balsa-app.h: port from GdkColor to GdkRGBA.
 	* src/balsa-cite-bar.c (balsa_cite_bar_draw): ditto, and from
 	GtkStyle to GtkStyleContext.
@@ -17,7 +25,7 @@
 	(bm_modify_font_from_string), (quote_tag), (draw_cite_bar_real),
 	(bm_widget_new_vcard), (fill_text_buf_cited): ditto, and drop
 	allocate_quote_colors.
-	* src/balsa-mime-widget-vcalendar.c
+	* src/balsa-mime-widget-vcalendar.c: reorganize widget-showing.
 	* src/balsa-print-object-text.c (balsa_print_object_text_draw):
 	port from GdkColor to GdkRGBA.
 	* src/main-window.c: port from GtkStyle to GtkStyleContext.
diff --git a/src/balsa-icons.c b/src/balsa-icons.c
index 136d823..3249d07 100644
--- a/src/balsa-icons.c
+++ b/src/balsa-icons.c
@@ -329,10 +329,8 @@ balsa_register_pixbufs(GtkWidget * widget)
     guint i;
 
     for (i = 0; i < ELEMENTS(icons); i++)
-	icons[i].set_icon(gtk_widget_render_icon(widget,
-						 icons[i].icon,
-						 GTK_ICON_SIZE_MENU,
-						 NULL));
+        icons[i].set_icon(gtk_widget_render_icon_pixbuf
+                          (widget, icons[i].icon, GTK_ICON_SIZE_MENU));
 }
 
 const gchar *
diff --git a/src/balsa-mime-widget.c b/src/balsa-mime-widget.c
index 96f6e39..f1e3835 100644
--- a/src/balsa-mime-widget.c
+++ b/src/balsa-mime-widget.c
@@ -169,7 +169,7 @@ balsa_mime_widget_new(BalsaMessage * bm, LibBalsaMessageBody * mime_body, gpoint
 		g_ascii_strcasecmp("application/pgp-signature", content_type) &&
 		g_ascii_strcasecmp("application/pkcs7-signature", content_type) &&
 		g_ascii_strcasecmp("application/x-pkcs7-signature", content_type)) {
-		GtkWidget * signature = 
+		GtkWidget * signature =
 		    balsa_mime_widget_signature_widget(mime_body, content_type);
 		mw->widget = balsa_mime_widget_crypto_frame(mime_body, mw->widget,
 							    mime_body->was_encrypted,
@@ -187,11 +187,11 @@ balsa_mime_widget_new(BalsaMessage * bm, LibBalsaMessageBody * mime_body, gpoint
 				 G_CALLBACK(vadj_change_cb), mw->widget);
             }
 
-            gtk_widget_show(mw->widget);
+            gtk_widget_show_all(mw->widget);
 	}
     }
     g_free(content_type);
-    
+
     return mw;
 }
 
@@ -307,8 +307,6 @@ balsa_mime_widget_new_unknown(BalsaMessage * bm,
 
     gtk_box_pack_start(GTK_BOX(mw->widget), hbox, FALSE, FALSE, 0);
 
-    gtk_widget_show_all(mw->widget);
-
     return mw;
 }
 
diff --git a/src/toolbar-prefs.c b/src/toolbar-prefs.c
index eb3a459..fb3ca1c 100644
--- a/src/toolbar-prefs.c
+++ b/src/toolbar-prefs.c
@@ -769,12 +769,12 @@ tp_store_set(GtkListStore * store, GtkTreeIter * iter, gint item)
 
     text = g_strdup(balsa_toolbar_button_text(item));
     replace_nl_with_space(text);
-    pixbuf = (item > 0
-              ? gtk_widget_render_icon(customize_widget,
-                                       toolbar_buttons[item].pixmap_id,
-                                       GTK_ICON_SIZE_LARGE_TOOLBAR,
-                                       "Balsa")
-              : NULL);
+    pixbuf =
+        (item > 0 ? gtk_widget_render_icon_pixbuf(customize_widget,
+                                                  toolbar_buttons[item].
+                                                  pixmap_id,
+                                                  GTK_ICON_SIZE_LARGE_TOOLBAR)
+         : NULL);
     gtk_list_store_set(store, iter,
                        TP_TEXT_COLUMN, text,
                        TP_ICON_COLUMN, pixbuf,