From 61fc4065c4cdcb49aeab3a38a9da95a043260f50 Mon Sep 17 00:00:00 2001 From: monsta Date: Fri, 22 Jan 2016 11:52:55 +0300 Subject: dictionary: use gtk_image_new_from_icon_name in both GTK+ builds --- mate-dictionary/libgdict/gdict-database-chooser.c | 8 ++++---- mate-dictionary/libgdict/gdict-defbox.c | 12 ++++++------ mate-dictionary/libgdict/gdict-source-chooser.c | 4 ++-- mate-dictionary/libgdict/gdict-speller.c | 4 ++-- mate-dictionary/libgdict/gdict-strategy-chooser.c | 8 ++++---- mate-dictionary/src/gdict-applet.c | 5 ++--- mate-dictionary/src/gdict-sidebar.c | 4 ++-- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/mate-dictionary/libgdict/gdict-database-chooser.c b/mate-dictionary/libgdict/gdict-database-chooser.c index abf5f86e..aac4e41c 100644 --- a/mate-dictionary/libgdict/gdict-database-chooser.c +++ b/mate-dictionary/libgdict/gdict-database-chooser.c @@ -375,8 +375,8 @@ gdict_database_chooser_constructor (GType type, priv->refresh_button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (priv->refresh_button), - gtk_image_new_from_stock (GTK_STOCK_REFRESH, - GTK_ICON_SIZE_SMALL_TOOLBAR)); + gtk_image_new_from_icon_name ("view-refresh", + GTK_ICON_SIZE_SMALL_TOOLBAR)); g_signal_connect (priv->refresh_button, "clicked", G_CALLBACK (refresh_button_clicked_cb), chooser); @@ -387,8 +387,8 @@ gdict_database_chooser_constructor (GType type, priv->clear_button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (priv->clear_button), - gtk_image_new_from_stock (GTK_STOCK_CLEAR, - GTK_ICON_SIZE_SMALL_TOOLBAR)); + gtk_image_new_from_icon_name ("edit-clear", + GTK_ICON_SIZE_SMALL_TOOLBAR)); g_signal_connect (priv->clear_button, "clicked", G_CALLBACK (clear_button_clicked_cb), chooser); diff --git a/mate-dictionary/libgdict/gdict-defbox.c b/mate-dictionary/libgdict/gdict-defbox.c index 8abe0c99..acef2f96 100644 --- a/mate-dictionary/libgdict/gdict-defbox.c +++ b/mate-dictionary/libgdict/gdict-defbox.c @@ -1313,8 +1313,8 @@ create_find_pane (GdictDefbox *defbox) button = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_stock (GTK_STOCK_CLOSE, - GTK_ICON_SIZE_BUTTON)); + gtk_image_new_from_icon_name ("window-close", + GTK_ICON_SIZE_BUTTON)); g_signal_connect (button, "clicked", G_CALLBACK (close_button_clicked), defbox); gtk_box_pack_start (GTK_BOX (hbox1), button, FALSE, FALSE, 0); @@ -1343,16 +1343,16 @@ create_find_pane (GdictDefbox *defbox) priv->find_prev = gtk_button_new_with_mnemonic (_("_Previous")); gtk_button_set_image (GTK_BUTTON (priv->find_prev), - gtk_image_new_from_stock (GTK_STOCK_GO_BACK, - GTK_ICON_SIZE_MENU)); + gtk_image_new_from_icon_name ("go-previous", + GTK_ICON_SIZE_MENU)); g_signal_connect (priv->find_prev, "clicked", G_CALLBACK (find_prev_clicked_cb), defbox); gtk_box_pack_start (GTK_BOX (hbox1), priv->find_prev, FALSE, FALSE, 0); priv->find_next = gtk_button_new_with_mnemonic (_("_Next")); gtk_button_set_image (GTK_BUTTON (priv->find_next), - gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, - GTK_ICON_SIZE_MENU)); + gtk_image_new_from_icon_name ("go-next", + GTK_ICON_SIZE_MENU)); g_signal_connect (priv->find_next, "clicked", G_CALLBACK (find_next_clicked_cb), defbox); gtk_box_pack_start (GTK_BOX (hbox1), priv->find_next, FALSE, FALSE, 0); diff --git a/mate-dictionary/libgdict/gdict-source-chooser.c b/mate-dictionary/libgdict/gdict-source-chooser.c index dada5958..32379d47 100644 --- a/mate-dictionary/libgdict/gdict-source-chooser.c +++ b/mate-dictionary/libgdict/gdict-source-chooser.c @@ -292,8 +292,8 @@ gdict_source_chooser_constructor (GType gtype, priv->refresh_button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (priv->refresh_button), - gtk_image_new_from_stock (GTK_STOCK_REFRESH, - GTK_ICON_SIZE_BUTTON)); + gtk_image_new_from_icon_name ("view-refresh", + GTK_ICON_SIZE_BUTTON)); g_signal_connect (priv->refresh_button, "clicked", G_CALLBACK (refresh_button_clicked_cb), chooser); diff --git a/mate-dictionary/libgdict/gdict-speller.c b/mate-dictionary/libgdict/gdict-speller.c index 5f370ba8..fc16112a 100644 --- a/mate-dictionary/libgdict/gdict-speller.c +++ b/mate-dictionary/libgdict/gdict-speller.c @@ -347,8 +347,8 @@ gdict_speller_constructor (GType type, priv->clear_button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (priv->clear_button), - gtk_image_new_from_stock (GTK_STOCK_CLEAR, - GTK_ICON_SIZE_SMALL_TOOLBAR)); + gtk_image_new_from_icon_name ("edit-clear", + GTK_ICON_SIZE_SMALL_TOOLBAR)); g_signal_connect (priv->clear_button, "clicked", G_CALLBACK (clear_button_clicked_cb), speller); diff --git a/mate-dictionary/libgdict/gdict-strategy-chooser.c b/mate-dictionary/libgdict/gdict-strategy-chooser.c index 375c2aaf..98467a77 100644 --- a/mate-dictionary/libgdict/gdict-strategy-chooser.c +++ b/mate-dictionary/libgdict/gdict-strategy-chooser.c @@ -358,8 +358,8 @@ gdict_strategy_chooser_constructor (GType type, priv->refresh_button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (priv->refresh_button), - gtk_image_new_from_stock (GTK_STOCK_REFRESH, - GTK_ICON_SIZE_SMALL_TOOLBAR)); + gtk_image_new_from_icon_name ("view-refresh", + GTK_ICON_SIZE_SMALL_TOOLBAR)); g_signal_connect (priv->refresh_button, "clicked", G_CALLBACK (refresh_button_clicked_cb), chooser); @@ -370,8 +370,8 @@ gdict_strategy_chooser_constructor (GType type, priv->clear_button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (priv->clear_button), - gtk_image_new_from_stock (GTK_STOCK_CLEAR, - GTK_ICON_SIZE_SMALL_TOOLBAR)); + gtk_image_new_from_icon_name ("edit-clear", + GTK_ICON_SIZE_SMALL_TOOLBAR)); g_signal_connect (priv->clear_button, "clicked", G_CALLBACK (clear_button_clicked_cb), chooser); diff --git a/mate-dictionary/src/gdict-applet.c b/mate-dictionary/src/gdict-applet.c index 3e89c272..726ad85f 100644 --- a/mate-dictionary/src/gdict-applet.c +++ b/mate-dictionary/src/gdict-applet.c @@ -575,9 +575,8 @@ gdict_applet_draw (GdictApplet *applet) priv->image = gtk_image_new (); gtk_image_set_pixel_size (GTK_IMAGE (priv->image), priv->size - 10); - gtk_image_set_from_stock (GTK_IMAGE (priv->image), - GTK_STOCK_MISSING_IMAGE, - -1); + gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), + "image-missing", -1); gtk_box_pack_start (GTK_BOX (hbox), priv->image, FALSE, FALSE, 0); gtk_widget_show (priv->image); diff --git a/mate-dictionary/src/gdict-sidebar.c b/mate-dictionary/src/gdict-sidebar.c index 273ac1f6..38828a76 100644 --- a/mate-dictionary/src/gdict-sidebar.c +++ b/mate-dictionary/src/gdict-sidebar.c @@ -367,8 +367,8 @@ gdict_sidebar_init (GdictSidebar *sidebar) close_button = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); gtk_button_set_image (GTK_BUTTON (close_button), - gtk_image_new_from_stock (GTK_STOCK_CLOSE, - GTK_ICON_SIZE_SMALL_TOOLBAR)); + gtk_image_new_from_icon_name ("window-close", + GTK_ICON_SIZE_SMALL_TOOLBAR)); g_signal_connect (close_button, "clicked", G_CALLBACK (gdict_sidebar_close_clicked_cb), sidebar); -- cgit v1.2.1