Merge branch 'compiler_warnings'

* compiler_warnings:
  This potentially fixes most deprecated warnings
  Fix wrong gtk3 function calls in gtk2
  Export file_data_new_simple into other source files
  Fixed one wrongly function call with pointer

diff --git a/src/cellrenderericon.c b/src/cellrenderericon.c
index 9588f1b..8f439f0 100644 (file)
--- a/src/cellrenderericon.c
+++ b/src/cellrenderericon.c
@@ -42,13 +42,23 @@ static void gqv_cell_renderer_icon_set_property(GObject             *object,
 static void gqv_cell_renderer_icon_init(GQvCellRendererIcon *celltext);
 static void gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class);
 static void gqv_cell_renderer_icon_finalize(GObject *object);
-static void gqv_cell_renderer_icon_get_size(GtkCellRenderer    *cell,
-                                           GtkWidget           *widget,
-                                           const GdkRectangle  *rectangle,
-                                           gint                *x_offset,
-                                           gint                *y_offset,
-                                           gint                *width,
-                                           gint                *height);
+#if GTK_CHECK_VERSION(3,0,0)
+static void gqv_cell_renderer_icon_get_size(GtkCellRenderer    *cell,
+                                           GtkWidget          *widget,
+                                           const GdkRectangle *rectangle,
+                                           gint               *x_offset,
+                                           gint               *y_offset,
+                                           gint               *width,
+                                           gint               *height);
+#else
+static void gqv_cell_renderer_icon_get_size(GtkCellRenderer    *cell,
+                                           GtkWidget          *widget,
+                                           GdkRectangle       *rectangle,
+                                           gint               *x_offset,
+                                           gint               *y_offset,
+                                           gint               *width,
+                                           gint               *height);
+#endif
 #if GTK_CHECK_VERSION(3,0,0)
 static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
                                           cairo_t *cr,
@@ -67,13 +77,23 @@ static void gqv_cell_renderer_icon_render(GtkCellRenderer   *cell,
 #endif
 
 
+#if GTK_CHECK_VERSION(3,0,0)
 static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer      *cell,
-                                           GdkEvent             *event,
-                                           GtkWidget            *widget,
-                                           const gchar          *path,
-                                           const GdkRectangle   *background_area,
-                                           const GdkRectangle   *cell_area,
-                                           GtkCellRendererState  flags);
+                                               GdkEvent             *event,
+                                               GtkWidget            *widget,
+                                               const gchar          *path,
+                                               const GdkRectangle   *background_area,
+                                               const GdkRectangle   *cell_area,
+                                               GtkCellRendererState  flags);
+#else
+static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer      *cell,
+                                               GdkEvent             *event,
+                                               GtkWidget            *widget,
+                                               const gchar          *path,
+                                               GdkRectangle         *background_area,
+                                               GdkRectangle         *cell_area,
+                                               GtkCellRendererState  flags);
+#endif
 
 enum {
   TOGGLED,
@@ -550,14 +570,23 @@ gqv_cell_renderer_icon_new(void)
        return g_object_new(GQV_TYPE_CELL_RENDERER_ICON, NULL);
 }
 
-static void
-gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell,
-                               GtkWidget       *widget,
-                               const GdkRectangle      *cell_area,
-                               gint            *x_offset,
-                               gint            *y_offset,
-                               gint            *width,
-                               gint            *height)
+#if GTK_CHECK_VERSION(3,0,0)
+static void gqv_cell_renderer_icon_get_size(GtkCellRenderer    *cell,
+                                           GtkWidget          *widget,
+                                           const GdkRectangle *cell_area,
+                                           gint               *x_offset,
+                                           gint               *y_offset,
+                                           gint               *width,
+                                           gint               *height)
+#else
+static void gqv_cell_renderer_icon_get_size(GtkCellRenderer    *cell,
+                                           GtkWidget          *widget,
+                                           GdkRectangle       *cell_area,
+                                           gint               *x_offset,
+                                           gint               *y_offset,
+                                           gint               *width,
+                                           gint               *height)
+#endif
 {
        GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell;
        gint calc_width;
@@ -845,14 +874,23 @@ gqv_cell_renderer_icon_render(GtkCellRenderer             *cell,
 #endif
 }
 
-static gboolean
-gqv_cell_renderer_icon_activate(GtkCellRenderer      *cell,
-                               GdkEvent             *event,
-                               GtkWidget            *widget,
-                               const gchar          *path,
-                               const GdkRectangle   *background_area,
-                               const GdkRectangle   *cell_area,
-                               GtkCellRendererState  flags)
+#if GTK_CHECK_VERSION(3,0,0)
+static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer      *cell,
+                                               GdkEvent             *event,
+                                               GtkWidget            *widget,
+                                               const gchar          *path,
+                                               const GdkRectangle   *background_area,
+                                               const GdkRectangle   *cell_area,
+                                               GtkCellRendererState  flags)
+#else
+static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer      *cell,
+                                               GdkEvent             *event,
+                                               GtkWidget            *widget,
+                                               const gchar          *path,
+                                               GdkRectangle         *background_area,
+                                               GdkRectangle         *cell_area,
+                                               GtkCellRendererState  flags)
+#endif
 {
        GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell;
        GdkEventButton *bevent = &event->button;

diff --git a/src/color-man.c b/src/color-man.c
index e4f1bab..8e485bc 100644 (file)
--- a/src/color-man.c
+++ b/src/color-man.c
@@ -435,7 +435,7 @@ static gchar *color_man_get_profile_name(ColorManProfileType type, cmsHPROFILE p
                                cmsUInt32Number r;
                                char buffer[20];
                                buffer[0] = '\0';
-                               r = cmsGetProfileInfoASCII(profile, cmsInfoDescription, "en", "US", &buffer, 20);
+                               r = cmsGetProfileInfoASCII(profile, cmsInfoDescription, "en", "US", buffer, 20);
                                buffer[19] = '\0'; /* Just to be sure */
                                return g_strdup(buffer);
 #else

diff --git a/src/filedata.h b/src/filedata.h
index 43edc42..9dc70a4 100644 (file)
--- a/src/filedata.h
+++ b/src/filedata.h
@@ -33,6 +33,8 @@ FileData *file_data_new_no_grouping(const gchar *path_utf8);
 /* should be used on dirs */
 FileData *file_data_new_dir(const gchar *path_utf8);
 
+FileData *file_data_new_simple(const gchar *path_utf8);
+
 #ifdef DEBUG_FILEDATA
 FileData *file_data_ref_debug(const gchar *file, gint line, FileData *fd);
 void file_data_unref_debug(const gchar *file, gint line, FileData *fd);

diff --git a/src/image-load.c b/src/image-load.c
index 1af4285..0f4d977 100644 (file)
--- a/src/image-load.c
+++ b/src/image-load.c
@@ -99,8 +99,15 @@ static void image_loader_init(GTypeInstance *instance, gpointer g_class)
        il->can_destroy = TRUE;
 
 #ifdef HAVE_GTHREAD
+#if GTK_CHECK_VERSION(2,32,0)
+       il->data_mutex = g_new(GMutex, 1);
+       g_mutex_init(il->data_mutex);
+       il->can_destroy_cond = g_new(GCond, 1);
+       g_cond_init((il->can_destroy_cond);
+#else
        il->data_mutex = g_mutex_new();
        il->can_destroy_cond = g_cond_new();
+#endif
 #endif
        DEBUG_1("new image loader %p, bufsize=%" G_GSIZE_FORMAT " idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count);
 }
@@ -210,9 +217,16 @@ static void image_loader_finalize(GObject *object)
 
        file_data_unref(il->fd);
 #ifdef HAVE_GTHREAD
+#if GTK_CHECK_VERSION(2,32,0)
+       g_mutex_clear(il->data_mutex);
+       g_free(il->data_mutex);
+       g_cond_clear(il->can_destroy_cond);
+       g_free(il->can_destroy_cond);
+#else
        g_mutex_free(il->data_mutex);
        g_cond_free(il->can_destroy_cond);
 #endif
+#endif
 }
 
 void image_loader_free(ImageLoader *il)
@@ -1003,8 +1017,15 @@ static gboolean image_loader_start_thread(ImageLoader *il)
         if (!image_loader_thread_pool)
                {
                image_loader_thread_pool = g_thread_pool_new(image_loader_thread_run, NULL, -1, FALSE, NULL);
+#if GTK_CHECK_VERSION(2,32,0)
+               if (!image_loader_prio_cond) image_loader_prio_cond = g_new(GCond, 1);
+               g_cond_init(image_loader_prio_cond);
+               if (!image_loader_prio_mutex) image_loader_prio_mutex = g_new(GMutex, 1);
+               g_mutex_init(image_loader_prio_mutex);
+#else
                image_loader_prio_cond = g_cond_new();
                image_loader_prio_mutex = g_mutex_new();
+#endif
                }
 
        il->can_destroy = FALSE; /* ImageLoader can't be freed until image_loader_thread_run finishes */

diff --git a/src/main.c b/src/main.c
index c56ab57..d5ba24f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -737,7 +737,9 @@ gint main(gint argc, gchar *argv[])
        CollectionData *cd = NULL;
 
 #ifdef HAVE_GTHREAD
+#if !GTK_CHECK_VERSION(2,32,0)
        g_thread_init(NULL);
+#endif
        gdk_threads_init();
        gdk_threads_enter();