summaryrefslogtreecommitdiff
path: root/mate-panel
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2018-01-23 20:55:01 +0100
committerlukefromdc <[email protected]>2018-01-25 20:28:18 -0500
commit1f72d441289df987dd7fbb528089f71e719e3c46 (patch)
treeb5635415641d0d865470d7da3d7dd602d8ba28c7 /mate-panel
parent7f99492c269f541c81e4f36742ecc3f0b4ebac04 (diff)
downloadmate-panel-1f72d441289df987dd7fbb528089f71e719e3c46.tar.bz2
mate-panel-1f72d441289df987dd7fbb528089f71e719e3c46.tar.xz
avoid deprecated GtkStock
Diffstat (limited to 'mate-panel')
-rw-r--r--mate-panel/drawer.c6
-rw-r--r--mate-panel/libpanel-util/panel-icon-chooser.c4
-rw-r--r--mate-panel/panel-action-button.c4
-rw-r--r--mate-panel/panel-addto.c18
-rw-r--r--mate-panel/panel-applet-frame.c4
-rw-r--r--mate-panel/panel-context-menu.c2
-rw-r--r--mate-panel/panel-ditem-editor.c14
-rw-r--r--mate-panel/panel-force-quit.c2
-rw-r--r--mate-panel/panel-menu-bar.c2
-rw-r--r--mate-panel/panel-menu-button.c2
-rw-r--r--mate-panel/panel-recent.c2
-rw-r--r--mate-panel/panel-run-dialog.c4
-rw-r--r--mate-panel/panel-stock-icons.c6
-rw-r--r--mate-panel/panel.c4
14 files changed, 36 insertions, 38 deletions
diff --git a/mate-panel/drawer.c b/mate-panel/drawer.c
index e06d6467..917e4836 100644
--- a/mate-panel/drawer.c
+++ b/mate-panel/drawer.c
@@ -529,19 +529,19 @@ load_drawer_applet (char *toplevel_id,
mate_panel_applet_add_callback (drawer->info,
"add",
- GTK_STOCK_ADD,
+ "list-add",
_("_Add to Drawer..."),
drawer_changes_enabled);
mate_panel_applet_add_callback (drawer->info,
"properties",
- GTK_STOCK_PROPERTIES,
+ "document-properties",
_("_Properties"),
drawer_changes_enabled);
mate_panel_applet_add_callback (drawer->info,
"help",
- GTK_STOCK_HELP,
+ "help-browser",
_("_Help"),
NULL);
diff --git a/mate-panel/libpanel-util/panel-icon-chooser.c b/mate-panel/libpanel-util/panel-icon-chooser.c
index 98dcef8e..5b5ca08a 100644
--- a/mate-panel/libpanel-util/panel-icon-chooser.c
+++ b/mate-panel/libpanel-util/panel-icon-chooser.c
@@ -381,9 +381,9 @@ _panel_icon_chooser_clicked (GtkButton *button)
filechooser = gtk_file_chooser_dialog_new (_("Choose an icon"),
parent,
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
+ "gtk-open",
GTK_RESPONSE_ACCEPT,
NULL);
panel_gtk_file_chooser_add_image_preview (GTK_FILE_CHOOSER (filechooser));
diff --git a/mate-panel/panel-action-button.c b/mate-panel/panel-action-button.c
index abfe8c22..e0612b21 100644
--- a/mate-panel/panel-action-button.c
+++ b/mate-panel/panel-action-button.c
@@ -188,7 +188,7 @@ panel_action_lock_setup_menu (PanelActionButton *button)
mate_panel_applet_add_callback (button->priv->info,
"prefs",
- GTK_STOCK_PROPERTIES,
+ "document-properties",
_("_Properties"),
screensaver_properties_enabled);
}
@@ -733,7 +733,7 @@ panel_action_button_load (PanelActionButtonType type,
mate_panel_applet_add_callback (button->priv->info,
"help",
- GTK_STOCK_HELP,
+ "help-browser",
_("_Help"),
NULL);
diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c
index e6cae0eb..825e1e67 100644
--- a/mate-panel/panel-addto.c
+++ b/mate-panel/panel-addto.c
@@ -1124,14 +1124,12 @@ panel_addto_selection_changed (GtkTreeSelection *selection,
gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE);
if (data->type == PANEL_ADDTO_LAUNCHER_MENU) {
- gtk_button_set_label (GTK_BUTTON (dialog->add_button),
- GTK_STOCK_GO_FORWARD);
+ gtk_button_set_image (GTK_BUTTON (dialog->add_button),
+ gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON));
} else {
- gtk_button_set_label (GTK_BUTTON (dialog->add_button),
- GTK_STOCK_ADD);
+ gtk_button_set_image (GTK_BUTTON (dialog->add_button),
+ gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON));
}
- gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button),
- TRUE);
/* only allow dragging applets if we can add applets */
if (panel_profile_id_lists_are_writable ()) {
@@ -1223,15 +1221,15 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
dialog->addto_dialog = gtk_dialog_new ();
gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
- GTK_STOCK_HELP, GTK_RESPONSE_HELP);
+ "gtk-help", GTK_RESPONSE_HELP);
dialog->back_button = gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
- GTK_STOCK_GO_BACK,
+ "gtk-go-back",
PANEL_ADDTO_RESPONSE_BACK);
dialog->add_button = gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
- GTK_STOCK_ADD,
+ "gtk-add",
PANEL_ADDTO_RESPONSE_ADD);
gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
- GTK_STOCK_CLOSE,
+ "gtk-close",
GTK_RESPONSE_CLOSE);
gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE);
diff --git a/mate-panel/panel-applet-frame.c b/mate-panel/panel-applet-frame.c
index 9ab95019..933afc14 100644
--- a/mate-panel/panel-applet-frame.c
+++ b/mate-panel/panel-applet-frame.c
@@ -979,7 +979,7 @@ mate_panel_applet_frame_loading_failed (const char *iid,
if (locked_down) {
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_OK, LOADING_FAILED_RESPONSE_DONT_DELETE,
+ "gtk-ok", LOADING_FAILED_RESPONSE_DONT_DELETE,
NULL);
} else {
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
@@ -987,7 +987,7 @@ mate_panel_applet_frame_loading_failed (const char *iid,
"from your configuration?"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
PANEL_STOCK_DONT_DELETE, LOADING_FAILED_RESPONSE_DONT_DELETE,
- GTK_STOCK_DELETE, LOADING_FAILED_RESPONSE_DELETE,
+ "gtk-delete", LOADING_FAILED_RESPONSE_DELETE,
NULL);
}
diff --git a/mate-panel/panel-context-menu.c b/mate-panel/panel-context-menu.c
index b2ed748c..74879d5b 100644
--- a/mate-panel/panel-context-menu.c
+++ b/mate-panel/panel-context-menu.c
@@ -252,7 +252,7 @@ panel_context_menu_build_edition (PanelWidget *panel_widget,
panel_widget->toplevel);
menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Reset Panel"));
- image = gtk_image_new_from_stock (GTK_STOCK_REVERT_TO_SAVED, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("document-revert", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
gtk_widget_show (menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
diff --git a/mate-panel/panel-ditem-editor.c b/mate-panel/panel-ditem-editor.c
index 1961962e..5d66ad65 100644
--- a/mate-panel/panel-ditem-editor.c
+++ b/mate-panel/panel-ditem-editor.c
@@ -653,22 +653,22 @@ panel_ditem_editor_make_ui (PanelDItemEditor *dialog)
priv->comment_entry);
priv->help_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_HELP,
+ "gtk-help",
GTK_RESPONSE_HELP);
priv->revert_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_REVERT_TO_SAVED,
+ "gtk-revert-to-saved",
REVERT_BUTTON);
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
REVERT_BUTTON,
FALSE);
priv->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CLOSE,
+ "gtk-close",
GTK_RESPONSE_CLOSE);
priv->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL);
priv->ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_OK,
+ "gtk-ok",
GTK_RESPONSE_OK);
/* FIXME: There needs to be a way to edit ALL keys/sections */
@@ -1009,9 +1009,9 @@ command_browse_button_clicked (PanelDItemEditor *dialog)
chooser = gtk_file_chooser_dialog_new ("", GTK_WINDOW (dialog),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
+ "gtk-open",
GTK_RESPONSE_ACCEPT,
NULL);
gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser), TRUE);
diff --git a/mate-panel/panel-force-quit.c b/mate-panel/panel-force-quit.c
index ffb82274..de8febce 100644
--- a/mate-panel/panel-force-quit.c
+++ b/mate-panel/panel-force-quit.c
@@ -239,7 +239,7 @@ kill_window_question (gpointer window)
"in it might get lost."));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
PANEL_STOCK_FORCE_QUIT,
GTK_RESPONSE_ACCEPT,
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
index eefd2ec9..85e55e51 100644
--- a/mate-panel/panel-menu-bar.c
+++ b/mate-panel/panel-menu-bar.c
@@ -356,7 +356,7 @@ static void panel_menu_bar_load(PanelWidget* panel, gboolean locked, int positio
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (panel)));
g_object_set (settings, "gtk-shell-shows-app-menu", FALSE, "gtk-shell-shows-menubar", FALSE, NULL);
- mate_panel_applet_add_callback(menubar->priv->info, "help", GTK_STOCK_HELP, _("_Help"), NULL);
+ mate_panel_applet_add_callback(menubar->priv->info, "help", "help-browser", _("_Help"), NULL);
/* Menu editors */
if (!panel_lockdown_get_locked_down () && (panel_is_program_in_path("mozo") || panel_is_program_in_path("menulibre")))
diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c
index 74cf0dfb..e61e6ace 100644
--- a/mate-panel/panel-menu-button.c
+++ b/mate-panel/panel-menu-button.c
@@ -666,7 +666,7 @@ panel_menu_button_load (const char *menu_path,
button->priv->applet_id = g_strdup (info->id);
- mate_panel_applet_add_callback (info, "help", GTK_STOCK_HELP, _("_Help"), NULL);
+ mate_panel_applet_add_callback (info, "help", "help-browser", _("_Help"), NULL);
if (!panel_lockdown_get_locked_down () &&
(panel_is_program_in_path ("mozo") ||
diff --git a/mate-panel/panel-recent.c b/mate-panel/panel-recent.c
index b3d5beb6..bd1287a1 100644
--- a/mate-panel/panel-recent.c
+++ b/mate-panel/panel-recent.c
@@ -151,7 +151,7 @@ recent_documents_clear_cb (GtkMenuItem *menuitem,
"\342\200\242 All items from the recent documents list in all applications."));
gtk_dialog_add_buttons (GTK_DIALOG (clear_recent_dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
PANEL_STOCK_CLEAR, GTK_RESPONSE_ACCEPT,
NULL);
diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c
index a696138e..82f8f70f 100644
--- a/mate-panel/panel-run-dialog.c
+++ b/mate-panel/panel-run-dialog.c
@@ -1207,8 +1207,8 @@ file_button_clicked (GtkButton *button,
chooser = gtk_file_chooser_dialog_new (_("Choose a file to append to the command..."),
GTK_WINDOW (dialog->run_dialog),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
diff --git a/mate-panel/panel-stock-icons.c b/mate-panel/panel-stock-icons.c
index 514e5818..c37a251e 100644
--- a/mate-panel/panel-stock-icons.c
+++ b/mate-panel/panel-stock-icons.c
@@ -94,10 +94,10 @@ typedef struct {
} PanelStockItem;
static PanelStockItem stock_items [] = {
- { PANEL_STOCK_EXECUTE, GTK_STOCK_EXECUTE, N_("_Run") },
+ { PANEL_STOCK_EXECUTE, "system-run", N_("_Run") },
{ PANEL_STOCK_FORCE_QUIT, PANEL_STOCK_FORCE_QUIT, N_("_Force quit") },
- { PANEL_STOCK_CLEAR, GTK_STOCK_CLEAR, N_("C_lear") },
- { PANEL_STOCK_DONT_DELETE, GTK_STOCK_CANCEL, N_("D_on't Delete") }
+ { PANEL_STOCK_CLEAR, "edit-clear", N_("C_lear") },
+ { PANEL_STOCK_DONT_DELETE, "process-stop", N_("D_on't Delete") }
};
static void
diff --git a/mate-panel/panel.c b/mate-panel/panel.c
index f3bf417b..8b4401f2 100644
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -1348,8 +1348,8 @@ panel_deletion_dialog (PanelToplevel *toplevel)
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
"%s", text2);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_DELETE, GTK_RESPONSE_OK,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-delete", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);