[Xfce4-commits] [apps/gigolo] 31/35: Replace some GTK_STOCK macros by their string equivalence
noreply at xfce.org
noreply at xfce.org
Mon Oct 31 18:19:05 CET 2016
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit e37030132b0cbda50580165e2c507bd9fdea883e
Author: Landry Breuil <landry at xfce.org>
Date: Mon Jun 20 21:14:25 2016 +0200
Replace some GTK_STOCK macros by their string equivalence
---
src/bookmarkdialog.c | 4 ++--
src/bookmarkeditdialog.c | 12 ++++++------
src/browsenetworkpanel.c | 7 ++++---
src/preferencesdialog.c | 4 ++--
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index 0b68770..7f7c22f 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -407,14 +407,14 @@ static void gigolo_bookmark_dialog_init(GigoloBookmarkDialog *dialog)
GigoloBookmarkDialogPrivate *priv = GIGOLO_BOOKMARK_DIALOG_GET_PRIVATE(dialog);
g_object_set(dialog,
- "icon-name", gigolo_find_icon_name("bookmark-new", GTK_STOCK_EDIT),
+ "icon-name", gigolo_find_icon_name("bookmark-new", "gtk-edit"),
"title", _("Edit Bookmarks"),
NULL);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
gtk_box_set_spacing(GTK_BOX(vbox), 2);
- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_button(GTK_DIALOG(dialog), "gtk-close", GTK_RESPONSE_CLOSE);
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
gtk_window_set_default_size(GTK_WINDOW(dialog), 550, 350);
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 5d8956a..077c51a 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -875,22 +875,22 @@ static void gigolo_bookmark_edit_dialog_set_property(GObject *object, guint prop
case GIGOLO_BE_MODE_CREATE:
{
title = _("Create Bookmark");
- button_stock_id = stock_id = GTK_STOCK_ADD;
+ button_stock_id = stock_id = "gtk-add";
combo_set_active(priv->type_combo, 0);
break;
}
case GIGOLO_BE_MODE_EDIT:
{
title = _("Edit Bookmark");
- stock_id = GTK_STOCK_EDIT;
- button_stock_id = GTK_STOCK_OK;
+ stock_id = "gtk-edit";
+ button_stock_id = "gtk-ok";
break;
}
case GIGOLO_BE_MODE_CONNECT:
default:
{
title = _("Connect to Server");
- button_stock_id = stock_id = GTK_STOCK_CONNECT;
+ button_stock_id = stock_id = "gtk-connect";
combo_set_active(priv->type_combo, 0);
gtk_widget_hide(priv->name_label);
gtk_widget_hide(priv->name_entry);
@@ -995,7 +995,7 @@ static void gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), 2);
- gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog), "gtk-cancel", GTK_RESPONSE_CANCEL, NULL);
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
@@ -1097,7 +1097,7 @@ static void gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
priv->share_button = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(priv->share_button),
- gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name("gtk-refresh", GTK_ICON_SIZE_MENU));
gtk_widget_set_sensitive(priv->share_button, FALSE);
g_signal_connect(priv->share_button, "clicked", G_CALLBACK(share_button_clicked_cb), dialog);
diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index ed3e763..1ee51ac 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -452,7 +452,7 @@ static void tree_prepare(GigoloBrowseNetworkPanel *panel)
priv->item_bookmark = item = gtk_image_menu_item_new_with_mnemonic(_("Create _Bookmark"));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
gtk_image_new_from_icon_name(
- gigolo_find_icon_name("bookmark-new", GTK_STOCK_EDIT), GTK_ICON_SIZE_BUTTON));
+ gigolo_find_icon_name("bookmark-new", "gtk-edit"), GTK_ICON_SIZE_BUTTON));
g_object_set_data(G_OBJECT(item), "panel", panel);
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -486,14 +486,15 @@ static void gigolo_browse_network_panel_init(GigoloBrowseNetworkPanel *panel)
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_BUTTON);
- toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_CONNECT);
+ toolitem = gtk_tool_button_new(gtk_image_new_from_icon_name ("gtk-connect",
+ gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar))), NULL);
gtk_widget_set_tooltip_text(GTK_WIDGET(toolitem), _("Connect to the selected share"));
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
g_signal_connect(toolitem, "clicked", G_CALLBACK(button_connect_click_cb), panel);
priv->button_connect = GTK_WIDGET(toolitem);
toolitem = gtk_tool_button_new(
- gtk_image_new_from_icon_name(gigolo_find_icon_name("bookmark-new", GTK_STOCK_EDIT), GTK_ICON_SIZE_BUTTON),
+ gtk_image_new_from_icon_name(gigolo_find_icon_name("bookmark-new", "gtk-edit"), GTK_ICON_SIZE_BUTTON),
_("Create _Bookmark"));
gtk_widget_set_tooltip_text(GTK_WIDGET(toolitem), _("Create a bookmark from the selected share"));
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index fb14701..b0bafc5 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -502,10 +502,10 @@ static void gigolo_preferences_dialog_class_init(GigoloPreferencesDialogClass *k
static void gigolo_preferences_dialog_init(GigoloPreferencesDialog *dialog)
{
g_object_set(dialog,
- "icon-name", GTK_STOCK_PREFERENCES,
+ "icon-name", "gtk-preferences",
"title", _("Preferences"),
NULL);
- gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog), "gtk-close", GTK_RESPONSE_CLOSE, NULL);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list