Merge commit 'refs/merge-requests/2' of git://gitorious.org/geeqie/geeqie into merge...

diff --git a/src/cellrenderericon.c b/src/cellrenderericon.c
index ad6375e..e1e7579 100644 (file)
--- a/src/cellrenderericon.c
+++ b/src/cellrenderericon.c
@@ -44,7 +44,7 @@ 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,
-                                           GdkRectangle        *rectangle,
+                                           const GdkRectangle  *rectangle,
                                            gint                *x_offset,
                                            gint                *y_offset,
                                            gint                *width,
@@ -67,12 +67,12 @@ static void gqv_cell_renderer_icon_render(GtkCellRenderer   *cell,
 #endif
 
 
-static gint gqv_cell_renderer_icon_activate(GtkCellRenderer      *cell,
+static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer      *cell,
                                            GdkEvent             *event,
                                            GtkWidget            *widget,
                                            const gchar          *path,
-                                           GdkRectangle         *background_area,
-                                           GdkRectangle         *cell_area,
+                                           const GdkRectangle   *background_area,
+                                           const GdkRectangle   *cell_area,
                                            GtkCellRendererState  flags);
 
 enum {
@@ -553,7 +553,7 @@ gqv_cell_renderer_icon_new(void)
 static void
 gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell,
                                GtkWidget       *widget,
-                               GdkRectangle    *cell_area,
+                               const GdkRectangle      *cell_area,
                                gint            *x_offset,
                                gint            *y_offset,
                                gint            *width,
@@ -845,13 +845,13 @@ gqv_cell_renderer_icon_render(GtkCellRenderer             *cell,
 #endif
 }
 
-static gint
+static gboolean
 gqv_cell_renderer_icon_activate(GtkCellRenderer      *cell,
                                GdkEvent             *event,
                                GtkWidget            *widget,
                                const gchar          *path,
-                               GdkRectangle         *background_area,
-                               GdkRectangle         *cell_area,
+                               const GdkRectangle   *background_area,
+                               const GdkRectangle   *cell_area,
                                GtkCellRendererState  flags)
 {
        GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell;

diff --git a/src/image.h b/src/image.h
index 4b35c4d..9f7c7c4 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -64,7 +64,7 @@ void image_change_pixbuf(ImageWindow *imd, GdkPixbuf *pixbuf, gdouble zoom, gboo
 void image_change_from_collection(ImageWindow *imd, CollectionData *cd, CollectInfo *info, gdouble zoom);
 CollectionData *image_get_collection(ImageWindow *imd, CollectInfo **info);
 void image_copy_from_image(ImageWindow *imd, ImageWindow *source);
-void image_movee_from_image(ImageWindow *imd, ImageWindow *source);
+void image_move_from_image(ImageWindow *imd, ImageWindow *source);
 
 gboolean image_get_image_size(ImageWindow *imd, gint *width, gint *height);
 GdkPixbuf *image_get_pixbuf(ImageWindow *imd);

diff --git a/src/logwindow.c b/src/logwindow.c
index 5c652ed..a1cbb83 100644 (file)
--- a/src/logwindow.c
+++ b/src/logwindow.c
@@ -270,7 +270,7 @@ void log_window_append(const gchar *str, LogType type)
 
        log_window_insert_text(buffer, &iter, str, logdefs[type].tag);
 
-       if (gtk_widget_get_visible(text))
+       if (gtk_widget_get_visible(GTK_WIDGET(text)))
                {
                GtkTextMark *mark;
                

diff --git a/src/renderer-tiles.c b/src/renderer-tiles.c
index 30264be..689eba7 100644 (file)
--- a/src/renderer-tiles.c
+++ b/src/renderer-tiles.c
@@ -1607,7 +1607,7 @@ static gboolean rt_queue_draw_idle_cb(gpointer data)
                fast = FALSE;
                }
 
-       if (gtk_widget_get_realized(pr))
+       if (gtk_widget_get_realized(GTK_WIDGET(pr)))
                {
                if (rt_tile_is_visible(rt, qd->it))
                        {