fixed GTK_STOCK_* deprecation errors

diff --git a/src/audio.c b/src/audio.c
index 73c3d53..8bc0c31 100644 (file)
--- a/src/audio.c
+++ b/src/audio.c
@@ -66,7 +66,7 @@ EB_Error_Code audio_save_wave(RESULT *res, gchar *file)
 void audio_save_as(GtkWidget *w, gpointer data)
 {       
     static gchar *path = NULL;
-    path = app_browse_disk(_("Save Audio As"), mainwnd_get_wnd(), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_SAVE_AS, path);
+    path = app_browse_disk(_("Save Audio As"), mainwnd_get_wnd(), GTK_FILE_CHOOSER_ACTION_SAVE, "Save_As", path);
     if(path)
     {
         RESULT *res = (RESULT*)data;
@@ -80,7 +80,7 @@ gboolean audio_context_menu(GtkWidget *w, GdkEventButton *event, gpointer user_d
 {
     if(event->button != 3) return FALSE;
     GtkWidget *menu = gtk_menu_new(), *item;
-    item = gtk_image_menu_item_new_from_stock(GTK_STOCK_SAVE_AS, NULL);
+    item = gtk_image_menu_item_new_from_stock("Save_As", NULL);
     g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(audio_save_as), user_data);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
     gtk_widget_show_all(menu);
@@ -197,7 +197,7 @@ static void audio_init(Audio *self)
     gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
 #endif
     self->save_btn = gtk_button_new();
-    img = gtk_image_new_from_stock(GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_SMALL_TOOLBAR);
+    img = gtk_image_new_from_stock("Save_As", GTK_ICON_SIZE_SMALL_TOOLBAR);
     gtk_container_add(GTK_CONTAINER(self->save_btn), img);
     gtk_box_pack_start(GTK_BOX(hbox), self->save_btn, FALSE, TRUE, 0);
 }

diff --git a/src/dicts.c b/src/dicts.c
index a23f8af..2b4bc8c 100644 (file)
--- a/src/dicts.c
+++ b/src/dicts.c
@@ -276,7 +276,7 @@ void dicts_browse_btn_clicked_cb(GtkWidget *widget, gpointer data)
 {
     Mainwnd *mw = MAINWND(data);
     static gchar *path = NULL;
-    path = app_browse_disk("Select directory", GTK_WINDOW(gtk_widget_get_toplevel(widget)), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_OPEN, path);
+    path = app_browse_disk("Select directory", GTK_WINDOW(gtk_widget_get_toplevel(widget)), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, "_Open", path);
     if(path)
     {
         builder_set_str(mw->builder, "dicts_search_path", path);

diff --git a/src/eb123.c b/src/eb123.c
index 3bbeee3..9265131 100644 (file)
--- a/src/eb123.c
+++ b/src/eb123.c
@@ -16,7 +16,7 @@
 gchar* app_browse_disk(gchar* title, GtkWindow *wnd, gint action, gchar *btn_text, gchar *path)
 {
     gchar *res = NULL;
-    GtkWidget *dlg = gtk_file_chooser_dialog_new(title, wnd, action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, btn_text, GTK_RESPONSE_ACCEPT, NULL);
+    GtkWidget *dlg = gtk_file_chooser_dialog_new(title, wnd, action, "_Cancel", GTK_RESPONSE_CANCEL, btn_text, GTK_RESPONSE_ACCEPT, NULL);
     if(path)
     {
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), path);

diff --git a/src/hotkeys.c b/src/hotkeys.c
index e77e99d..a5ab815 100644 (file)
--- a/src/hotkeys.c
+++ b/src/hotkeys.c
@@ -422,7 +422,7 @@ static void hotkeys_edit_cb(GtkWidget *widget, GtkBox *hbox)
                                             _("Press a key (or a key combination) to setup hotkey,\n"
                                             "\"Clear\" button or \"Esc\" key to remove current hotkey,\n"
                                             "\"Cancel\" to close this message."));
-    gtk_dialog_add_buttons(GTK_DIALOG(dlg), GTK_STOCK_CLEAR, GTK_RESPONSE_NO, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+    gtk_dialog_add_buttons(GTK_DIALOG(dlg), "_Clear", GTK_RESPONSE_NO, "_Cancel", GTK_RESPONSE_CANCEL, NULL);
 
     gtk_window_set_title(GTK_WINDOW(dlg), _("Grabbing a key."));
     g_signal_connect(G_OBJECT(dlg), "key-press-event", G_CALLBACK(hotkeys_grab_key_cb), hbox);

diff --git a/src/mainwnd.c b/src/mainwnd.c
index ec0b3e8..4b6b446 100644 (file)
--- a/src/mainwnd.c
+++ b/src/mainwnd.c
@@ -392,7 +392,7 @@ void mainwnd_status_icon_menu_cb(GtkStatusIcon *status_icon, guint button, guint
     g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(mainwnd_scan_toggled2_cb), data);
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), scan);
 
-    item = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
+    item = gtk_image_menu_item_new_from_stock("_Quit", NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
     g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(mainwnd_exit_btn_clicked_cb), NULL);
     gtk_widget_show_all(menu);

diff --git a/src/textview.c b/src/textview.c
index 977de0f..d8b5946 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -105,7 +105,7 @@ static void textview_populate_popup_cb(GtkTextView *text, GtkMenu *menu, gpointe
         gtk_widget_show(item);
         gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), item);
 
-        item = gtk_image_menu_item_new_from_stock(GTK_STOCK_FIND, NULL);
+        item = gtk_image_menu_item_new_from_stock("edit-find", NULL);
         gtk_widget_show(item);
         gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), item);
         g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(textview_search_selection_cb), (gpointer)text);

diff --git a/src/video.c b/src/video.c
index 341b5cb..00dd9e3 100644 (file)
--- a/src/video.c
+++ b/src/video.c
@@ -69,7 +69,7 @@ void video_save_as(GtkWidget *w, gpointer data)
 {       
     Video *v = VIDEO(data);
     static gchar *path = NULL;
-    path = app_browse_disk(_("Save Video As"), mainwnd_get_wnd(), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_SAVE_AS, path);
+    path = app_browse_disk(_("Save Video As"), mainwnd_get_wnd(), GTK_FILE_CHOOSER_ACTION_SAVE, "Save_As", path);
     if(path)
     {
         RESULT *res = v->res;
@@ -335,7 +335,7 @@ static void video_init(Video *self)
     gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
 #endif
     self->save_btn = gtk_button_new();
-    GtkWidget *img = gtk_image_new_from_stock(GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_SMALL_TOOLBAR);
+    GtkWidget *img = gtk_image_new_from_stock("Save_As", GTK_ICON_SIZE_SMALL_TOOLBAR);
     gtk_container_add(GTK_CONTAINER(self->save_btn), img);
     gtk_box_pack_start(GTK_BOX(hbox), self->save_btn, FALSE, TRUE, 0);
     g_signal_connect(G_OBJECT(self->save_btn), "clicked", G_CALLBACK(video_save_as), self);