More unused functions, remove dead code

The dead code was identified by:
https://gist.github.com/sbeyer/192324f8a8470ce36b27
find-code-in-comments.rb

diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
index e3d3067..62702e6 100644 (file)
--- a/src/advanced-exif.cc
+++ b/src/advanced-exif.cc
@@ -186,7 +186,6 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *UNUSED(co
                                  GtkSelectionData *selection_data, guint UNUSED(info),
                                  guint UNUSED(time), gpointer UNUSED(data))
 {
-       //ExifWin *ew = static_cast<//ExifWin *>(data);
        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
        GtkTreeIter iter;
 
@@ -197,7 +196,6 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *UNUSED(co
 
                gtk_tree_model_get(store, &iter, EXIF_ADVCOL_NAME, &key, -1);
                gtk_selection_data_set_text(selection_data, key, -1);
-               //printf("%s\n",key);
                g_free(key);
                }
 
@@ -206,7 +204,6 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *UNUSED(co
 
 static void advanced_exif_dnd_begin(GtkWidget *listview, GdkDragContext *context, gpointer UNUSED(data))
 {
-       //ExifWin *ew = static_cast<//ExifWin *>(data);
        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
        GtkTreeIter iter;
 
@@ -390,7 +387,7 @@ static gboolean advanced_exif_keypress(GtkWidget *UNUSED(widget), GdkEventKey *e
                }
 
        return stop_signal;
-} // static gboolean advanced_exif_...
+}
 
 static gboolean search_function_cb(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer UNUSED(data))
 {

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index 0b247f4..0f377ee 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -293,7 +293,6 @@ static void bar_pane_gps_thumb_error_cb(ThumbLoader *tl, gpointer UNUSED(data))
 
 static gboolean bar_pane_gps_marker_keypress_cb(GtkWidget *widget, ClutterButtonEvent *bevent, gpointer UNUSED(data))
 {
-       //PaneGPSData *pgd = static_cast<//PaneGPSData *>(data);
        FileData *fd;
        ClutterActor *label_marker, *parent_marker;
        ClutterColor marker_colour = { MARKER_COLOUR };

diff --git a/src/bar-histogram.cc b/src/bar-histogram.cc
index 439d7e2..846499c 100644 (file)
--- a/src/bar-histogram.cc
+++ b/src/bar-histogram.cc
@@ -358,7 +358,6 @@ void bar_pane_histogram_update_from_config(GtkWidget *pane, const gchar **attrib
                const gchar *value = *attribute_values++;
 
                if (READ_CHAR_FULL("id", phd->pane.id)) continue;
-//             if (READ_CHAR_FULL("pane.title", title)) continue;
                if (READ_BOOL_FULL("expanded", phd->pane.expanded)) continue;
                if (READ_INT_FULL("histogram_channel", histogram_channel)) continue;
                if (READ_INT_FULL("histogram_mode", histogram_mode)) continue;

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index d74b74e..2c94f93 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -34,8 +34,6 @@
 #include "dnd.h"
 #include "secure-save.h"
 
-
-//static void bar_pane_keywords_keyword_update_all(void);
 static void bar_pane_keywords_changed(GtkTextBuffer *buffer, gpointer data);
 
 static void autocomplete_keywords_list_load(const gchar *path);

diff --git a/src/bar.cc b/src/bar.cc
index 2e59464..b1d0609 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -330,7 +330,6 @@ static void bar_expander_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void bar_expander_add_cb(GtkWidget *widget, gpointer UNUSED(data))
 {
-       //GtkWidget *bar = static_cast<//GtkWidget *>(data);
        const KnownPanes *pane = known_panes;
        auto id = static_cast<const gchar *>(g_object_get_data(G_OBJECT(widget), "pane_add_id"));
        const gchar *config;

diff --git a/src/dnd.cc b/src/dnd.cc
index d579b24..3839e53 100644 (file)
--- a/src/dnd.cc
+++ b/src/dnd.cc
@@ -78,8 +78,9 @@ static void pixbuf_draw_border(GdkPixbuf *pixbuf, gint w, gint h)
                }
 }
 
-/*
-static void pixbuf_draw_rect(GdkPixbuf *pixbuf, gint x, gint y, gint w, gint h, guint8 val)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+static void pixbuf_draw_rect_unused(GdkPixbuf *pixbuf, gint x, gint y, gint w, gint h, guint8 val)
 {
        gboolean alpha;
        gint rs;
@@ -103,7 +104,8 @@ static void pixbuf_draw_rect(GdkPixbuf *pixbuf, gint x, gint y, gint w, gint h,
                        }
                }
 }
-*/
+#pragma GCC diagnostic pop
+
 void dnd_set_drag_icon(GtkWidget *widget, GdkDragContext *context, GdkPixbuf *pixbuf, gint items)
 {
        GdkPixbuf *dest;

diff --git a/src/dupe.cc b/src/dupe.cc
index 8558f34..fbb1dcf 100644 (file)
--- a/src/dupe.cc
+++ b/src/dupe.cc
@@ -478,8 +478,9 @@ static void dupe_list_free(GList *list)
        g_list_free(list);
 }
 
-/*
-static DupeItem *dupe_item_find_fd_by_list(FileData *fd, GList *work)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+static DupeItem *dupe_item_find_fd_by_list_unused(FileData *fd, GList *work)
 {
        while (work)
                {
@@ -492,22 +493,18 @@ static DupeItem *dupe_item_find_fd_by_list(FileData *fd, GList *work)
 
        return NULL;
 }
-*/
 
-/*
-static DupeItem *dupe_item_find_fd(DupeWindow *dw, FileData *fd)
+static DupeItem *dupe_item_find_fd_unused(DupeWindow *dw, FileData *fd)
 {
        DupeItem *di;
 
-       di = dupe_item_find_fd_by_list(fd, dw->list);
-       if (!di && dw->second_set) di = dupe_item_find_fd_by_list(fd, dw->second_list);
+       di = dupe_item_find_fd_by_list_unused(fd, dw->list);
+       if (!di && dw->second_set) di = dupe_item_find_fd_by_list_unused(fd, dw->second_list);
 
        return di;
 }
-*/
 
-/*
-static DupeItem *dupe_item_find_path_by_list(const gchar *path, GList *work)
+static DupeItem *dupe_item_find_path_by_list_unused(const gchar *path, GList *work)
 {
        while (work)
                {
@@ -520,19 +517,17 @@ static DupeItem *dupe_item_find_path_by_list(const gchar *path, GList *work)
 
        return NULL;
 }
-*/
 
-/*
-static DupeItem *dupe_item_find_path(DupeWindow *dw, const gchar *path)
+static DupeItem *dupe_item_find_path_unused(DupeWindow *dw, const gchar *path)
 {
        DupeItem *di;
 
-       di = dupe_item_find_path_by_list(path, dw->list);
-       if (!di && dw->second_set) di = dupe_item_find_path_by_list(path, dw->second_list);
+       di = dupe_item_find_path_by_list_unused(path, dw->list);
+       if (!di && dw->second_set) di = dupe_item_find_path_by_list_unused(path, dw->second_list);
 
        return di;
 }
-*/
+#pragma GCC diagnostic pop
 
 /*
  * ------------------------------------------------------------------
@@ -2733,19 +2728,20 @@ static void dupe_item_remove(DupeWindow *dw, DupeItem *di)
        dupe_window_update_count(dw, FALSE);
 }
 
-/*
-static gboolean dupe_item_remove_by_path(DupeWindow *dw, const gchar *path)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+static gboolean dupe_item_remove_by_path_unused(DupeWindow *dw, const gchar *path)
 {
        DupeItem *di;
 
-       di = dupe_item_find_path(dw, path);
+       di = dupe_item_find_path_unused(dw, path);
        if (!di) return FALSE;
 
        dupe_item_remove(dw, di);
 
        return TRUE;
 }
-*/
+#pragma GCC diagnostic pop
 
 static gboolean dupe_files_add_queue_cb(gpointer data)
 {

diff --git a/src/image-load-dds.cc b/src/image-load-dds.cc
index 17ebc5a..76a0e5f 100644 (file)
--- a/src/image-load-dds.cc
+++ b/src/image-load-dds.cc
@@ -53,9 +53,12 @@ uint ddsGetWidth(unsigned const char * buffer) {
        return (buffer[16] & 0xFF) | (buffer[17] & 0xFF) << 8 | (buffer[18] & 0xFF) << 16 | (buffer[19] & 0xFF) << 24;
 }
 
-//uint ddsGetMipmap(unsigned const char * buffer) {
-       //return (buffer[28] & 0xFF) | (buffer[29] & 0xFF) << 8 | (buffer[30] & 0xFF) << 16 | (buffer[31] & 0xFF) << 24;
-//}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+uint ddsGetMipmap_unused(unsigned const char * buffer) {
+       return (buffer[28] & 0xFF) | (buffer[29] & 0xFF) << 8 | (buffer[30] & 0xFF) << 16 | (buffer[31] & 0xFF) << 24;
+}
+#pragma GCC diagnostic pop
 
 uint ddsGetPixelFormatFlags(unsigned const char * buffer) {
        return (buffer[80] & 0xFF) | (buffer[81] & 0xFF) << 8 | (buffer[82] & 0xFF) << 16 | (buffer[83] & 0xFF) << 24;

diff --git a/src/image-load-ffmpegthumbnailer.cc b/src/image-load-ffmpegthumbnailer.cc
index ebf083f..eeb59ce 100644 (file)
--- a/src/image-load-ffmpegthumbnailer.cc
+++ b/src/image-load-ffmpegthumbnailer.cc
@@ -96,7 +96,6 @@ static void image_loader_ft_set_size(gpointer loader, int width, int height)
        DEBUG_1("TG: setting size, w=%d, h=%d", width, height);
 }
 
-// static gboolean image_loader_ft_loadfromdisk(gpointer loader, const gchar *path, GError **error)
 static gboolean image_loader_ft_load (gpointer loader, const guchar *UNUSED(buf), gsize UNUSED(count), GError **UNUSED(error))
 {
        auto lft = static_cast<ImageLoaderFT *>(loader);
@@ -105,7 +104,6 @@ static gboolean image_loader_ft_load (gpointer loader, const guchar *UNUSED(buf)
        image_data *image = video_thumbnailer_create_image_data();
 
 #ifdef HAVE_FFMPEGTHUMBNAILER_WH
-//     DEBUG_1("TG: FT requested size w=%d:h=%d for %s", lft->requested_width > 0, lft->requested_height, il->fd->path);
        video_thumbnailer_set_size(lft->vt, lft->requested_width, lft->requested_height);
 #else
        lft->vt->thumbnail_size = MAX(lft->requested_width,lft->requested_height);

diff --git a/src/layout-image.cc b/src/layout-image.cc
index 4519d63..bb217cf 100644 (file)
--- a/src/layout-image.cc
+++ b/src/layout-image.cc
@@ -1353,27 +1353,29 @@ void layout_image_set_ignore_alpha(LayoutWindow *lw, gboolean ignore_alpha)
 }
 
 /* stereo */
-/*
-gint layout_image_stereo_get(LayoutWindow *lw)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+gint layout_image_stereo_get_unused(LayoutWindow *lw)
 {
        if (!layout_valid(&lw)) return 0;
 
-       return image_stereo_get(lw->image);
+//     return image_stereo_get(lw->image);
+       return 0;
 }
 
-void layout_image_stereo_set(LayoutWindow *lw, gint stereo_mode)
+void layout_image_stereo_set_unused(LayoutWindow *lw, gint stereo_mode)
 {
        if (!layout_valid(&lw)) return;
 
        image_stereo_set(lw->image, stereo_mode);
 }
-void layout_image_stereo_swap(LayoutWindow *lw)
+void layout_image_stereo_swap_unused(LayoutWindow *lw)
 {
        if (!layout_valid(&lw)) return;
 
-       image_stereo_swap(lw->image);
+//     image_stereo_swap(lw->image);
 }
-*/
+#pragma GCC diagnostic pop
 
 gint layout_image_stereo_pixbuf_get(LayoutWindow *lw)
 {
@@ -1458,8 +1460,7 @@ void layout_image_set_with_ahead(LayoutWindow *lw, FileData *fd, FileData *read_
 {
        if (!layout_valid(&lw)) return;
 
-/*
-This should be handled at the caller: in vflist_select_image
+/** @FIXME This should be handled at the caller: in vflist_select_image
        if (path)
                {
                const gchar *old_path;

diff --git a/src/layout.cc b/src/layout.cc
index 501c5c4..f60b621 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -1974,13 +1974,6 @@ void layout_style_set(LayoutWindow *lw, gint style, const gchar *order)
        lw->info_pixel = nullptr;
        lw->info_zoom = nullptr;
 
-/*
-       if (lw->ui_manager) g_object_unref(lw->ui_manager);
-       lw->ui_manager = NULL;
-       lw->action_group = NULL;
-       lw->action_group_editors = NULL;
-*/
-
        gtk_container_remove(GTK_CONTAINER(lw->main_box), lw->group_box);
        lw->group_box = nullptr;
 
@@ -1992,9 +1985,6 @@ void layout_style_set(LayoutWindow *lw, gint style, const gchar *order)
        layout_util_sync(lw);
        layout_status_update_all(lw);
 
-
-       // printf("%d %d %d \n", G_OBJECT(lw->utility_box)->ref_count, G_OBJECT(lw->menu_bar)->ref_count, G_OBJECT(lw->toolbar)->ref_count);
-
        /* sync */
 
        if (image_get_fd(lw->image))
@@ -2241,14 +2231,14 @@ static void startup_path_set_home_cb(GtkWidget *widget, gpointer data)
        lc->options.startup_path = STARTUP_PATH_HOME;
 }
 
-
-/*
-static void layout_config_save_cb(GtkWidget *widget, gpointer data)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+static void layout_config_save_cb_unused(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
 {
-       layout_config_apply();
+       //layout_config_apply();
        save_options(options);
 }
-*/
+#pragma GCC diagnostic pop
 
 void layout_show_config_window(LayoutWindow *lw)
 {
@@ -2630,11 +2620,8 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
        if (options->save_window_positions || isfile(default_path))
                {
                gtk_window_set_default_size(GTK_WINDOW(lw->window), lw->options.main_window.w, lw->options.main_window.h);
-//             if (!layout_window_list)
-//                     {
                gtk_window_move(GTK_WINDOW(lw->window), lw->options.main_window.x, lw->options.main_window.y);
                if (lw->options.main_window.maximized) gtk_window_maximize(GTK_WINDOW(lw->window));
-//                     }
 
                g_idle_add(move_window_to_workspace_cb, lw);
                }

diff --git a/src/options.cc b/src/options.cc
index a0efc34..e2027c3 100644 (file)
--- a/src/options.cc
+++ b/src/options.cc
@@ -183,7 +183,6 @@ ConfOptions *init_options(ConfOptions *options)
        options->thumbnails.use_exif = FALSE;
        options->thumbnails.use_color_management = FALSE;
        options->thumbnails.use_ft_metadata = TRUE;
-//     options->thumbnails.use_ft_metadata_small = TRUE;
        options->thumbnails.collection_preview = 20;
 
        options->tree_descend_subdirs = FALSE;

diff --git a/src/options.h b/src/options.h
index 1bb1934..5dec24d 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -156,7 +156,6 @@ struct ConfOptions
                guint zoom_quality;
                gint zoom_increment;    /**< 100 is 1.0, 5 is 0.05, 200 is 2.0, etc. */
                ZoomStyle zoom_style;
-               gboolean use_clutter_renderer;
 
                gboolean use_custom_border_color_in_fullscreen;
                gboolean use_custom_border_color;
@@ -180,7 +179,6 @@ struct ConfOptions
                gboolean use_color_management;
                gboolean use_ft_metadata;
                gint collection_preview;
-//             gboolean use_ft_metadata_small;
        } thumbnails;
 
        /* file filtering */

diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc
index d0bb6ec..f6c7b94 100644 (file)
--- a/src/pan-view/pan-view.cc
+++ b/src/pan-view/pan-view.cc
@@ -1922,14 +1922,6 @@ static void pan_window_new_real(FileData *dir_fd)
        gtk_table_set_row_spacings(GTK_TABLE(table), 2);
        gtk_table_set_col_spacings(GTK_TABLE(table), 2);
 
-       /** @FIXME pan view does not work correctly when renderer-clutter()
-        * is used.
-        */
-       gint temp = options->image.use_clutter_renderer;
-       options->image.use_clutter_renderer = FALSE;
-       pw->imd = image_new(TRUE);
-       options->image.use_clutter_renderer = temp;
-
        pw->imd_normal = pw->imd;
 
        g_signal_connect(G_OBJECT(pw->imd->pr), "zoom",

diff --git a/src/pixbuf-renderer.cc b/src/pixbuf-renderer.cc
index 6a670e3..183c6e3 100644 (file)
--- a/src/pixbuf-renderer.cc
+++ b/src/pixbuf-renderer.cc
@@ -405,14 +405,6 @@ static void pixbuf_renderer_class_init(PixbufRendererClass *renderer_class)
 
 static RendererFuncs *pr_backend_renderer_new(PixbufRenderer *pr)
 {
-       //~ if (options->image.use_clutter_renderer && !options->disable_gpu)
-               //~ {
-//~ #ifdef HAVE_CLUTTER
-               //~ return renderer_clutter_new(pr);
-//~ #else
-               //~ log_printf("Warning: Geeqie is built without clutter renderer support");
-//~ #endif
-               //~ }
        return renderer_tiles_new(pr);
 }
 

diff --git a/src/preferences.cc b/src/preferences.cc
index 0ea8083..820608e 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -24,10 +24,6 @@
 
 #include "bar-keywords.h"
 #include "cache.h"
-//~ #include "authors.h"
-//~ #include "authors.c"
-//~ #include "translators.h"
-//~ #include "translators.c"
 #include "editors.h"
 #include "filedata.h"
 #include "filefilter.h"
@@ -297,7 +293,6 @@ static void config_window_apply()
        options->image.limit_autofit_size = c_options->image.limit_autofit_size;
        options->image.max_autofit_size = c_options->image.max_autofit_size;
        options->image.max_enlargement_size = c_options->image.max_enlargement_size;
-       //~ options->image.use_clutter_renderer = c_options->image.use_clutter_renderer;
        options->image.tile_size = c_options->image.tile_size;
        options->progressive_key_scrolling = c_options->progressive_key_scrolling;
        options->keyboard_scroll_step = c_options->keyboard_scroll_step;
@@ -318,7 +313,6 @@ static void config_window_apply()
        options->thumbnails.use_color_management = c_options->thumbnails.use_color_management;
        options->thumbnails.collection_preview = c_options->thumbnails.collection_preview;
        options->thumbnails.use_ft_metadata = c_options->thumbnails.use_ft_metadata;
-//     options->thumbnails.use_ft_metadata_small = c_options->thumbnails.use_ft_metadata_small;
        options->thumbnails.spec_standard = c_options->thumbnails.spec_standard;
        options->metadata.enable_metadata_dirs = c_options->metadata.enable_metadata_dirs;
        options->file_filter.show_hidden_files = c_options->file_filter.show_hidden_files;
@@ -2029,9 +2023,6 @@ static void config_tab_general(GtkWidget *notebook)
 #ifdef HAVE_FFMPEGTHUMBNAILER_METADATA
        pref_checkbox_new_int(group, _("Use embedded metadata in video files as thumbnails when available"),
                              options->thumbnails.use_ft_metadata, &c_options->thumbnails.use_ft_metadata);
-
-//     pref_checkbox_new_int(group, _("Ignore embedded metadata if size is too small"),
-//                           options->thumbnails.use_ft_metadata_small, &c_options->thumbnails.use_ft_metadata_small);
 #endif
 
        pref_spacer(group, PREF_PAD_GROUP);
@@ -2252,9 +2243,6 @@ static void config_tab_image(GtkWidget *notebook)
        GtkWidget *enlargement_button;
        GtkWidget *table;
        GtkWidget *spin;
-//~ #ifdef HAVE_CLUTTER
-       //~ GtkWidget *gpu_accel;
-//~ #endif
 
        vbox = scrolled_notebook_page(notebook, _("Image"));
 
@@ -2262,26 +2250,9 @@ static void config_tab_image(GtkWidget *notebook)
 
        table = pref_table_new(group, 2, 1, FALSE, FALSE);
        add_quality_menu(table, 0, 0, _("Quality:"), options->image.zoom_quality, &c_options->image.zoom_quality);
-       //~ if (options->image.use_clutter_renderer && !options->disable_gpu)
-               //~ {
-               //~ gtk_widget_set_sensitive(table, FALSE);
-               //~ }
-
-//~ #ifdef HAVE_CLUTTER
-       //~ gpu_accel = pref_checkbox_new_int(group, _("Use GPU acceleration via Clutter library (Requires restart)"),
-                             //~ options->image.use_clutter_renderer, &c_options->image.use_clutter_renderer);
-       //~ if (options->disable_gpu && !options->override_disable_gpu)
-               //~ {
-               //~ gtk_widget_set_sensitive(gpu_accel, FALSE);
-               //~ }
-//~ #endif
 
        pref_checkbox_new_int(group, _("Two pass rendering (apply HQ zoom and color correction in second pass)"),
                              options->image.zoom_2pass, &c_options->image.zoom_2pass);
-       //~ if (options->image.use_clutter_renderer && !options->disable_gpu)
-               //~ {
-               //~ gtk_widget_set_sensitive(two_pass, FALSE);
-               //~ }
 
        c_options->image.zoom_increment = options->image.zoom_increment;
        spin = pref_spin_new(group, _("Zoom increment:"), nullptr,
@@ -2314,7 +2285,6 @@ static void config_tab_image(GtkWidget *notebook)
        gtk_widget_set_tooltip_text(GTK_WIDGET(hbox), _("This value will set the virtual size of the window when \"Fit image to window\" is set. Instead of using the actual size of the window, the specified percentage of the window will be used. It allows one to keep a border around the image (values lower than 100%) or to auto zoom the image (values greater than 100%). It affects fullscreen mode too."));
 
        group = pref_group_new(vbox, FALSE, _("Tile size"), GTK_ORIENTATION_VERTICAL);
-       //~ gtk_widget_set_sensitive(group, !options->image.use_clutter_renderer);
 
        hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
        spin = pref_spin_new_int(hbox, _("Pixels"), _("(Requires restart)"),

diff --git a/src/rcfile.cc b/src/rcfile.cc
index 14fce38..ef94a09 100644 (file)
--- a/src/rcfile.cc
+++ b/src/rcfile.cc
@@ -402,7 +402,6 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_COLOR(*options, image.border_color);
        WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_1);
        WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_2);
-       //~ WRITE_NL(); WRITE_BOOL(*options, image.use_clutter_renderer);
        WRITE_NL(); WRITE_INT(*options, image.tile_size);
 
        /* Thumbnails Options */
@@ -417,7 +416,6 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_color_management);
        WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_ft_metadata);
        WRITE_NL(); WRITE_INT(*options, thumbnails.collection_preview);
-//     WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_ft_metadata_small);
 
        /* File sorting Options */
        WRITE_NL(); WRITE_INT(*options, file_sort.method);
@@ -892,7 +890,6 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_COLOR(*options, image.border_color)) continue;
                if (READ_COLOR(*options, image.alpha_color_1)) continue;
                if (READ_COLOR(*options, image.alpha_color_2)) continue;
-               //~ if (READ_BOOL(*options, image.use_clutter_renderer)) continue;
                if (READ_INT(*options, image.tile_size)) continue;
 
                /* Thumbnails options */
@@ -908,7 +905,6 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_BOOL(*options, thumbnails.use_color_management)) continue;
                if (READ_INT(*options, thumbnails.collection_preview)) continue;
                if (READ_BOOL(*options, thumbnails.use_ft_metadata)) continue;
-//             if (READ_BOOL(*options, thumbnails.use_ft_metadata_small)) continue;
 
                /* File sorting options */
                if (READ_UINT_ENUM(*options, file_sort.method)) continue;