[gimp] plug-ins: gtk_image_new_from_stock() -> from_icon_name()



commit 4bd5c185cc98b7d861ee2763e73a8793e2e1b7e5
Author: Michael Natterer <mitch gimp org>
Date:   Mon May 12 00:20:48 2014 +0200

    plug-ins: gtk_image_new_from_stock() -> from_icon_name()

 plug-ins/common/color-exchange.c        |   12 ++++++------
 plug-ins/common/file-html-table.c       |    4 ++--
 plug-ins/common/file-png.c              |    3 ++-
 plug-ins/common/lcms.c                  |    4 ++--
 plug-ins/common/web-page.c              |    2 +-
 plug-ins/gimpressionist/presets.c       |    4 ++--
 plug-ins/imagemap/imap_browse.c         |    2 +-
 plug-ins/imagemap/imap_edit_area_info.c |    2 +-
 plug-ins/script-fu/script-fu-server.c   |    3 ++-
 9 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/plug-ins/common/color-exchange.c b/plug-ins/common/color-exchange.c
index 1135875..0a70630 100644
--- a/plug-ins/common/color-exchange.c
+++ b/plug-ins/common/color-exchange.c
@@ -400,8 +400,8 @@ exchange_dialog (GimpDrawable *drawable)
         from_colorbutton = colorbutton;
 
       /*  Red  */
-      image = gtk_image_new_from_stock (GIMP_STOCK_CHANNEL_RED,
-                                        GTK_ICON_SIZE_BUTTON);
+      image = gtk_image_new_from_icon_name (GIMP_STOCK_CHANNEL_RED,
+                                            GTK_ICON_SIZE_BUTTON);
       gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.5);
       gtk_table_attach (GTK_TABLE (table), image,
                         0, 1, row, row + 1 + (framenumber ? 0 : 1),
@@ -456,8 +456,8 @@ exchange_dialog (GimpDrawable *drawable)
         }
 
       /*  Green  */
-      image = gtk_image_new_from_stock (GIMP_STOCK_CHANNEL_GREEN,
-                                        GTK_ICON_SIZE_BUTTON);
+      image = gtk_image_new_from_icon_name (GIMP_STOCK_CHANNEL_GREEN,
+                                            GTK_ICON_SIZE_BUTTON);
       gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.5);
       gtk_table_attach (GTK_TABLE (table), image,
                         0, 1, row, row + 1 + (framenumber ? 0 : 1),
@@ -512,8 +512,8 @@ exchange_dialog (GimpDrawable *drawable)
         }
 
       /*  Blue  */
-      image = gtk_image_new_from_stock (GIMP_STOCK_CHANNEL_BLUE,
-                                        GTK_ICON_SIZE_BUTTON);
+      image = gtk_image_new_from_icon_name (GIMP_STOCK_CHANNEL_BLUE,
+                                            GTK_ICON_SIZE_BUTTON);
       gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.5);
       gtk_table_attach (GTK_TABLE (table), image,
                         0, 1, row, row + 1 + (framenumber ? 0 : 1),
diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c
index e34e93f..dcaa0d8 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -430,8 +430,8 @@ save_dialog (gint32 image_ID)
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
       gtk_container_add (GTK_CONTAINER (frame), hbox);
 
-      eek = gtk_image_new_from_stock (GIMP_STOCK_WILBER_EEK,
-                                      GTK_ICON_SIZE_DIALOG);
+      eek = gtk_image_new_from_icon_name (GIMP_STOCK_WILBER_EEK,
+                                          GTK_ICON_SIZE_DIALOG);
       gtk_box_pack_start (GTK_BOX (hbox), eek, FALSE, FALSE, 0);
 
       label = gtk_label_new (_("You are about to create a huge\n"
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
index 950c5dc..797492e 100644
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@@ -1358,7 +1358,8 @@ offsets_dialog (gint offset_x,
                       hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  image = gtk_image_new_from_stock (GIMP_STOCK_QUESTION, GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name (GIMP_STOCK_QUESTION,
+                                        GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c
index fa56722..2e025d5 100644
--- a/plug-ins/common/lcms.c
+++ b/plug-ins/common/lcms.c
@@ -1191,8 +1191,8 @@ lcms_icc_apply_dialog (gint32       image,
   button = gtk_dialog_add_button (GTK_DIALOG (dialog),
                                   _("_Convert"), GTK_RESPONSE_OK);
   gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_stock (GTK_STOCK_CONVERT,
-                                                  GTK_ICON_SIZE_BUTTON));
+                        gtk_image_new_from_icon_name ("gtk-convert",
+                                                      GTK_ICON_SIZE_BUTTON));
 
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
                                            GTK_RESPONSE_OK,
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index c87a1e2..1a9623d 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -252,7 +252,7 @@ webpage_dialog (void)
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
-  image = gtk_image_new_from_stock (GIMP_STOCK_WEB, GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_STOCK_WEB, GTK_ICON_SIZE_BUTTON);
   gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
 
diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c
index 4fac07f..0d4685b 100644
--- a/plug-ins/gimpressionist/presets.c
+++ b/plug-ins/gimpressionist/presets.c
@@ -1029,8 +1029,8 @@ create_presetpage (GtkNotebook *notebook)
 
   presetsavebutton = tmpw = gtk_button_new_with_label ( _("Save Current..."));
   gtk_button_set_image (GTK_BUTTON (presetsavebutton),
-                        gtk_image_new_from_stock (GTK_STOCK_SAVE,
-                                                  GTK_ICON_SIZE_BUTTON));
+                        gtk_image_new_from_icon_name ("document-save",
+                                                      GTK_ICON_SIZE_BUTTON));
   gtk_box_pack_start (GTK_BOX (box1), tmpw, FALSE, FALSE, 0);
   gtk_widget_show (tmpw);
   g_signal_connect (tmpw, "clicked", G_CALLBACK (create_save_preset), NULL);
diff --git a/plug-ins/imagemap/imap_browse.c b/plug-ins/imagemap/imap_browse.c
index 7b2e411..e947bf0 100644
--- a/plug-ins/imagemap/imap_browse.c
+++ b/plug-ins/imagemap/imap_browse.c
@@ -140,7 +140,7 @@ browse_widget_new (const gchar *name)
    gtk_widget_show (browse->file);
 
    browse->button = button = gtk_button_new ();
-   icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
+   icon = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_BUTTON);
    gtk_container_add (GTK_CONTAINER (button), icon);
    gtk_widget_show (icon);
 
diff --git a/plug-ins/imagemap/imap_edit_area_info.c b/plug-ins/imagemap/imap_edit_area_info.c
index 404b207..5ccacd2 100644
--- a/plug-ins/imagemap/imap_edit_area_info.c
+++ b/plug-ins/imagemap/imap_edit_area_info.c
@@ -177,7 +177,7 @@ append_page (GtkWidget *notebook, GtkWidget *page, const gchar *icon_name,
    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
    gtk_widget_show(hbox);
 
-   icon = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
+   icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
    gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
    gtk_widget_show (icon);
 
diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c
index 650d390..3ba43be 100644
--- a/plug-ins/script-fu/script-fu-server.c
+++ b/plug-ins/script-fu/script-fu-server.c
@@ -883,7 +883,8 @@ server_interface (void)
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  image = gtk_image_new_from_stock (GIMP_STOCK_WARNING, GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name (GIMP_STOCK_WARNING,
+                                        GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 0);
   gtk_widget_show (image);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]