Fix #816: Fix building with --enable-debug-flags

https://github.com/BestImageViewer/geeqie/pull/816

diff --git a/src/cache_maint.c b/src/cache_maint.c
index f710336..bd5861d 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -1431,11 +1431,6 @@ static void cache_manager_sim_load_dialog(GtkWidget *widget, const gchar *path)
        gtk_widget_show(cd->gd->dialog);
 }
 
-static void cache_manager_sim_clear_ok_cb(GenericDialog *gd, gpointer data)
-{
-       cache_maintain_home(FALSE, TRUE, NULL);
-}
-
 static void cache_manager_sim_load_cb(GtkWidget *widget, gpointer data)
 {
        const gchar *path = layout_get_path(NULL);

diff --git a/src/cellrenderericon.c b/src/cellrenderericon.c
index 7820209..ed1e33a 100644 (file)
--- a/src/cellrenderericon.c
+++ b/src/cellrenderericon.c
@@ -34,7 +34,9 @@ static void gqv_cell_renderer_icon_set_property(GObject               *object,
                                                guint           param_id,
                                                const GValue    *value,
                                                GParamSpec      *pspec);
+static void gqv_cell_renderer_icon_init_wrapper(void *, void *);
 static void gqv_cell_renderer_icon_init(GQvCellRendererIcon *celltext);
+static void gqv_cell_renderer_icon_class_init_wrapper(void *, void *);
 static void gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class);
 static void gqv_cell_renderer_icon_finalize(GObject *object);
 #if GTK_CHECK_VERSION(3,0,0)
@@ -130,12 +132,12 @@ gqv_cell_renderer_icon_get_type(void)
                        sizeof(GQvCellRendererIconClass), /* class_size */
                        NULL,           /* base_init */
                        NULL,           /* base_finalize */
-                       (GClassInitFunc) gqv_cell_renderer_icon_class_init, /* class_init */
+                       (GClassInitFunc) gqv_cell_renderer_icon_class_init_wrapper, /* class_init */
                        NULL,           /* class_finalize */
                        NULL,           /* class_data */
                        sizeof(GQvCellRendererIcon), /* instance_size */
                        0,              /* n_preallocs */
-                       (GInstanceInitFunc) gqv_cell_renderer_icon_init, /* instance_init */
+                       (GInstanceInitFunc) gqv_cell_renderer_icon_init_wrapper, /* instance_init */
                        NULL,           /* value_table */
                        };
 
@@ -147,6 +149,12 @@ gqv_cell_renderer_icon_get_type(void)
        return cell_icon_type;
 }
 
+static void
+gqv_cell_renderer_icon_init_wrapper(void *data, void *user_data)
+{
+       gqv_cell_renderer_icon_init(data);
+}
+
 static void
 gqv_cell_renderer_icon_init(GQvCellRendererIcon *cellicon)
 {
@@ -154,6 +162,12 @@ gqv_cell_renderer_icon_init(GQvCellRendererIcon *cellicon)
        gtk_cell_renderer_set_padding(GTK_CELL_RENDERER(cellicon), 2, 2);
 }
 
+static void
+gqv_cell_renderer_icon_class_init_wrapper(void *data, void *user_data)
+{
+       gqv_cell_renderer_icon_class_init(data);
+}
+
 static void
 gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class)
 {

diff --git a/src/dupe.c b/src/dupe.c
index 23f6000..14f8dce 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -701,7 +701,7 @@ static GList *dupe_listview_get_selection(DupeWindow *dw, GtkWidget *listview)
                        }
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        return g_list_reverse(list);
@@ -729,7 +729,7 @@ static gboolean dupe_listview_item_is_selected(DupeWindow *dw, DupeItem *di, Gtk
                if (di_n == di) found = TRUE;
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        return found;
@@ -2355,7 +2355,7 @@ static void dupe_window_remove_selection(DupeWindow *dw, GtkWidget *listview)
                if (di) list = g_list_prepend(list, di);
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        dw->color_frozen = TRUE;
@@ -3338,7 +3338,7 @@ static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, g
                gtk_tree_model_get_iter(store, &iter, tpath);
                gtk_tree_model_get(store, &iter, DUPE_COLUMN_POINTER, &di, -1);
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        if (event->state & GDK_CONTROL_MASK)

diff --git a/src/image-load.c b/src/image-load.c
index b6d0286..e867c21 100644 (file)
--- a/src/image-load.c
+++ b/src/image-load.c
@@ -64,6 +64,7 @@ enum {
 static guint signals[SIGNAL_COUNT] = { 0 };
 
 static void image_loader_init(GTypeInstance *instance, gpointer g_class);
+static void image_loader_class_init_wrapper(void *data, void *user_data);
 static void image_loader_class_init(ImageLoaderClass *class);
 static void image_loader_finalize(GObject *object);
 static void image_loader_stop(ImageLoader *il);
@@ -77,7 +78,7 @@ GType image_loader_get_type(void)
                        sizeof(ImageLoaderClass),
                        NULL,   /* base_init */
                        NULL,   /* base_finalize */
-                       (GClassInitFunc)image_loader_class_init, /* class_init */
+                       (GClassInitFunc)image_loader_class_init_wrapper, /* class_init */
                        NULL,   /* class_finalize */
                        NULL,   /* class_data */
                        sizeof(ImageLoader),
@@ -131,6 +132,11 @@ static void image_loader_init(GTypeInstance *instance, gpointer g_class)
        DEBUG_1("new image loader %p, bufsize=%" G_GSIZE_FORMAT " idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count);
 }
 
+static void image_loader_class_init_wrapper(void *data, void *user_data)
+{
+       image_loader_class_init(data);
+}
+
 static void image_loader_class_init(ImageLoaderClass *class)
 {
        GObjectClass *gobject_class = G_OBJECT_CLASS (class);
@@ -617,7 +623,9 @@ static void image_loader_stop_loader(ImageLoader *il)
 
 static void image_loader_setup_loader(ImageLoader *il)
 {
+#if defined HAVE_TIFF || defined HAVE_PDF || defined HAVE_HEIF || defined HAVE_DJVU
        gchar *format;
+#endif
 
        g_mutex_lock(il->data_mutex);
 #ifdef HAVE_FFMPEGTHUMBNAILER
@@ -829,8 +837,10 @@ static gboolean image_loader_continue(ImageLoader *il)
 
 static gboolean image_loader_begin(ImageLoader *il)
 {
-       gssize b;
+#if defined HAVE_TIFF || defined HAVE_PDF || defined HAVE_HEIF || defined HAVE_DJVU
        gchar *format;
+#endif
+       gssize b;
 
        if (il->pixbuf) return FALSE;
 

diff --git a/src/image.c b/src/image.c
index 9ca1d2a..03db397 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -877,6 +877,7 @@ static void image_load_done_cb(ImageLoader *il, gpointer data)
                                break;
                        case FORMAT_CLASS_VIDEO:
                                pixbuf = pixbuf_inline(PIXBUF_INLINE_VIDEO);
+                               break;
                        case FORMAT_CLASS_COLLECTION:
                                pixbuf = pixbuf_inline(PIXBUF_INLINE_COLLECTION);
                                break;

diff --git a/src/image_load_djvu.c b/src/image_load_djvu.c
index f69d0f8..192b2af 100644 (file)
--- a/src/image_load_djvu.c
+++ b/src/image_load_djvu.c
@@ -148,7 +148,6 @@ static gchar** image_loader_djvu_get_format_mime_types(gpointer loader)
 
 static void image_loader_djvu_set_page_num(gpointer loader, gint page_num)
 {
-       ImageLoader *il = (ImageLoader *) loader;
        ImageLoaderDJVU *ld = (ImageLoaderDJVU *) loader;
 
        ld->page_num = page_num;

diff --git a/src/image_load_ffmpegthumbnailer.c b/src/image_load_ffmpegthumbnailer.c
index fb3c2bb..8e9f361 100644 (file)
--- a/src/image_load_ffmpegthumbnailer.c
+++ b/src/image_load_ffmpegthumbnailer.c
@@ -42,6 +42,7 @@ struct _ImageLoaderFT {
 
 };
 
+#if HAVE_FFMPEGTHUMBNAILER_RGB
 static void image_loader_ft_log_cb(ThumbnailerLogLevel log_level, const char* msg)
 {
        if (log_level == ThumbnailerLogLevelError)
@@ -49,6 +50,7 @@ static void image_loader_ft_log_cb(ThumbnailerLogLevel log_level, const char* ms
        else
                DEBUG_1("ImageLoaderFFmpegthumbnailer: %s",msg);
 }
+#endif
 
 void image_loader_ft_destroy_image_data(guchar *pixels, gpointer data)
 {

diff --git a/src/image_load_heif.c b/src/image_load_heif.c
index 5791a57..6a30531 100644 (file)
--- a/src/image_load_heif.c
+++ b/src/image_load_heif.c
@@ -147,7 +147,6 @@ static gchar** image_loader_heif_get_format_mime_types(gpointer loader)
 
 static void image_loader_heif_set_page_num(gpointer loader, gint page_num)
 {
-       ImageLoader *il = (ImageLoader *) loader;
        ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
 
        ld->page_num = page_num;

diff --git a/src/image_load_j2k.c b/src/image_load_j2k.c
index e1930bc..a531291 100644 (file)
--- a/src/image_load_j2k.c
+++ b/src/image_load_j2k.c
@@ -170,7 +170,6 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_buffer_stream (opj_buffer_info_t* p
 static gboolean image_loader_j2k_load(gpointer loader, const guchar *buf, gsize count, GError **error)
 {
        ImageLoaderJ2K *ld = (ImageLoaderJ2K *) loader;
-       ImageLoader *il = ld->data;
        opj_stream_t *stream;
        opj_codec_t *codec;
        opj_dparameters_t parameters;

diff --git a/src/image_load_pdf.c b/src/image_load_pdf.c
index edd60b6..bdee61f 100644 (file)
--- a/src/image_load_pdf.c
+++ b/src/image_load_pdf.c
@@ -129,7 +129,6 @@ static gchar** image_loader_pdf_get_format_mime_types(gpointer loader)
 
 static void image_loader_pdf_set_page_num(gpointer loader, gint page_num)
 {
-       ImageLoader *il = (ImageLoader *) loader;
        ImageLoaderPDF *ld = (ImageLoaderPDF *) loader;
 
        ld->page_num = page_num;

diff --git a/src/img-view.c b/src/img-view.c
index fdd7017..4e90ee6 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -1104,6 +1104,7 @@ static void view_alter_cb(GtkWidget *widget, gpointer data)
        image_alter_orientation(vw->imd, vw->imd->image_fd, type);
 }
 
+#if !GTK_CHECK_VERSION(3,0,0)
 static void view_wallpaper_cb(GtkWidget *widget, gpointer data)
 {
        ViewWindow *vw = data;
@@ -1112,6 +1113,7 @@ static void view_wallpaper_cb(GtkWidget *widget, gpointer data)
        imd = view_window_active_image(vw);
        image_to_root_window(imd, (image_zoom_get(imd) == 0.0));
 }
+#endif
 
 static void view_zoom_in_cb(GtkWidget *widget, gpointer data)
 {

diff --git a/src/keymap_template.c b/src/keymap_template.c
index f7b4506..d8eec33 100644 (file)
--- a/src/keymap_template.c
+++ b/src/keymap_template.c
@@ -21,7 +21,7 @@
 
 #include <stddef.h>
 
-static char *keymap_template [] = {
+char *keymap_template [] = {
 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>",
 "<!-- Created with Inkscape (http://www.inkscape.org/) -->",
 "",

diff --git a/src/keymap_template.h b/src/keymap_template.h
new file mode 100644 (file)
index 0000000..e455955
--- /dev/null
+++ b/src/keymap_template.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2020 Andreas Rönnquist <andreas@ronnquist.net>
+ * Copyright (C) 2020 The Geeqie Team
+ *
+ * Author: John Ellis
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef KEYMAP_TEMPLATE_H
+#define KEYMAP_TEMPLATE_H
+
+extern char *keymap_template [];
+
+#endif

diff --git a/src/layout_image.c b/src/layout_image.c
index 8d49985..66870fd 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -516,12 +516,14 @@ static void li_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
        file_util_start_editor_from_file(key, layout_image_get_fd(lw), lw->window);
 }
 
+#if !GTK_CHECK_VERSION(3,0,0)
 static void li_pop_menu_wallpaper_cb(GtkWidget *widget, gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_to_root(lw);
 }
+#endif
 
 static void li_pop_menu_alter_cb(GtkWidget *widget, gpointer data)
 {

diff --git a/src/layout_util.c b/src/layout_util.c
index c905f4b..d32df51 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -63,7 +63,7 @@
 
 #include <sys/wait.h>
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
-#include "keymap_template.c"
+#include "keymap_template.h"
 
 #define MENU_EDIT_ACTION_OFFSET 16
 #define FILE_COLUMN_POINTER 0
@@ -2067,7 +2067,6 @@ static GList *layout_window_menu_list(GList *listin)
 
 static void layout_menu_new_window_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutWindow *nw = NULL;
        gint n;
 
        n = GPOINTER_TO_INT(data);
@@ -2604,7 +2603,7 @@ static GtkToggleActionEntry menu_toggle_entries[] = {
   { "ExifRotate",      GTK_STOCK_ORIENTATION_PORTRAIT,                 N_("_Exif rotate"),             "<alt>X",               N_("Exif rotate"),                      CB(layout_menu_exif_rotate_cb), FALSE },
   { "DrawRectangle",   PIXBUF_INLINE_ICON_DRAW_RECTANGLE,                      N_("Draw Rectangle"),           NULL,           N_("Draw Rectangle"),                   CB(layout_menu_select_rectangle_cb), FALSE },
   { "OverUnderExposed",        PIXBUF_INLINE_ICON_EXPOSURE,    N_("Over/Under Exposed"),       "<shift>E",             N_("Over/Under Exposed"),               CB(layout_menu_select_overunderexposed_cb), FALSE },
-  { "SplitPaneSync",   PIXBUF_INLINE_SPLIT_PANE_SYNC,                  N_("Split Pane Sync"),  NULL,           N_("Split Pane Sync"),  CB(layout_menu_split_pane_sync_cb) },
+  { "SplitPaneSync",   PIXBUF_INLINE_SPLIT_PANE_SYNC,                  N_("Split Pane Sync"),  NULL,           N_("Split Pane Sync"),  CB(layout_menu_split_pane_sync_cb), FALSE },
 };
 
 static GtkRadioActionEntry menu_radio_entries[] = {
@@ -3648,9 +3647,10 @@ void layout_util_sync_color(LayoutWindow *lw)
        gboolean use_image = FALSE;
        gint i;
        gchar action_name[15];
+#ifdef HAVE_LCMS
        gchar *image_profile;
        gchar *screen_profile;
-
+#endif
 
        if (!lw->action_group) return;
        if (!layout_image_color_profile_get(lw, &input, &use_image)) return;

diff --git a/src/main.c b/src/main.c
index 7f0c4f2..9220703 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -545,6 +545,7 @@ static void parse_command_line_for_debug_option(gint argc, gchar *argv[])
 #endif
 }
 
+#ifdef HAVE_CLUTTER
 static gboolean parse_command_line_for_clutter_option(gint argc, gchar *argv[])
 {
        const gchar *clutter_option = "--disable-clutter";
@@ -567,6 +568,7 @@ static gboolean parse_command_line_for_clutter_option(gint argc, gchar *argv[])
 
        return ret;
 }
+#endif
 
 /*
  *-----------------------------------------------------------------------------

diff --git a/src/misc.c b/src/misc.c
index 8245697..89763ba 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -403,4 +403,9 @@ gint get_cpu_cores(void)
        return cores;
 }
 
+void tree_path_free_wrapper(void *data, void *useradata)
+{
+       gtk_tree_path_free(data);
+}
+
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/misc.h b/src/misc.h
index f602312..e7ade95 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -32,5 +32,6 @@ gchar *date_get_abbreviated_day_name(gint day);
 gchar *convert_rating_to_stars(gint rating);
 gchar *get_symbolic_link(const gchar *path_utf8);
 gint get_cpu_cores(void);
+void tree_path_free_wrapper(void *data, void *useradata);
 #endif /* MISC_H */
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index f61aa4a..597a0ed 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -149,6 +149,16 @@ static void pr_stereo_temp_disable(PixbufRenderer *pr, gboolean disable);
  *-------------------------------------------------------------------
  */
 
+static void pixbuf_renderer_class_init_wrapper(void *g_class, void *class_data)
+{
+       pixbuf_renderer_class_init(g_class);
+}
+
+static void pixbuf_renderer_init_wrapper(PixbufRenderer *pr, void *class_data)
+{
+       pixbuf_renderer_init(pr);
+}
+
 GType pixbuf_renderer_get_type(void)
 {
        static GType pixbuf_renderer_type = 0;
@@ -160,12 +170,12 @@ GType pixbuf_renderer_get_type(void)
                        sizeof(PixbufRendererClass), /* class_size */
                        NULL,           /* base_init */
                        NULL,           /* base_finalize */
-                       (GClassInitFunc)pixbuf_renderer_class_init,
+                       (GClassInitFunc)pixbuf_renderer_class_init_wrapper,
                        NULL,           /* class_finalize */
                        NULL,           /* class_data */
                        sizeof(PixbufRenderer), /* instance_size */
                        0,              /* n_preallocs */
-                       (GInstanceInitFunc)pixbuf_renderer_init, /* instance_init */
+                       (GInstanceInitFunc)pixbuf_renderer_init_wrapper, /* instance_init */
                        NULL,           /* value_table */
                        };
 

diff --git a/src/preferences.c b/src/preferences.c
index 4d223cf..dab683f 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -245,8 +245,10 @@ static gboolean accel_apply_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIt
 
 static void config_window_apply(void)
 {
-       gint i;
        gboolean refresh = FALSE;
+#ifdef HAVE_LCMS2
+       int i = 0;
+#endif
 
        config_entry_to_option(safe_delete_path_entry, &options->file_ops.safe_delete_path, remove_trailing_slash);
 
@@ -2183,7 +2185,9 @@ static void config_tab_image(GtkWidget *notebook)
        GtkWidget *table;
        GtkWidget *spin;
        GtkWidget *two_pass;
+#ifdef HAVE_CLUTTER
        GtkWidget *gpu_accel;
+#endif
 
        vbox = scrolled_notebook_page(notebook, _("Image"));
 

diff --git a/src/search.c b/src/search.c
index 47d945a..cff5f27 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -447,6 +447,7 @@ static gint search_result_find_row(SearchData *sd, FileData *fd, GtkTreeIter *it
        return -1;
 }
 
+
 static gboolean search_result_row_selected(SearchData *sd, FileData *fd)
 {
        GtkTreeModel *store;
@@ -469,7 +470,7 @@ static gboolean search_result_row_selected(SearchData *sd, FileData *fd)
                if (mfd_n->fd == fd) found = TRUE;
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        return found;
@@ -508,7 +509,7 @@ static gint search_result_selection_util(SearchData *sd, gint64 *bytes, GList **
 
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        if (bytes) *bytes = total;
@@ -726,7 +727,7 @@ static void search_result_remove_selection(SearchData *sd)
                flist = g_list_prepend(flist, mfd->fd);
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        work = flist;
@@ -1315,6 +1316,7 @@ static gboolean search_result_release_cb(GtkWidget *widget, GdkEventButton *beve
        return FALSE;
 }
 
+
 static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        SearchData *sd = data;
@@ -1339,7 +1341,7 @@ static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event,
                gtk_tree_model_get_iter(store, &iter, tpath);
                gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, -1);
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        if (event->state & GDK_CONTROL_MASK)

diff --git a/src/search_and_run.c b/src/search_and_run.c
index 54c4cab..ba758da 100644 (file)
--- a/src/search_and_run.c
+++ b/src/search_and_run.c
@@ -175,12 +175,14 @@ static void command_store_populate(SarData* sar)
                }
 }
 
-static void search_and_run_destroy(gpointer data)
+static gboolean search_and_run_destroy(gpointer data)
 {
        SarData *sar = data;
 
        sar->lw->sar_window = NULL;
        gtk_widget_destroy(sar->window);
+
+       return TRUE;
 }
 
 static gboolean entry_box_activate_cb(GtkWidget *widget, gpointer data)

diff --git a/src/ui_fileops.c b/src/ui_fileops.c
index bd1c81a..a42f4b1 100644 (file)
--- a/src/ui_fileops.c
+++ b/src/ui_fileops.c
@@ -733,9 +733,14 @@ gchar *get_current_dir(void)
        return path8;
 }
 
+void list_free_wrapper(void *data, void *userdata)
+{
+       g_free(data);
+}
+
 void string_list_free(GList *list)
 {
-       g_list_foreach(list, (GFunc)g_free, NULL);
+       g_list_foreach(list, (GFunc)list_free_wrapper, NULL);
        g_list_free(list);
 }
 
@@ -1063,7 +1068,6 @@ static void web_file_progress_cb(goffset current_num_bytes, goffset total_num_by
 static void download_web_file_cancel_button_cb(GenericDialog *gd, gpointer data)
 {
        WebData* web = data;
-       GError *error = NULL;
 
        g_cancellable_cancel(web->cancellable);
 }

diff --git a/src/ui_misc.c b/src/ui_misc.c
index ab02c4a..c4d4ab2 100644 (file)
--- a/src/ui_misc.c
+++ b/src/ui_misc.c
@@ -1777,8 +1777,8 @@ gboolean defined_mouse_buttons(GtkWidget *widget, GdkEventButton *event, gpointe
                                        gtk_action_activate(action);
                                        }
                                ret = TRUE;
-                               break;
                                }
+                               break;
                case MOUSE_BUTTON_9:
                        if (options->mouse_button_9)
                                {

diff --git a/src/view_dir.c b/src/view_dir.c
index c5fc5e5..170cc78 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -569,31 +569,6 @@ static void vd_toggle_show_hidden_files_cb(GtkWidget *widget, gpointer data)
        if (vd->layout) layout_refresh(vd->layout);
 }
 
-static void vd_pop_menu_new_rename_cb(gboolean success, const gchar *new_path, gpointer data)
-{
-       ViewDir *vd = data;
-       FileData *fd = NULL;
-       if (!success) return;
-
-       switch (vd->type)
-               {
-               case DIRVIEW_LIST:
-                       {
-                       vd_refresh(vd);
-                       fd = vdlist_row_by_path(vd, new_path, NULL);
-                       };
-                       break;
-               case DIRVIEW_TREE:
-                       {
-                       FileData *new_fd = file_data_new_dir(new_path);
-                       fd = vdtree_populate_path(vd, new_fd, TRUE, TRUE);
-                       file_data_unref(new_fd);
-                       }
-                       break;
-               }
-       vd_rename_by_data(vd, fd);
-}
-
 static void vd_pop_menu_new_folder_cb(gboolean success, const gchar *new_path, gpointer data)
 {
        ViewDir *vd = data;
@@ -878,7 +853,6 @@ static void vd_dnd_drop_receive(GtkWidget *widget,
        GtkTreePath *tpath;
        FileData *fd = NULL;
        GdkDragAction action;
-       GdkModifierType mask;
 
        vd->click_fd = NULL;
 
@@ -911,6 +885,8 @@ static void vd_dnd_drop_receive(GtkWidget *widget,
  * so. This is a workaround.
  */
 #if GTK_CHECK_VERSION(3,0,0)
+                       GdkModifierType mask;
+
                        gdk_window_get_pointer(gtk_widget_get_window(widget), NULL, NULL, &mask);
                        if (mask & GDK_CONTROL_MASK)
                                {

diff --git a/src/view_file/view_file_list.c b/src/view_file/view_file_list.c
index 2d39d41..2e2a092 100644 (file)
--- a/src/view_file/view_file_list.c
+++ b/src/view_file/view_file_list.c
@@ -1323,8 +1323,6 @@ FileData *vflist_star_next_fd(ViewFile *vf)
 
                while (!fd && valid && tree_view_row_get_visibility(GTK_TREE_VIEW(vf->listview), &iter, FALSE) == 0)
                        {
-                       GList *work;
-
                        gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &nfd, -1);
 
                        if (nfd && nfd->rating == STAR_RATING_NOT_READ)
@@ -1446,7 +1444,7 @@ static gboolean vflist_row_is_selected(ViewFile *vf, FileData *fd)
                if (fd_n == fd) found = TRUE;
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        return found;
@@ -1493,7 +1491,7 @@ guint vflist_selection_count(ViewFile *vf, gint64 *bytes)
                }
 
        count = g_list_length(slist);
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        return count;
@@ -1535,7 +1533,7 @@ GList *vflist_selection_get_list(ViewFile *vf)
 
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        return g_list_reverse(list);
@@ -1565,7 +1563,7 @@ GList *vflist_selection_get_list_by_index(ViewFile *vf)
 
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        return g_list_reverse(list);
@@ -1795,7 +1793,7 @@ void vflist_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode)
 
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 }