GNOME.org
 

[balsa/gtk3] More GtkStock deprecation cleanup

commit d733de8185f4cc9e3130c1693401d49b5d53d585
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sun Jul 21 08:03:02 2013 -0400

    More GtkStock deprecation cleanup
    
        * src/balsa-index.c (bndx_popup_menu_create),
        (create_stock_menu_item):
        * src/balsa-message.c (bm_header_tl_buttons),
        (get_crypto_content_icon):
        * src/balsa-mime-widget-crypto.c (balsa_mime_widget_crypto_frame):
        * src/balsa-mime-widget-image.c (balsa_mime_widget_new_image):
        * src/balsa-mime-widget-text.c (bmwt_populate_popup_menu):

 ChangeLog                      |   12 ++++++++++++
 src/balsa-index.c              |   28 +++++++++-------------------
 src/balsa-message.c            |   15 ++++++++-------
 src/balsa-mime-widget-crypto.c |   14 ++++++++------
 src/balsa-mime-widget-image.c  |    4 ++--
 src/balsa-mime-widget-text.c   |   11 ++++-------
 6 files changed, 43 insertions(+), 41 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d70bb29..b178d2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-07-21  Peter Bloomfield
+
+       More GtkStock deprecation cleanup
+
+       * src/balsa-index.c (bndx_popup_menu_create),
+       (create_stock_menu_item):
+       * src/balsa-message.c (bm_header_tl_buttons),
+       (get_crypto_content_icon):
+       * src/balsa-mime-widget-crypto.c (balsa_mime_widget_crypto_frame):
+       * src/balsa-mime-widget-image.c (balsa_mime_widget_new_image):
+       * src/balsa-mime-widget-text.c (bmwt_populate_popup_menu):
+
 2013-07-20  Peter Bloomfield
 
        * README: minor updates.
diff --git a/src/balsa-index.c b/src/balsa-index.c
index 8cecd3d..c1e8f4d 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -122,7 +122,6 @@ static void bndx_drag_cb(GtkWidget* widget,
 static GtkWidget* bndx_popup_menu_create(BalsaIndex * index);
 static void bndx_do_popup(BalsaIndex * index, GdkEventButton * event);
 static GtkWidget *create_stock_menu_item(GtkWidget * menu,
-                                         const gchar * type,
                                          const gchar * label,
                                          GCallback cb, gpointer data);
 
@@ -1832,35 +1831,31 @@ bndx_popup_menu_create(BalsaIndex * index)
     menu = gtk_menu_new();
 
     for (i = 0; i < ELEMENTS(entries); i++)
-        create_stock_menu_item(menu, entries[i].icon, _(entries[i].label),
+        create_stock_menu_item(menu, _(entries[i].label),
                                entries[i].func, index);
 
     gtk_menu_shell_append(GTK_MENU_SHELL(menu),
                           gtk_separator_menu_item_new());
     index->delete_item =
-        create_stock_menu_item(menu, "edit-delete",
-                               _("_Delete"),
+        create_stock_menu_item(menu, _("_Delete"),
                                G_CALLBACK(bi_toggle_deleted_cb),
                                index);
     index->undelete_item =
-        create_stock_menu_item(menu, "gtk-undelete",
-                               _("_Undelete"),
+        create_stock_menu_item(menu, _("_Undelete"),
                                G_CALLBACK(bi_toggle_deleted_cb),
                                index);
     index->move_to_trash_item =
-        create_stock_menu_item(menu, "edit-delete",
-                               _("Move To _Trash"),
+        create_stock_menu_item(menu, _("Move To _Trash"),
                                G_CALLBACK
                                (balsa_message_move_to_trash), index);
 
     menuitem = gtk_menu_item_new_with_mnemonic(_("T_oggle"));
     index->toggle_item = menuitem;
     submenu = gtk_menu_new();
-    create_stock_menu_item(submenu, BALSA_PIXMAP_INFO_FLAGGED,
-                           _("_Flagged"),
+    create_stock_menu_item(submenu, _("_Flagged"),
                            G_CALLBACK(bi_toggle_flagged_cb),
                            index);
-    create_stock_menu_item(submenu, BALSA_PIXMAP_INFO_NEW, _("_Unread"),
+    create_stock_menu_item(submenu, _("_Unread"),
                            G_CALLBACK(bi_toggle_new_cb),
                            index);
 
@@ -1875,8 +1870,7 @@ bndx_popup_menu_create(BalsaIndex * index)
 
     gtk_menu_shell_append(GTK_MENU_SHELL(menu),
                           gtk_separator_menu_item_new());
-    create_stock_menu_item(menu, BALSA_PIXMAP_BOOK_OPEN,
-                           _("_View Source"),
+    create_stock_menu_item(menu, _("_View Source"),
                            G_CALLBACK(bndx_view_source),
                            index);
 
@@ -1990,14 +1984,10 @@ bndx_do_popup(BalsaIndex * index, GdkEventButton * event)
 }
 
 static GtkWidget *
-create_stock_menu_item(GtkWidget * menu, const gchar * type,
-                      const gchar * label, GCallback cb,
+create_stock_menu_item(GtkWidget * menu, const gchar * label, GCallback cb,
                       gpointer data)
 {
-    GtkWidget *menuitem = gtk_image_menu_item_new_with_mnemonic(label);
-    GtkWidget *image = gtk_image_new_from_stock(type, GTK_ICON_SIZE_MENU);
-
-    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
+    GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic(label);
 
     g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
                              G_CALLBACK(cb), data);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index ef3a76a..e6af47d 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -283,8 +283,9 @@ bm_header_tl_buttons(BalsaMessage * bm)
                     (gpointer) bm);
     gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
     gtk_container_add(GTK_CONTAINER(button),
-                     gtk_image_new_from_stock(BALSA_PIXMAP_GPG_RECHECK,
-                                              GTK_ICON_SIZE_LARGE_TOOLBAR));
+                      gtk_image_new_from_icon_name
+                      (BALSA_PIXMAP_GPG_RECHECK,
+                       GTK_ICON_SIZE_LARGE_TOOLBAR));
     g_signal_connect(button, "clicked",
                     G_CALLBACK(message_recheck_crypto_cb), bm);
     g_ptr_array_add(array, button);
@@ -301,8 +302,9 @@ bm_header_tl_buttons(BalsaMessage * bm)
                     (gpointer) bm);
     gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
     gtk_container_add(GTK_CONTAINER(button),
-                     gtk_image_new_from_stock(BALSA_PIXMAP_ATTACHMENT,
-                                              GTK_ICON_SIZE_LARGE_TOOLBAR));
+                      gtk_image_new_from_icon_name
+                      (BALSA_PIXMAP_ATTACHMENT,
+                       GTK_ICON_SIZE_LARGE_TOOLBAR));
     g_signal_connect(button, "clicked",
                     G_CALLBACK(balsa_headers_attachments_popup), bm);
     g_signal_connect(button, "key_press_event",
@@ -2714,9 +2716,8 @@ get_crypto_content_icon(LibBalsaMessageBody * body, const gchar * content_type,
     if (!icon_name)
         return NULL;
     icon =
-        gtk_widget_render_icon_pixbuf(GTK_WIDGET(balsa_app.main_window),
-                                      icon_name,
-                                      GTK_ICON_SIZE_LARGE_TOOLBAR);
+        gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), icon_name,
+                                 GTK_ICON_SIZE_LARGE_TOOLBAR, 0, NULL);
     if (!icon_title)
         return icon;
 
diff --git a/src/balsa-mime-widget-crypto.c b/src/balsa-mime-widget-crypto.c
index db87e9b..9e55e88 100644
--- a/src/balsa-mime-widget-crypto.c
+++ b/src/balsa-mime-widget-crypto.c
@@ -126,17 +126,19 @@ balsa_mime_widget_crypto_frame(LibBalsaMessageBody * mime_body, GtkWidget * chil
     gtk_container_add(GTK_CONTAINER(frame), vbox);
     icon_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, BMW_VBOX_SPACE);
     if (was_encrypted)
-       gtk_box_pack_start(GTK_BOX(icon_box),
-                          gtk_image_new_from_stock(BALSA_PIXMAP_ENCR, GTK_ICON_SIZE_MENU),
-                          FALSE, FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(icon_box),
+                           gtk_image_new_from_icon_name(BALSA_PIXMAP_ENCR,
+                                                        GTK_ICON_SIZE_MENU),
+                           FALSE, FALSE, 0);
     if (!no_signature) {
        const gchar * icon_name =
            balsa_mime_widget_signature_icon_name(libbalsa_message_body_protect_state(mime_body));
        if (!icon_name)
            icon_name = BALSA_PIXMAP_SIGN;
-       gtk_box_pack_start(GTK_BOX(icon_box),
-                          gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_MENU),
-                          FALSE, FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(icon_box),
+                           gtk_image_new_from_icon_name(icon_name,
+                                                        GTK_ICON_SIZE_MENU),
+                           FALSE, FALSE, 0);
     }
     gtk_frame_set_label_widget(GTK_FRAME(frame), icon_box);
     gtk_container_set_border_width(GTK_CONTAINER(vbox), BMW_MESSAGE_PADDING);
diff --git a/src/balsa-mime-widget-image.c b/src/balsa-mime-widget-image.c
index fd66f8e..febb987 100644
--- a/src/balsa-mime-widget-image.c
+++ b/src/balsa-mime-widget-image.c
@@ -131,8 +131,8 @@ balsa_mime_widget_new_image(BalsaMessage * bm,
         g_signal_connect(mwi->context, "changed",
                          G_CALLBACK(bmwi_context_changed_cb), mw);
 
-    image = gtk_image_new_from_stock("image-missing",
-                                     GTK_ICON_SIZE_BUTTON);
+    image = gtk_image_new_from_icon_name("image-missing",
+                                         GTK_ICON_SIZE_BUTTON);
     g_object_set_data(G_OBJECT(image), "orig-width",
                      GINT_TO_POINTER(gdk_pixbuf_get_width(pixbuf)));
     g_object_set_data(G_OBJECT(image), "mime-body", mime_body);
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index fd61f11..50c90f7 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -1041,19 +1041,17 @@ bmwt_populate_popup_menu(BalsaMessage * bm,
     GtkWidget *menuitem;
     gpointer mime_body = g_object_get_data(G_OBJECT(html), "mime-body");
 
-    menuitem = gtk_image_menu_item_new_from_stock("zoom-in", NULL);
+    menuitem = gtk_menu_item_new_with_label(_("Zoom In"));
     g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
                              G_CALLBACK(bm_zoom_in), bm);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem =
-        gtk_image_menu_item_new_from_stock("zoom-out", NULL);
+    menuitem = gtk_menu_item_new_with_label(_("Zoom Out"));
     g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
                              G_CALLBACK(bm_zoom_out), bm);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem =
-        gtk_image_menu_item_new_from_stock("zoom-original", NULL);
+    menuitem = gtk_menu_item_new_with_label(_("Zoom 100%"));
     g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
                              G_CALLBACK(bm_zoom_reset), bm);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -1085,8 +1083,7 @@ bmwt_populate_popup_menu(BalsaMessage * bm,
     menuitem = gtk_separator_menu_item_new();
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem =
-        gtk_image_menu_item_new_from_stock("document-print", NULL);
+    menuitem = gtk_menu_item_new_with_label(_("Print..."));
     g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
                              G_CALLBACK(libbalsa_html_print), html);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]