Remove deprecated GTK_STOCK_DIALOG_*

Use standard icon names and rename related GQ_ICON macros.

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index 5a86a75..9343a64 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -212,7 +212,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *, gpointer data)
                                gd = generic_dialog_new(_("Geocode images"),
                                                        "geocode_images", nullptr, TRUE,
                                                        bar_pane_gps_close_cancel_cb, pgd);
-                               generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
+                               generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION,
                                                        _("Write lat/long to meta-data?"),
                                                        message->str, TRUE);
 
@@ -846,7 +846,7 @@ void bar_pane_gps_map_centreing(PaneGPSData *pgd)
 
        gd = generic_dialog_new(_("Map centering"),
                                "map_centering", nullptr, TRUE, nullptr, pgd);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO,
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_INFO,
                                "Map Centering", message->str, TRUE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", NULL, TRUE);
 

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index 5068dbd..377519a 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -1052,7 +1052,7 @@ static void bar_pane_keywords_disconnect_marks_cb(GtkWidget *menu_widget, gpoint
 
        gd = generic_dialog_new(_("Marks Keywords"),
                                "marks_keywords", menu_widget, TRUE, dummy_cancel_cb, pkd);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_WARNING,
                                "Disconnect all Marks Keywords connections?", message->str, TRUE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", bar_pane_keywords_disconnect_marks_ok_cb, TRUE);
 

diff --git a/src/bar-sort.cc b/src/bar-sort.cc
index b5ae8ec..7d5a6b6 100644 (file)
--- a/src/bar-sort.cc
+++ b/src/bar-sort.cc
@@ -431,7 +431,7 @@ static void bar_filter_help_dialog()
 
        gd = generic_dialog_new(_("Sort Manager Operations"),
                                "sort_manager_operations", nullptr, TRUE, nullptr, nullptr);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO,
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_INFO,
                                "Sort Manager Operations", _("Additional operations utilising plugins\nmay be included by setting:\n\nX-Geeqie-Filter=true\n\nin the plugin file."), TRUE);
        generic_dialog_add_button(gd, GQ_ICON_HELP, _("Help"), bar_filter_help_cb, TRUE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", NULL, TRUE);
@@ -513,7 +513,7 @@ static void bar_sort_add_ok_cb(FileDialog *fd, gpointer data)
                if (isfile(path))
                        {
                        gchar *text = g_strdup_printf(_("The collection:\n%s\nalready exists."), filename);
-                       file_util_warning_dialog(_("Collection exists"), text, GTK_STOCK_DIALOG_INFO, nullptr);
+                       file_util_warning_dialog(_("Collection exists"), text, GQ_ICON_DIALOG_INFO, nullptr);
                        g_free(text);
                        }
                else
@@ -529,7 +529,7 @@ static void bar_sort_add_ok_cb(FileDialog *fd, gpointer data)
                                {
                                gchar *text = g_strdup_printf(_("Failed to save the collection:\n%s"), path);
                                file_util_warning_dialog(_("Save Failed"), text,
-                                                        GTK_STOCK_DIALOG_ERROR, GENERIC_DIALOG(fd)->dialog);
+                                                        GQ_ICON_DIALOG_ERROR, GENERIC_DIALOG(fd)->dialog);
                                g_free(text);
                                }
                        collection_unref(cd);

diff --git a/src/cache-maint.cc b/src/cache-maint.cc
index 93838c1..9eebb30 100644 (file)
--- a/src/cache-maint.cc
+++ b/src/cache-maint.cc
@@ -812,7 +812,7 @@ static void cache_manager_render_start_cb(GenericDialog *, gpointer data)
                        {
                        warning_dialog(_("Invalid folder"),
                        _("The specified folder can not be found."),
-                       GTK_STOCK_DIALOG_WARNING, cd->gd->dialog);
+                       GQ_ICON_DIALOG_WARNING, cd->gd->dialog);
                        }
                else
                        {
@@ -1229,7 +1229,7 @@ void cache_manager_main_clear_confirm(GtkWidget *parent)
        gd = generic_dialog_new(_("Clear cache"),
                                "clear_cache", parent, TRUE,
                                dummy_cancel_cb, nullptr);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Clear cache"),
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION, _("Clear cache"),
                                   _("This will remove all thumbnails and sim. files\nthat have been saved to disk, continue?"), TRUE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", cache_manager_main_clear_ok_cb, TRUE);
 
@@ -1481,7 +1481,7 @@ static void cache_manager_sim_start_cb(GenericDialog *, gpointer data)
                        {
                        warning_dialog(_("Invalid folder"),
                        _("The specified folder can not be found."),
-                       GTK_STOCK_DIALOG_WARNING, cd->gd->dialog);
+                       GQ_ICON_DIALOG_WARNING, cd->gd->dialog);
                        }
                else
                        {
@@ -1611,7 +1611,7 @@ static void cache_manager_cache_maintenance_start_cb(GenericDialog *, gpointer d
                        {
                        warning_dialog(_("Invalid folder"),
                        _("The specified folder can not be found."),
-                       GTK_STOCK_DIALOG_WARNING, cd->gd->dialog);
+                       GQ_ICON_DIALOG_WARNING, cd->gd->dialog);
                        }
                else
                        {

diff --git a/src/collect-dlg.cc b/src/collect-dlg.cc
index 26336b0..33a0971 100644 (file)
--- a/src/collect-dlg.cc
+++ b/src/collect-dlg.cc
@@ -64,7 +64,7 @@ static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, Co
        if (isdir(fd->dest_path))
                {
                buf = g_strdup_printf(_("Specified path:\n%s\nis a folder, collections are files"), fd->dest_path);
-               file_util_warning_dialog(_("Invalid filename"), buf, GTK_STOCK_DIALOG_INFO, GENERIC_DIALOG(fd)->dialog);
+               file_util_warning_dialog(_("Invalid filename"), buf, GQ_ICON_DIALOG_INFO, GENERIC_DIALOG(fd)->dialog);
                g_free(buf);
                return FALSE;
                }
@@ -77,7 +77,7 @@ static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, Co
                                        GENERIC_DIALOG(fd)->dialog, TRUE,
                                        collection_confirm_cancel_cb, fd);
 
-               generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
+               generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION,
                                           _("Overwrite existing file?"), fd->dest_path, TRUE);
 
                generic_dialog_add_button(gd, GQ_ICON_OK, _("_Overwrite"), collection_confirm_ok_cb, TRUE);
@@ -90,7 +90,7 @@ static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, Co
        if (!collection_save(cd, fd->dest_path))
                {
                buf = g_strdup_printf(_("Failed to save the collection:\n%s"), fd->dest_path);
-               file_util_warning_dialog(_("Save Failed"), buf, GTK_STOCK_DIALOG_ERROR, GENERIC_DIALOG(fd)->dialog);
+               file_util_warning_dialog(_("Save Failed"), buf, GQ_ICON_DIALOG_ERROR, GENERIC_DIALOG(fd)->dialog);
                g_free(buf);
                }
 
@@ -148,7 +148,7 @@ static void real_collection_button_pressed(FileDialog *fd, gpointer data, gint a
                {
                if (text)
                        {
-                       file_util_warning_dialog(_("Can not open collection file"), text.get(), GTK_STOCK_DIALOG_ERROR, nullptr);
+                       file_util_warning_dialog(_("Can not open collection file"), text.get(), GQ_ICON_DIALOG_ERROR, nullptr);
                        }
                return;
                }

diff --git a/src/collect.cc b/src/collect.cc
index 78cc7ce..398fa97 100644 (file)
--- a/src/collect.cc
+++ b/src/collect.cc
@@ -1190,7 +1190,7 @@ static void collection_close_save_cb(GenericDialog *gd, gpointer data)
                {
                gchar *buf;
                buf = g_strdup_printf(_("Failed to save the collection:\n%s"), cw->cd->path);
-               warning_dialog(_("Save Failed"), buf, GTK_STOCK_DIALOG_ERROR, cw->window);
+               warning_dialog(_("Save Failed"), buf, GQ_ICON_DIALOG_ERROR, cw->window);
                g_free(buf);
                return;
                }
@@ -1229,7 +1229,7 @@ static void collection_close_dlg_show(CollectWindow *cw)
        gd = generic_dialog_new(_("Close collection"),
                                "close_collection", cw->window, FALSE,
                                collection_close_cancel_cb, cw);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION,
                                   _("Close collection"),
                                   _("Collection has been modified.\nSave first?"), TRUE);
 

diff --git a/src/desktop-file.cc b/src/desktop-file.cc
index 725cf7c..43ab324 100644 (file)
--- a/src/desktop-file.cc
+++ b/src/desktop-file.cc
@@ -74,7 +74,7 @@ static gboolean editor_window_save(EditorWindow *ew)
 
        if (!name || !name[0])
                {
-               file_util_warning_dialog(_("Can't save"), _("Please specify file name."), GTK_STOCK_DIALOG_ERROR, nullptr);
+               file_util_warning_dialog(_("Can't save"), _("Please specify file name."), GQ_ICON_DIALOG_ERROR, nullptr);
                return FALSE;
                }
 
@@ -86,13 +86,13 @@ static gboolean editor_window_save(EditorWindow *ew)
 
        if (!recursive_mkdir_if_not_exists(dir, 0755))
                {
-               file_util_warning_dialog(_("Can't save"), _("Could not create directory"), GTK_STOCK_DIALOG_ERROR, nullptr);
+               file_util_warning_dialog(_("Can't save"), _("Could not create directory"), GQ_ICON_DIALOG_ERROR, nullptr);
                ret = FALSE;
                }
 
        if (ret && !g_file_set_contents(path, text, -1, &error))
                {
-               file_util_warning_dialog(_("Can't save"), error->message, GTK_STOCK_DIALOG_ERROR, nullptr);
+               file_util_warning_dialog(_("Can't save"), error->message, GQ_ICON_DIALOG_ERROR, nullptr);
                g_error_free(error);
                ret = FALSE;
                }
@@ -293,7 +293,7 @@ static void editor_list_window_delete_dlg_ok_cb(GenericDialog *gd, gpointer data
        if (!unlink_file(ewdl->path))
                {
                gchar *text = g_strdup_printf(_("Unable to delete file:\n%s"), ewdl->path);
-               warning_dialog(_("File deletion failed"), text, GTK_STOCK_DIALOG_WARNING, nullptr);
+               warning_dialog(_("File deletion failed"), text, GQ_ICON_DIALOG_WARNING, nullptr);
                g_free(text);
                }
        else
@@ -344,7 +344,7 @@ static void editor_list_window_delete_cb(GtkWidget *, gpointer data)
                generic_dialog_add_button(ewl->gd, GQ_ICON_DELETE, "Delete", editor_list_window_delete_dlg_ok_cb, TRUE);
 
                text = g_strdup_printf(_("About to delete the file:\n %s"), path);
-               generic_dialog_add_message(ewl->gd, GTK_STOCK_DIALOG_QUESTION,
+               generic_dialog_add_message(ewl->gd, GQ_ICON_DIALOG_QUESTION,
                                           _("Delete file"), text, TRUE);
                g_free(text);
 

diff --git a/src/dupe.cc b/src/dupe.cc
index 381c0a6..89101c1 100644 (file)
--- a/src/dupe.cc
+++ b/src/dupe.cc
@@ -4971,7 +4971,7 @@ static void dupe_dnd_data_get(GtkWidget *widget, GdkDragContext *context,
 
        if (dw->add_files_queue_id > 0)
                {
-               warning_dialog(_("Find duplicates"), _("Please wait for the current file selection to be loaded."), GTK_STOCK_DIALOG_INFO, dw->window);
+               warning_dialog(_("Find duplicates"), _("Please wait for the current file selection to be loaded."), GQ_ICON_DIALOG_INFO, dw->window);
 
                return;
                }

diff --git a/src/editors.cc b/src/editors.cc
index 8b982ef..807d16e 100644 (file)
--- a/src/editors.cc
+++ b/src/editors.cc
@@ -1338,7 +1338,7 @@ EditorFlags start_editor_from_filelist_full(const gchar *key, GList *list, const
                {
                gchar *text = g_strdup_printf(_("%s\n\"%s\""), editor_get_error_str(error), editor->file);
 
-               file_util_warning_dialog(_("Invalid editor command"), text, GTK_STOCK_DIALOG_ERROR, nullptr);
+               file_util_warning_dialog(_("Invalid editor command"), text, GQ_ICON_DIALOG_ERROR, nullptr);
                g_free(text);
                }
 

diff --git a/src/img-view.cc b/src/img-view.cc
index 0862cb6..663926f 100644 (file)
--- a/src/img-view.cc
+++ b/src/img-view.cc
@@ -668,7 +668,7 @@ static void button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
                                        }
                                else
                                        {
-                                       warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GTK_STOCK_DIALOG_WARNING, nullptr);
+                                       warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GQ_ICON_DIALOG_WARNING, nullptr);
                                        }
                                }
                        else if (options->image_l_click_video && options->image_l_click_video_editor && imd->image_fd->format_class == FORMAT_CLASS_VIDEO)

diff --git a/src/layout-image.cc b/src/layout-image.cc
index 762d823..c3815ff 100644 (file)
--- a/src/layout-image.cc
+++ b/src/layout-image.cc
@@ -695,7 +695,7 @@ static void li_open_archive_cb(GtkWidget *, gpointer data)
                }
        else
                {
-               warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GTK_STOCK_DIALOG_WARNING, nullptr);
+               warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GQ_ICON_DIALOG_WARNING, nullptr);
                }
 }
 
@@ -1890,7 +1890,7 @@ static void layout_image_button_cb(ImageWindow *imd, GdkEventButton *event, gpoi
                                        }
                                else
                                        {
-                                       warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GTK_STOCK_DIALOG_WARNING, nullptr);
+                                       warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GQ_ICON_DIALOG_WARNING, nullptr);
                                        }
                                }
                        else if (options->image_l_click_video && options->image_l_click_video_editor && imd-> image_fd && imd->image_fd->format_class == FORMAT_CLASS_VIDEO)

diff --git a/src/layout-util.cc b/src/layout-util.cc
index 503c237..53986ff 100644 (file)
--- a/src/layout-util.cc
+++ b/src/layout-util.cc
@@ -239,7 +239,7 @@ static void layout_menu_clear_marks_cb(GtkAction *, gpointer)
 
        gd = generic_dialog_new(_("Clear Marks"),
                                "marks_clear", nullptr, FALSE, clear_marks_cancel_cb, nullptr);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, "Clear all marks?",
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION, "Clear all marks?",
                                "This will clear all marks for all images,\nincluding those linked to keywords",
                                TRUE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", layout_menu_clear_marks_ok_cb, TRUE);
@@ -603,7 +603,7 @@ static void layout_menu_write_rotate(GtkToggleAction *, gpointer data, gboolean
 
                        gd = generic_dialog_new(_("Image orientation"),
                        "Image orientation", nullptr, TRUE, nullptr, nullptr);
-                       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_ERROR,
+                       generic_dialog_add_message(gd, GQ_ICON_DIALOG_ERROR,
                        "Image orientation", message->str, TRUE);
                        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", nullptr, TRUE);
 
@@ -907,7 +907,7 @@ static void layout_menu_open_archive_cb(GtkAction *, gpointer data)
                        }
                else
                        {
-                       warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GTK_STOCK_DIALOG_WARNING, nullptr);
+                       warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GQ_ICON_DIALOG_WARNING, nullptr);
                        }
                }
 }
@@ -2143,7 +2143,7 @@ static void window_rename_ok(GenericDialog *, gpointer data)
                        {
                        gchar *buf;
                        buf = g_strdup_printf(_("Window layout name \"%s\" already exists."), new_id);
-                       warning_dialog(_("Rename window"), buf, GTK_STOCK_DIALOG_WARNING, rw->gd->dialog);
+                       warning_dialog(_("Rename window"), buf, GQ_ICON_DIALOG_WARNING, rw->gd->dialog);
                        g_free(buf);
                        window_layout_name_exists = TRUE;
                        break;

diff --git a/src/main.cc b/src/main.cc
index b5305ee..17fe7f6 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1108,7 +1108,7 @@ static gint exit_confirm_dlg()
                                exit_confirm_cancel_cb, nullptr);
        g_free(msg);
        msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME);
-       generic_dialog_add_message(exit_dialog, GTK_STOCK_DIALOG_QUESTION,
+       generic_dialog_add_message(exit_dialog, GQ_ICON_DIALOG_QUESTION,
                                   msg, _("Collections have been modified. Quit anyway?"), TRUE);
        g_free(msg);
        generic_dialog_add_button(exit_dialog, GQ_ICON_QUIT, _("Quit"), exit_confirm_exit_cb, TRUE);

diff --git a/src/main.h b/src/main.h
index 4ba7354..26e6fdb 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -193,8 +193,12 @@
 #define GQ_ICON_OK "emblem-ok"
 #define GQ_ICON_APPLY "emblem-ok" // need something else?
 #define GQ_ICON_CANCEL "dialog-cancel" // missing in adwaita and others, seen in breeze
-#define GQ_ICON_INFO "dialog-information"
-#define GQ_ICON_QUESTION "dialog-question"
+
+#define GQ_ICON_DIALOG_ERROR "dialog-error"
+#define GQ_ICON_DIALOG_INFO "dialog-information"
+#define GQ_ICON_DIALOG_QUESTION "dialog-question"
+#define GQ_ICON_DIALOG_WARNING "dialog-warning"
+
 #define GQ_ICON_UNREADABLE "emblem-unreadable"
 #define GQ_ICON_LINK "emblem-symbolic-link"
 #define GQ_ICON_READONLY "emblem-readonly"

diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc
index 32b2462..bc7c328 100644 (file)
--- a/src/pan-view/pan-view.cc
+++ b/src/pan-view/pan-view.cc
@@ -511,7 +511,7 @@ static void pan_warning_folder(const gchar *path, GtkWidget *parent)
 
        message = g_strdup_printf(_("The pan view does not support the folder \"%s\"."), path);
        warning_dialog(_("Folder not supported"), message,
-                     GTK_STOCK_DIALOG_INFO, parent);
+                     GQ_ICON_DIALOG_INFO, parent);
        g_free(message);
 }
 
@@ -1746,7 +1746,7 @@ static void pan_window_entry_activate_cb(const gchar *new_text, gpointer data)
                {
                warning_dialog(_("Folder not found"),
                               _("The entered path is not a folder"),
-                              GTK_STOCK_DIALOG_WARNING, pw->path_entry);
+                              GQ_ICON_DIALOG_WARNING, pw->path_entry);
                }
        else
                {
@@ -2030,7 +2030,7 @@ static gboolean pan_warning(FileData *dir_fd)
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK",
                                  pan_warning_ok_cb, TRUE);
 
-       box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO,
+       box = generic_dialog_add_message(gd, GQ_ICON_DIALOG_INFO,
                                         _("Pan view performance may be poor."),
                                         _("To improve the performance of thumbnails in\npan view the following options can be enabled.\n\nNote that both options must be enabled to\nnotice a change in performance."), TRUE);
 

diff --git a/src/preferences.cc b/src/preferences.cc
index a67939a..2eb8802 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -1423,7 +1423,7 @@ static void filter_default_cb(GtkWidget *widget, gpointer data)
        gd = generic_dialog_new(_("Reset filters"),
                                "reset_filter", widget, TRUE,
                                dummy_cancel_cb, data);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Reset filters"),
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION, _("Reset filters"),
                                   _("This will reset the file filters to the defaults.\nContinue?"), TRUE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", filter_default_ok_cb, TRUE);
        gtk_widget_show(gd->dialog);
@@ -1454,7 +1454,7 @@ static void safe_delete_clear_cb(GtkWidget *widget, gpointer)
        gd = generic_dialog_new(_("Clear trash"),
                                "clear_trash", widget, TRUE,
                                dummy_cancel_cb, nullptr);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Clear trash"),
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION, _("Clear trash"),
                                    _("This will remove the trash contents."), FALSE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", safe_delete_clear_ok_cb, TRUE);
        entry = gtk_entry_new();
@@ -1502,7 +1502,7 @@ static void image_overlay_default_template_cb(GtkWidget *widget, gpointer data)
        gd = generic_dialog_new(_("Reset image overlay template string"),
                                "reset_image_overlay_template_string", widget, TRUE,
                                dummy_cancel_cb, data);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Reset image overlay template string"),
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION, _("Reset image overlay template string"),
                                   _("This will reset the image overlay template string to the default.\nContinue?"), TRUE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", image_overlay_default_template_ok_cb, TRUE);
        gtk_widget_show(gd->dialog);
@@ -3101,7 +3101,7 @@ static void keywords_find_start_cb(GenericDialog *, gpointer data)
                {
                warning_dialog(_("Invalid folder"),
                                _("The specified folder can not be found."),
-                               GTK_STOCK_DIALOG_WARNING, kfd->gd->dialog);
+                               GQ_ICON_DIALOG_WARNING, kfd->gd->dialog);
                }
        else
                {
@@ -4269,7 +4269,7 @@ static void timezone_async_ready_cb(GObject *source_object, GAsyncResult *res, g
                                }
                        else
                                {
-                               warning_dialog(_("Warning: Cannot open timezone database file"), _("See the Log Window"), GTK_STOCK_DIALOG_WARNING, nullptr);
+                               warning_dialog(_("Warning: Cannot open timezone database file"), _("See the Log Window"), GQ_ICON_DIALOG_WARNING, nullptr);
                                }
 
                        g_free(timezone_bin);
@@ -4277,14 +4277,14 @@ static void timezone_async_ready_cb(GObject *source_object, GAsyncResult *res, g
                        }
                else
                        {
-                       warning_dialog(_("Warning: Cannot open timezone database file"), _("See the Log Window"), GTK_STOCK_DIALOG_WARNING, nullptr);
+                       warning_dialog(_("Warning: Cannot open timezone database file"), _("See the Log Window"), GQ_ICON_DIALOG_WARNING, nullptr);
                        }
                g_free(tmp_filename);
                file_data_unref(fd);
                }
        else
                {
-               file_util_warning_dialog(_("Error: Timezone database download failed"), error->message, GTK_STOCK_DIALOG_ERROR, nullptr);
+               file_util_warning_dialog(_("Error: Timezone database download failed"), error->message, GQ_ICON_DIALOG_ERROR, nullptr);
                }
 
        g_file_delete(tz->tmp_g_file, nullptr, &error);
@@ -4326,7 +4326,7 @@ static void timezone_database_install_cb(GtkWidget *widget, gpointer data)
 
        if (error)
                {
-               file_util_warning_dialog(_("Timezone database download failed"), error->message, GTK_STOCK_DIALOG_ERROR, nullptr);
+               file_util_warning_dialog(_("Timezone database download failed"), error->message, GQ_ICON_DIALOG_ERROR, nullptr);
                log_printf("Error: Download timezone database failed:\n%s", error->message);
                g_error_free(error);
                g_object_unref(tz->tmp_g_file);
@@ -4337,7 +4337,7 @@ static void timezone_database_install_cb(GtkWidget *widget, gpointer data)
 
                tz->gd = generic_dialog_new(_("Timezone database"), "download_timezone_database", nullptr, TRUE, timezone_cancel_button_cb, tz);
 
-               generic_dialog_add_message(tz->gd, GTK_STOCK_DIALOG_INFO, _("Downloading timezone database"), nullptr, FALSE);
+               generic_dialog_add_message(tz->gd, GQ_ICON_DIALOG_INFO, _("Downloading timezone database"), nullptr, FALSE);
 
                tz->progress = gtk_progress_bar_new();
                gtk_box_pack_start(GTK_BOX(tz->gd->vbox), tz->progress, FALSE, FALSE, 0);

diff --git a/src/search.cc b/src/search.cc
index d4fefd7..4d6544a 100644 (file)
--- a/src/search.cc
+++ b/src/search.cc
@@ -2679,7 +2679,7 @@ static void search_start_cb(GtkWidget *, gpointer data)
                        {
                        file_util_warning_dialog(_("File not found"),
                                                 _("Please enter an existing file for image content."),
-                                                GTK_STOCK_DIALOG_WARNING, sd->window);
+                                                GQ_ICON_DIALOG_WARNING, sd->window);
                        return;
                        }
                tab_completion_append_to_history(sd->entry_similarity, sd->search_similarity_path);
@@ -2704,7 +2704,7 @@ static void search_start_cb(GtkWidget *, gpointer data)
                                {
                                file_util_warning_dialog(_(
                                                "Entry does not contain a valid lat/long value"),
-                                                       entry_text, GTK_STOCK_DIALOG_WARNING, sd->window);
+                                                       entry_text, GQ_ICON_DIALOG_WARNING, sd->window);
                                return;
                                }
                        g_free(entry_text);
@@ -2754,7 +2754,7 @@ static void search_start_cb(GtkWidget *, gpointer data)
                        {
                        file_util_warning_dialog(_("Folder not found"),
                                                 _("Please enter an existing folder to search."),
-                                                GTK_STOCK_DIALOG_WARNING, sd->window);
+                                                GQ_ICON_DIALOG_WARNING, sd->window);
                        }
 
                g_free(path);
@@ -2799,7 +2799,7 @@ static void search_start_cb(GtkWidget *, gpointer data)
                        }
                else
                        {
-                       file_util_warning_dialog(_("Collection not found"), _("Please enter an existing collection name."), GTK_STOCK_DIALOG_WARNING, sd->window);
+                       file_util_warning_dialog(_("Collection not found"), _("Please enter an existing collection name."), GQ_ICON_DIALOG_WARNING, sd->window);
                        }
                g_free(collection);
                }

diff --git a/src/trash.cc b/src/trash.cc
index 4957264..23466fb 100644 (file)
--- a/src/trash.cc
+++ b/src/trash.cc
@@ -86,7 +86,7 @@ static gint file_util_safe_number(gint64 free_space)
                        {
                        file_util_warning_dialog(_("Delete failed"),
                                                 _("Unable to remove old file from trash folder"),
-                                                GTK_STOCK_DIALOG_WARNING, nullptr);
+                                                GQ_ICON_DIALOG_WARNING, nullptr);
                        warned = TRUE;
                        }
                total -= fd->size;
@@ -137,7 +137,7 @@ gboolean file_util_safe_unlink(const gchar *path)
                        {
                        file_util_warning_dialog(_("Delete failed"),
                                                 _("Unable to remove file"),
-                                                GTK_STOCK_DIALOG_WARNING, nullptr);
+                                                GQ_ICON_DIALOG_WARNING, nullptr);
                        success = FALSE;
                        }
                }
@@ -180,7 +180,7 @@ gboolean file_util_safe_unlink(const gchar *path)
                        gchar *buf;
 
                        buf = g_strdup_printf(_("Unable to access or create the trash folder.\n\"%s\""), options->file_ops.safe_delete_path);
-                       gd = file_util_warning_dialog(result, buf, GTK_STOCK_DIALOG_WARNING, nullptr);
+                       gd = file_util_warning_dialog(result, buf, GQ_ICON_DIALOG_WARNING, nullptr);
                        g_free(buf);
                        }
                }
@@ -192,7 +192,7 @@ gboolean file_util_safe_unlink(const gchar *path)
                if (!g_file_trash(tmp, FALSE, &error) )
                        {
                        message = g_strconcat("See the Help file for a possible workaround.\n\n", error->message, NULL);
-                       gd = warning_dialog(_("Move to trash failed\n\n"), message, GTK_STOCK_DIALOG_ERROR, nullptr);
+                       gd = warning_dialog(_("Move to trash failed\n\n"), message, GQ_ICON_DIALOG_ERROR, nullptr);
                        generic_dialog_add_button(gd, GQ_ICON_HELP, _("Help"), move_to_trash_failed_cb, FALSE);
 
                        g_free(message);

diff --git a/src/ui-fileops.cc b/src/ui-fileops.cc
index b366f86..904a3ab 100644 (file)
--- a/src/ui-fileops.cc
+++ b/src/ui-fileops.cc
@@ -104,7 +104,7 @@ static void encoding_dialog(const gchar *path)
                                "locale warning", nullptr, TRUE, nullptr, nullptr);
        generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), nullptr, TRUE);
 
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_WARNING,
                                   _("Filename encoding locale mismatch"), string->str, TRUE);
 
        gtk_widget_show(gd->dialog);
@@ -1033,7 +1033,7 @@ static void web_file_async_ready_cb(GObject *source_object, GAsyncResult *res, g
                }
        else
                {
-               file_util_warning_dialog(_("Web file download failed"), error->message, GTK_STOCK_DIALOG_ERROR, nullptr);
+               file_util_warning_dialog(_("Web file download failed"), error->message, GQ_ICON_DIALOG_ERROR, nullptr);
                }
 
        g_object_unref(web->tmp_g_file);
@@ -1099,7 +1099,7 @@ gboolean download_web_file(const gchar *text, gboolean minimized, gpointer data)
                                web->gd = generic_dialog_new(_("Download web file"), "download_web_file", nullptr, TRUE, download_web_file_cancel_button_cb, web);
 
                                message = g_strconcat(_("Downloading "), base, NULL);
-                               generic_dialog_add_message(web->gd, GTK_STOCK_DIALOG_INFO, message, nullptr, FALSE);
+                               generic_dialog_add_message(web->gd, GQ_ICON_DIALOG_INFO, message, nullptr, FALSE);
 
                                web->progress = gtk_progress_bar_new();
                                gtk_box_pack_start(GTK_BOX(web->gd->vbox), web->progress, FALSE, FALSE, 0);

diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc
index 18d858a..2a68783 100644 (file)
--- a/src/ui-pathsel.cc
+++ b/src/ui-pathsel.cc
@@ -416,13 +416,13 @@ static gint dest_view_rename_cb(TreeEditData *ted, const gchar *old_name, const
        if (isname(new_path))
                {
                buf = g_strdup_printf(_("A file with name %s already exists."), new_name);
-               warning_dialog(_("Rename failed"), buf, GTK_STOCK_DIALOG_INFO, dd->entry);
+               warning_dialog(_("Rename failed"), buf, GQ_ICON_DIALOG_INFO, dd->entry);
                g_free(buf);
                }
        else if (!rename_file(old_path, new_path))
                {
                buf = g_strdup_printf(_("Failed to rename %s to %s."), old_name, new_name);
-               warning_dialog(_("Rename failed"), buf, GTK_STOCK_DIALOG_ERROR, dd->entry);
+               warning_dialog(_("Rename failed"), buf, GQ_ICON_DIALOG_ERROR, dd->entry);
                g_free(buf);
                }
        else
@@ -478,7 +478,7 @@ static void dest_view_delete_dlg_ok_cb(GenericDialog *gd, gpointer data)
        if (!unlink_file(dl->path))
                {
                gchar *text = g_strdup_printf(_("Unable to delete file:\n%s"), dl->path);
-               warning_dialog(_("File deletion failed"), text, GTK_STOCK_DIALOG_WARNING, dl->dd->entry);
+               warning_dialog(_("File deletion failed"), text, GQ_ICON_DIALOG_WARNING, dl->dd->entry);
                g_free(text);
                }
        else if (dl->dd->path)
@@ -527,7 +527,7 @@ static void dest_view_delete(Dest_Data *dd, GtkTreeView *view)
        generic_dialog_add_button(dd->gd, GQ_ICON_DELETE, "Delete", dest_view_delete_dlg_ok_cb, TRUE);
 
        text = g_strdup_printf(_("About to delete the file:\n %s"), path);
-       generic_dialog_add_message(dd->gd, GTK_STOCK_DIALOG_QUESTION,
+       generic_dialog_add_message(dd->gd, GQ_ICON_DIALOG_QUESTION,
                                   _("Delete file"), text, TRUE);
        g_free(text);
 
@@ -728,7 +728,7 @@ static void dest_new_dir_cb(GtkWidget *widget, gpointer data)
                gchar *text;
 
                text = g_strdup_printf(_("Unable to create folder:\n%s"), filename_from_path(path));
-               warning_dialog(_("Error creating folder"), text, GTK_STOCK_DIALOG_ERROR, dd->entry);
+               warning_dialog(_("Error creating folder"), text, GQ_ICON_DIALOG_ERROR, dd->entry);
                g_free(text);
                }
        else

diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc
index 783096e..8a7adde 100644 (file)
--- a/src/ui-utildlg.cc
+++ b/src/ui-utildlg.cc
@@ -274,7 +274,7 @@ GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *icon_name,
  *
  *
  */
-GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock_id,
+GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_name,
                                      const gchar *heading, const gchar *text, gboolean expand)
 {
        GtkWidget *hbox;
@@ -282,11 +282,11 @@ GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock
        GtkWidget *label;
 
        hbox = pref_box_new(gd->vbox, expand, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       if (icon_stock_id)
+       if (icon_name)
                {
                GtkWidget *image;
 
-               image = gtk_image_new_from_stock(icon_stock_id, GTK_ICON_SIZE_DIALOG);
+               image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_DIALOG);
                gtk_widget_set_halign(GTK_WIDGET(image), GTK_ALIGN_CENTER);
                gtk_widget_set_valign(GTK_WIDGET(image), GTK_ALIGN_START);
                gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
@@ -493,14 +493,14 @@ static void warning_dialog_ok_cb(GenericDialog *, gpointer)
 }
 
 GenericDialog *warning_dialog(const gchar *heading, const gchar *text,
-                             const gchar *icon_stock_id, GtkWidget *parent)
+                             const gchar *icon_name, GtkWidget *parent)
 {
        GenericDialog *gd;
 
        gd = generic_dialog_new(heading, "warning", parent, TRUE, nullptr, nullptr);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", warning_dialog_ok_cb, TRUE);
 
-       generic_dialog_add_message(gd, icon_stock_id, heading, text, TRUE);
+       generic_dialog_add_message(gd, icon_name, heading, text, TRUE);
 
        gtk_widget_show(gd->dialog);
 

diff --git a/src/ui-utildlg.h b/src/ui-utildlg.h
index 4cbbd90..fe97e5b 100644 (file)
--- a/src/ui-utildlg.h
+++ b/src/ui-utildlg.h
@@ -77,7 +77,7 @@ GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock
 gboolean generic_dialog_get_alternative_button_order(GtkWidget *widget);
 
 GenericDialog *warning_dialog(const gchar *heading, const gchar *text,
-                             const gchar *icon_stock_id, GtkWidget *parent);
+                             const gchar *icon_name, GtkWidget *parent);
 
 FileDialog *file_dialog_new(const gchar *title,
                            const gchar *role,

diff --git a/src/uri-utils.cc b/src/uri-utils.cc
index 8205a3c..5b5888a 100644 (file)
--- a/src/uri-utils.cc
+++ b/src/uri-utils.cc
@@ -40,7 +40,7 @@ void warning_dialog_dnd_uri_error(GList *uri_error_list)
                        g_free(prev);
                        }
                }
-       warning_dialog(_("Drag and Drop failed"), msg, GTK_STOCK_DIALOG_WARNING, nullptr);
+       warning_dialog(_("Drag and Drop failed"), msg, GQ_ICON_DIALOG_WARNING, nullptr);
        g_free(msg);
 }
 

diff --git a/src/utilops.cc b/src/utilops.cc
index 529f002..d2f13d9 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -207,12 +207,12 @@ static void file_util_warning_dialog_ok_cb(GenericDialog *, gpointer)
 }
 
 GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *message,
-                                       const gchar *icon_stock_id, GtkWidget *parent)
+                                       const gchar *icon_name, GtkWidget *parent)
 {
        GenericDialog *gd;
 
        gd = file_util_gen_dlg(heading, "warning", parent, TRUE, nullptr, nullptr);
-       generic_dialog_add_message(gd, icon_stock_id, heading, message, TRUE);
+       generic_dialog_add_message(gd, icon_name, heading, message, TRUE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", file_util_warning_dialog_ok_cb, TRUE);
        if (options->place_dialogs_under_mouse)
                {
@@ -597,7 +597,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
                                              nullptr, TRUE,
                                              file_util_abort_cb, ud);
 
-                       generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, nullptr, msg->str, TRUE);
+                       generic_dialog_add_message(d, GQ_ICON_DIALOG_WARNING, nullptr, msg->str, TRUE);
 
                        generic_dialog_add_button(d, GQ_ICON_GO_NEXT, _("Co_ntinue"),
                                                  file_util_resume_cb, TRUE);
@@ -606,7 +606,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
                        }
                else
                        {
-                       file_util_warning_dialog(ud->messages.fail, msg->str, GTK_STOCK_DIALOG_ERROR, nullptr);
+                       file_util_warning_dialog(ud->messages.fail, msg->str, GQ_ICON_DIALOG_ERROR, nullptr);
                        }
                g_string_free(msg, TRUE);
                }
@@ -717,7 +717,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                gchar *text;
 
                                text = g_strdup_printf("%s:\n\n%s", ud->messages.fail, ud->dir_fd->path);
-                               file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, nullptr);
+                               file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                                g_free(text);
                                }
                        file_data_free_ci(ud->dir_fd);
@@ -770,7 +770,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                GenericDialog *gd;
 
                                text = g_strdup_printf("%s:\n\n%s", ud->messages.fail, ud->dir_fd->path);
-                               gd = file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, nullptr);
+                               gd = file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                                g_free(text);
 
                                if (fail != ud->dir_fd)
@@ -823,7 +823,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                gchar *text;
 
                                text = g_strdup_printf("%s:\n\n%s", ud->messages.fail, ud->dir_fd->path);
-                               (void) file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, nullptr);
+                               file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                                g_free(text);
 
                                file_data_unref(fail);
@@ -842,7 +842,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                gchar *text;
 
                                text = g_strdup_printf("%s:\n\n%s", ud->messages.fail, ud->dir_fd->path);
-                               (void) file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, nullptr);
+                               file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                                g_free(text);
                                }
 
@@ -921,7 +921,7 @@ void file_util_perform_ci(UtilityData *ud)
                if (EDITOR_ERRORS(flags))
                        {
                        gchar *text = g_strdup_printf(_("%s\nUnable to start external command.\n"), editor_get_error_str(flags));
-                       file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, nullptr);
+                       file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                        g_free(text);
 
                        ud->gd = nullptr;
@@ -1045,7 +1045,7 @@ void file_util_check_ci(UtilityData *ud)
                                        ud->parent, TRUE,
                                        file_util_check_abort_cb, ud);
 
-               generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc, TRUE);
+               generic_dialog_add_message(d, GQ_ICON_DIALOG_WARNING, _("Really continue?"), desc, TRUE);
 
                generic_dialog_add_button(d, GQ_ICON_GO_NEXT, _("Co_ntinue"),
                                          file_util_check_resume_cb, TRUE);
@@ -1059,7 +1059,7 @@ void file_util_check_ci(UtilityData *ud)
                d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
                                        ud->parent, TRUE,
                                        file_util_check_abort_cb, ud);
-               generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
+               generic_dialog_add_message(d, GQ_ICON_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
 
                gtk_widget_show(d->dialog);
                }
@@ -1173,7 +1173,7 @@ static void file_util_fdlg_rename_cb(FileDialog *fdlg, gpointer data)
                d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
                                        ud->parent, TRUE,
                                        file_util_check_abort_cb, ud);
-               generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
+               generic_dialog_add_message(d, GQ_ICON_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
 
                gtk_widget_show(d->dialog);
                ud->phase = UTILITY_PHASE_START;
@@ -1533,7 +1533,7 @@ static void file_util_dialog_init_simple_list(UtilityData *ud)
        ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
                                   ud->parent, FALSE,  file_util_cancel_cb, ud);
        if (ud->discard_func) generic_dialog_add_button(ud->gd, GQ_ICON_REVERT, _("Discard changes"), file_util_discard_cb, FALSE);
-       if (ud->details_func) generic_dialog_add_button(ud->gd, GQ_ICON_INFO, _("File details"), file_util_details_cb, FALSE);
+       if (ud->details_func) generic_dialog_add_button(ud->gd, GQ_ICON_DIALOG_INFO, _("File details"), file_util_details_cb, FALSE);
 
        generic_dialog_add_button(ud->gd, icon_name, msg, file_util_ok_cb, TRUE);
 
@@ -1546,7 +1546,7 @@ static void file_util_dialog_init_simple_list(UtilityData *ud)
                dir_msg = g_strdup("");
                }
 
-       box = generic_dialog_add_message(ud->gd, GTK_STOCK_DIALOG_QUESTION,
+       box = generic_dialog_add_message(ud->gd, GQ_ICON_DIALOG_QUESTION,
                                         ud->messages.question,
                                         dir_msg, TRUE);
 
@@ -1658,7 +1658,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        box = generic_dialog_add_message(ud->gd, nullptr, ud->messages.question, nullptr, TRUE);
 
        if (ud->discard_func) generic_dialog_add_button(ud->gd, GQ_ICON_REVERT, _("Discard changes"), file_util_discard_cb, FALSE);
-       if (ud->details_func) generic_dialog_add_button(ud->gd, GQ_ICON_INFO, _("File details"), file_util_details_cb, FALSE);
+       if (ud->details_func) generic_dialog_add_button(ud->gd, GQ_ICON_DIALOG_INFO, _("File details"), file_util_details_cb, FALSE);
 
        generic_dialog_add_button(ud->gd, GQ_ICON_OK, ud->messages.title, file_util_ok_cb, TRUE);
 
@@ -1918,7 +1918,7 @@ void file_util_dialog_run(UtilityData *ud)
 
 static void file_util_warn_op_in_progress(const gchar *title)
 {
-       file_util_warning_dialog(title, _("Another operation in progress.\n"), GTK_STOCK_DIALOG_ERROR, nullptr);
+       file_util_warning_dialog(title, _("Another operation in progress.\n"), GQ_ICON_DIALOG_ERROR, nullptr);
 }
 
 static void file_util_details_dialog_close_cb(GtkWidget *, gpointer data)
@@ -1970,7 +1970,7 @@ static void file_util_details_dialog_discard_cb(GenericDialog *gd, gpointer data
        file_util_details_dialog_exclude(gd, data, TRUE);
 }
 
-static gchar *file_util_details_get_message(UtilityData *ud, FileData *fd, const gchar **stock_id)
+static gchar *file_util_details_get_message(UtilityData *ud, FileData *fd, const gchar **icon_name)
 {
        GString *message = g_string_new("");
        gint error;
@@ -1997,12 +1997,12 @@ static gchar *file_util_details_get_message(UtilityData *ud, FileData *fd, const
                {
                gchar *err_msg = file_data_get_error_string(error);
                g_string_append(message, err_msg);
-               if (stock_id) *stock_id = (error & CHANGE_ERROR_MASK) ? GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING;
+               if (icon_name) *icon_name = (error & CHANGE_ERROR_MASK) ? GQ_ICON_DIALOG_ERROR : GQ_ICON_DIALOG_WARNING;
                }
        else
                {
                g_string_append(message, _("no problem detected"));
-               if (stock_id) *stock_id = GTK_STOCK_DIALOG_INFO;
+               if (icon_name) *icon_name = GQ_ICON_DIALOG_INFO;
                }
 
        return g_string_free(message, FALSE);;
@@ -2013,7 +2013,7 @@ static void file_util_details_dialog(UtilityData *ud, FileData *fd)
        GenericDialog *gd;
        GtkWidget *box;
        gchar *message;
-       const gchar *stock_id;
+       const gchar *icon_name;
 
        gd = file_util_gen_dlg(_("File details"), "details", ud->gd->dialog, TRUE, nullptr, ud);
        generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), file_util_details_dialog_ok_cb, TRUE);
@@ -2029,9 +2029,9 @@ static void file_util_details_dialog(UtilityData *ud, FileData *fd)
                         G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog);
 
 
-       message = file_util_details_get_message(ud, fd, &stock_id);
+       message = file_util_details_get_message(ud, fd, &icon_name);
 
-       box = generic_dialog_add_message(gd, stock_id, _("File details"), message, TRUE);
+       box = generic_dialog_add_message(gd, icon_name, _("File details"), message, TRUE);
 
        generic_dialog_add_image(gd, box, fd, nullptr, FALSE, nullptr, nullptr, FALSE);
 
@@ -2052,7 +2052,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
        gchar *message1;
        gchar *message2;
        gint i;
-       const gchar *stock_id;
+       const gchar *icon_name;
 
        if (fd && fd->modified_xmp)
                {
@@ -2076,7 +2076,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
        g_signal_connect(G_OBJECT(ud->gd->dialog), "destroy",
                         G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog);
 
-       message1 = file_util_details_get_message(ud, fd, &stock_id);
+       message1 = file_util_details_get_message(ud, fd, &icon_name);
 
        if (fd->change && fd->change->dest)
                {
@@ -2087,7 +2087,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
                message2 = g_strdup_printf(_("The following metadata tags will be written to the image file itself."));
                }
 
-       box = generic_dialog_add_message(gd, stock_id, _("Overview of changed metadata"), message1, TRUE);
+       box = generic_dialog_add_message(gd, icon_name, _("Overview of changed metadata"), message1, TRUE);
 
        box = pref_group_new(box, TRUE, message2, GTK_ORIENTATION_HORIZONTAL);
 
@@ -2667,7 +2667,7 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
 
                text = g_strdup_printf(_("Unable to remove folder %s\n"
                                         "Permissions do not allow writing to the folder."), fd->path);
-               file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, parent);
+               file_util_warning_dialog(_("Delete failed"), text, GQ_ICON_DIALOG_ERROR, parent);
                g_free(text);
 
                return;
@@ -2678,7 +2678,7 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
                gchar *text;
 
                text = g_strdup_printf(_("Unable to list contents of folder %s"), fd->path);
-               file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, parent);
+               file_util_warning_dialog(_("Delete failed"), text, GQ_ICON_DIALOG_ERROR, parent);
                g_free(text);
 
                return;
@@ -2698,7 +2698,7 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
                text = g_strdup_printf(_("Unable to delete the folder:\n\n%s\n\n"
                                         "This folder contains subfolders which must be moved before it can be deleted."),
                                        fd->path);
-               box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
+               box = generic_dialog_add_message(gd, GQ_ICON_DIALOG_WARNING,
                                                 _("Folder contains subfolders"),
                                                 text, TRUE);
                g_free(text);
@@ -2735,7 +2735,7 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
                        gchar *text;
 
                        text = g_strdup_printf(_("Unable to list contents of folder %s"), fd->path);
-                       file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, parent);
+                       file_util_warning_dialog(_("Delete failed"), text, GQ_ICON_DIALOG_ERROR, parent);
                        g_free(text);
                        file_data_unref(ud->dir_fd);
                        file_util_data_free(ud);
@@ -3311,7 +3311,7 @@ gchar *new_folder(GtkWindow *window , gchar *path)
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        gtk_container_set_border_width(GTK_CONTAINER(hbox), PREF_PAD_GAP);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-       image = gtk_image_new_from_icon_name(GQ_ICON_QUESTION, GTK_ICON_SIZE_DIALOG);
+       image = gtk_image_new_from_icon_name(GQ_ICON_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
        gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
        label = gtk_label_new(_("Create new folder"));
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);

diff --git a/src/utilops.h b/src/utilops.h
index f082f42..04424dc 100644 (file)
--- a/src/utilops.h
+++ b/src/utilops.h
@@ -38,7 +38,7 @@ FileDialog *file_util_file_dlg(const gchar *title,
                               GtkWidget *parent,
                               void (*cancel_cb)(FileDialog *, gpointer), gpointer data);
 GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *message,
-                                       const gchar *icon_stock_id, GtkWidget *parent);
+                                       const gchar *icon_name, GtkWidget *parent);
 
 /* all functions takes over the filelist and frees it when done */
 

diff --git a/src/view-file/view-file-list.cc b/src/view-file/view-file-list.cc
index 47b0858..0e2c7b5 100644 (file)
--- a/src/view-file/view-file-list.cc
+++ b/src/view-file/view-file-list.cc
@@ -507,7 +507,7 @@ static gboolean vflist_row_rename_cb(TreeEditData *, const gchar *old_name, cons
        if (strchr(new_name, G_DIR_SEPARATOR) != nullptr)
                {
                gchar *text = g_strdup_printf(_("Invalid file name:\n%s"), new_name);
-               file_util_warning_dialog(_("Error renaming file"), text, GTK_STOCK_DIALOG_ERROR, vf->listview);
+               file_util_warning_dialog(_("Error renaming file"), text, GQ_ICON_DIALOG_ERROR, vf->listview);
                g_free(text);
                }
        else

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index cad419a..7b2ac23 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -390,7 +390,7 @@ static void vf_pop_menu_open_archive_cb(GtkWidget *, gpointer data)
                }
        else
                {
-               warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GTK_STOCK_DIALOG_WARNING, nullptr);
+               warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GQ_ICON_DIALOG_WARNING, nullptr);
                }
 }
 
@@ -899,7 +899,7 @@ static gboolean vf_marks_tooltip_cb(GtkWidget *widget,
        mte->gd = generic_dialog_new(_("Mark text"), "mark_text",
                                     widget, FALSE,
                                     vf_marks_tooltip_cancel_cb, mte);
-       generic_dialog_add_message(mte->gd, GTK_STOCK_DIALOG_QUESTION, _("Set mark text"),
+       generic_dialog_add_message(mte->gd, GQ_ICON_DIALOG_QUESTION, _("Set mark text"),
                                   _("This will set or clear the mark text."), FALSE);
        generic_dialog_add_button(mte->gd, GQ_ICON_OK, "OK",
                                  vf_marks_tooltip_ok_cb, TRUE);