Skip to content

Commit 607d522

Browse files
sc0wraveit65
sc0w
authored and
raveit65
committed
avoid deprecated GtkStock
1 parent 94618cb commit 607d522

File tree

19 files changed

+91
-75
lines changed

19 files changed

+91
-75
lines changed

‎accessx-status/applet.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ static void dialog_cb(GtkAction* action, AccessxStatusApplet* sapplet)
220220
}
221221

222222
static const GtkActionEntry accessx_status_applet_menu_actions[] = {
223-
{"Dialog", GTK_STOCK_PROPERTIES, N_("_Keyboard Accessibility Preferences"), NULL, NULL, G_CALLBACK(dialog_cb)},
224-
{"Help", GTK_STOCK_HELP, N_("_Help"), NULL, NULL, G_CALLBACK(help_cb)},
225-
{"About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK(about_cb)}
223+
{"Dialog", "document-properties", N_("_Keyboard Accessibility Preferences"), NULL, NULL, G_CALLBACK(dialog_cb)},
224+
{"Help", "help-browser", N_("_Help"), NULL, NULL, G_CALLBACK(help_cb)},
225+
{"About", "help-about", N_("_About"), NULL, NULL, G_CALLBACK(about_cb)}
226226
};
227227

228228
static XkbDescPtr accessx_status_applet_get_xkb_desc(AccessxStatusApplet* sapplet)
@@ -928,7 +928,7 @@ static void accessx_applet_add_stock_icons(AccessxStatusApplet* sapplet, GtkWidg
928928
}
929929
else
930930
{
931-
GtkIconSet* default_set = gtk_icon_factory_lookup_default(GTK_STOCK_MISSING_IMAGE);
931+
GtkIconSet* default_set = gtk_icon_factory_lookup_default("gtk-missing-image");
932932
gtk_icon_source_set_pixbuf(source, gtk_icon_set_render_icon(default_set, gtk_widget_get_style(widget), GTK_TEXT_DIR_NONE, GTK_STATE_NORMAL, icon_size_spec, widget, NULL));
933933
}
934934
g_free(filename);

‎battstat/battstat_applet.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ static void about_cb( GtkAction *, ProgressData * );
5858
static void help_cb( GtkAction *, ProgressData * );
5959

6060
static const GtkActionEntry battstat_menu_actions [] = {
61-
{ "BattstatProperties", GTK_STOCK_PROPERTIES, N_("_Preferences"),
61+
{ "BattstatProperties", "document-properties", N_("_Preferences"),
6262
NULL, NULL,
6363
G_CALLBACK (prop_cb) },
64-
{ "BattstatHelp", GTK_STOCK_HELP, N_("_Help"),
64+
{ "BattstatHelp", "help-browser", N_("_Help"),
6565
NULL, NULL,
6666
G_CALLBACK (help_cb) },
67-
{ "BattstatAbout", GTK_STOCK_ABOUT, N_("_About"),
67+
{ "BattstatAbout", "help-about", N_("_About"),
6868
NULL, NULL,
6969
G_CALLBACK (about_cb) }
7070
};
@@ -438,7 +438,7 @@ battery_full_dialog (GtkWidget *applet)
438438
_("Battery Notice"),
439439
NULL,
440440
GTK_DIALOG_DESTROY_WITH_PARENT,
441-
GTK_STOCK_OK,
441+
"gtk-ok",
442442
GTK_RESPONSE_ACCEPT,
443443
NULL);
444444
g_signal_connect_swapped (G_OBJECT (dialog), "response",
@@ -593,7 +593,7 @@ battery_low_dialog( ProgressData *battery, BatteryStatus *info )
593593
_("Battery Notice"),
594594
NULL,
595595
GTK_DIALOG_DESTROY_WITH_PARENT,
596-
GTK_STOCK_OK,
596+
"gtk-ok",
597597
GTK_RESPONSE_ACCEPT,
598598
NULL);
599599
gtk_dialog_set_default_response( GTK_DIALOG (battery->battery_low_dialog),

‎charpick/charpick.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,13 +693,13 @@ get_chartable (charpick_data *curr_data)
693693
}
694694

695695
static const GtkActionEntry charpick_applet_menu_actions [] = {
696-
{ "Preferences", GTK_STOCK_PROPERTIES, N_("_Preferences"),
696+
{ "Preferences", "document-properties", N_("_Preferences"),
697697
NULL, NULL,
698698
G_CALLBACK (show_preferences_dialog) },
699-
{ "Help", GTK_STOCK_HELP, N_("_Help"),
699+
{ "Help", "help-browser", N_("_Help"),
700700
NULL, NULL,
701701
G_CALLBACK (help_cb) },
702-
{ "About", GTK_STOCK_ABOUT, N_("_About"),
702+
{ "About", "help-about", N_("_About"),
703703
NULL, NULL,
704704
G_CALLBACK (about) }
705705
};

‎charpick/properties.c‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ register_stock_for_edit (void)
2727
static const GtkStockItem edit_item [] = {
2828
{ CHARPICK_STOCK_EDIT, N_("_Edit"), 0, 0, GETTEXT_PACKAGE },
2929
};
30-
icons = gtk_icon_factory_lookup_default (GTK_STOCK_PREFERENCES);
30+
icons = gtk_icon_factory_lookup_default ("gtk-preferences");
3131
factory = gtk_icon_factory_new ();
3232
gtk_icon_factory_add (factory, CHARPICK_STOCK_EDIT, icons);
3333
gtk_icon_factory_add_default (factory);
@@ -93,8 +93,8 @@ add_edit_dialog_create (charpick_data *curr_data, gchar *string, gchar *title)
9393

9494
dialog = gtk_dialog_new_with_buttons (_(title), GTK_WINDOW (curr_data->propwindow),
9595
GTK_DIALOG_DESTROY_WITH_PARENT,
96-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
97-
GTK_STOCK_OK, GTK_RESPONSE_OK,
96+
"gtk-cancel", GTK_RESPONSE_CANCEL,
97+
"gtk-ok", GTK_RESPONSE_OK,
9898
NULL);
9999

100100
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (curr_data->propwindow));
@@ -465,22 +465,38 @@ static void default_chars_frame_create(charpick_data *curr_data)
465465

466466
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
467467
gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
468-
button = gtk_button_new_from_stock (GTK_STOCK_ADD);
468+
469+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
470+
"label", "gtk-add",
471+
"use-stock", TRUE,
472+
"use-underline", TRUE,
473+
NULL));
474+
469475
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
470476
g_signal_connect (G_OBJECT (button), "clicked",
471477
G_CALLBACK (add_palette), curr_data);
472478
set_access_namedesc (button, _("Add button"),
473479
_("Click to add a new palette"));
474480

475-
button = gtk_button_new_from_stock (CHARPICK_STOCK_EDIT);
481+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
482+
"label", CHARPICK_STOCK_EDIT,
483+
"use-stock", TRUE,
484+
"use-underline", TRUE,
485+
NULL));
486+
476487
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
477488
g_signal_connect (G_OBJECT (button), "clicked",
478489
G_CALLBACK (edit_palette), curr_data);
479490
g_object_set_data (G_OBJECT (scrolled), "edit_button", button);
480491
set_access_namedesc (button, _("Edit button"),
481492
_("Click to edit the selected palette"));
482493

483-
button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
494+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
495+
"label", "gtk-delete",
496+
"use-stock", TRUE,
497+
"use-underline", TRUE,
498+
NULL));
499+
484500
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
485501
g_signal_connect (G_OBJECT (button), "clicked",
486502
G_CALLBACK (delete_palette), curr_data);
@@ -540,8 +556,8 @@ show_preferences_dialog (GtkAction *action,
540556
curr_data->propwindow = gtk_dialog_new_with_buttons (_("Character Palette Preferences"),
541557
NULL,
542558
GTK_DIALOG_DESTROY_WITH_PARENT,
543-
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
544-
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
559+
"gtk-close", GTK_RESPONSE_CLOSE,
560+
"gtk-help", GTK_RESPONSE_HELP,
545561
NULL);
546562
gtk_window_set_screen (GTK_WINDOW (curr_data->propwindow),
547563
gtk_widget_get_screen (curr_data->applet));

‎command/command.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ static void command_settings_callback (GtkAction *action, CommandApplet *command
7171
static gboolean command_execute (CommandApplet *command_applet);
7272

7373
static const GtkActionEntry applet_menu_actions [] = {
74-
{ "Preferences", GTK_STOCK_PROPERTIES, N_("_Preferences"), NULL, NULL, G_CALLBACK (command_settings_callback) },
75-
{ "About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK (command_about_callback) }
74+
{ "Preferences", "document-properties", N_("_Preferences"), NULL, NULL, G_CALLBACK (command_settings_callback) },
75+
{ "About", "help-about", N_("_About"), NULL, NULL, G_CALLBACK (command_about_callback) }
7676
};
7777

7878
static char *ui = "<menuitem name='Item 1' action='Preferences' />"
@@ -133,7 +133,7 @@ command_settings_callback (GtkAction *action, CommandApplet *command_applet)
133133
dialog = GTK_DIALOG (gtk_dialog_new_with_buttons(_("Command Applet Preferences"),
134134
NULL,
135135
GTK_DIALOG_MODAL,
136-
GTK_STOCK_CLOSE,
136+
"gtk-close",
137137
GTK_RESPONSE_CLOSE,
138138
NULL));
139139
grid = GTK_GRID (gtk_grid_new ());

‎cpufreq/src/cpufreq-applet.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ static const gchar* const cpufreq_icons[] = {
123123
};
124124

125125
static const GtkActionEntry cpufreq_applet_menu_actions[] = {
126-
{ "CPUFreqAppletPreferences", GTK_STOCK_PROPERTIES, N_("_Preferences"),
126+
{ "CPUFreqAppletPreferences", "document-properties", N_("_Preferences"),
127127
NULL, NULL,
128128
G_CALLBACK (cpufreq_applet_preferences_cb) },
129-
{ "CPUFreqAppletHelp", GTK_STOCK_HELP, N_("_Help"),
129+
{ "CPUFreqAppletHelp", "help-browser", N_("_Help"),
130130
NULL, NULL,
131131
G_CALLBACK (cpufreq_applet_help_cb) },
132-
{ "CPUFreqAppletAbout", GTK_STOCK_ABOUT, N_("_About"),
132+
{ "CPUFreqAppletAbout", "help-about", N_("_About"),
133133
NULL, NULL,
134134
G_CALLBACK (cpufreq_applet_about_cb) }
135135
};

‎drivemount/drivemount.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ display_help (GtkAction *action,
156156
}
157157

158158
static const GtkActionEntry applet_menu_actions[] = {
159-
{ "Help", GTK_STOCK_HELP, N_("_Help"),
159+
{ "Help", "help-browser", N_("_Help"),
160160
NULL, NULL,
161161
G_CALLBACK (display_help) },
162-
{ "About", GTK_STOCK_ABOUT, N_("_About"),
162+
{ "About", "help-about", N_("_About"),
163163
NULL, NULL,
164164
G_CALLBACK (display_about_dialog) }
165165
};

‎geyes/geyes.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,13 +348,13 @@ help_cb (GtkAction *action,
348348

349349

350350
static const GtkActionEntry geyes_applet_menu_actions [] = {
351-
{ "Props", GTK_STOCK_PROPERTIES, N_("_Preferences"),
351+
{ "Props", "document-properties", N_("_Preferences"),
352352
NULL, NULL,
353353
G_CALLBACK (properties_cb) },
354-
{ "Help", GTK_STOCK_HELP, N_("_Help"),
354+
{ "Help", "help-browser", N_("_Help"),
355355
NULL, NULL,
356356
G_CALLBACK (help_cb) },
357-
{ "About", GTK_STOCK_ABOUT, N_("_About"),
357+
{ "About", "help-about", N_("_About"),
358358
NULL, NULL,
359359
G_CALLBACK (about_cb) }
360360
};

‎geyes/themes.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ properties_cb (GtkAction *action,
284284

285285
pbox = gtk_dialog_new_with_buttons (_("Geyes Preferences"), NULL,
286286
GTK_DIALOG_DESTROY_WITH_PARENT,
287-
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
288-
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
287+
"gtk-close", GTK_RESPONSE_CLOSE,
288+
"gtk-help", GTK_RESPONSE_HELP,
289289
NULL);
290290

291291
gtk_window_set_screen (GTK_WINDOW (pbox),

‎mateweather/mateweather-applet.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,16 @@ static const GtkActionEntry weather_applet_menu_actions [] = {
108108
{ "Details", NULL, N_("_Details"),
109109
NULL, NULL,
110110
G_CALLBACK (details_cb) },
111-
{ "Update", GTK_STOCK_REFRESH, N_("_Update"),
111+
{ "Update", "view-refresh", N_("_Update"),
112112
NULL, NULL,
113113
G_CALLBACK (update_cb) },
114-
{ "Props", GTK_STOCK_PROPERTIES, N_("_Preferences"),
114+
{ "Props", "document-properties", N_("_Preferences"),
115115
NULL, NULL,
116116
G_CALLBACK (pref_cb) },
117-
{ "Help", GTK_STOCK_HELP, N_("_Help"),
117+
{ "Help", "help-browser", N_("_Help"),
118118
NULL, NULL,
119119
G_CALLBACK (help_cb) },
120-
{ "About", GTK_STOCK_ABOUT, N_("_About"),
120+
{ "About", "help-about", N_("_About"),
121121
NULL, NULL,
122122
G_CALLBACK (about_cb) }
123123
};

0 commit comments

Comments
 (0)