Replaced gtk depreceated code.

diff --git a/src/collect-table.c b/src/collect-table.c
index c3e3242..925230a 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -1337,7 +1337,7 @@ static void collection_table_insert_marker(CollectTable *ct, CollectInfo *info,
 
                pb = gdk_pixbuf_new_from_xpm_data((const gchar **)marker_xpm);
                gdk_pixbuf_render_pixmap_and_mask(pb, &pixmap, &mask, 128);
-               gdk_pixbuf_unref(pb);
+               g_object_unref(pb);
 
                gdk_drawable_get_size(pixmap, &w, &h);
 

diff --git a/src/dupe.c b/src/dupe.c
index 8aa9519..dd597bc 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -1953,7 +1953,7 @@ static void dupe_display_stats(DupeWindow *dw, DupeItem *di)
                gtk_box_pack_start(GTK_BOX(gd->vbox), image, FALSE, FALSE, 0);
                gtk_widget_show(image);
 
-               gdk_pixbuf_unref(pixbuf);
+               g_object_unref(pixbuf);
                }
 
        gtk_widget_show(gd->dialog);

diff --git a/src/image-load.c b/src/image-load.c
index 3c2a1fb..1c2d429 100644 (file)
--- a/src/image-load.c
+++ b/src/image-load.c
@@ -172,7 +172,8 @@ static void image_loader_finalize(GObject *object)
                il->area_param_list = g_list_delete_link(il->area_param_list, il->area_param_list);
                }
 
-       if (il->pixbuf) gdk_pixbuf_unref(il->pixbuf);
+       if (il->pixbuf) g_object_unref(il->pixbuf);
+
        file_data_unref(il->fd);
 #ifdef HAVE_GTHREAD
        g_mutex_free(il->data_mutex);
@@ -317,9 +318,11 @@ static void image_loader_sync_pixbuf(ImageLoader *il)
                return;
                }
 
-       if (il->pixbuf) gdk_pixbuf_unref(il->pixbuf);
+       if (il->pixbuf) g_object_unref(il->pixbuf);
+
        il->pixbuf = pb;
-       if (il->pixbuf) gdk_pixbuf_ref(il->pixbuf);
+       if (il->pixbuf) g_object_ref(il->pixbuf);
+
        g_mutex_unlock(il->data_mutex);
 }
 

diff --git a/src/image.c b/src/image.c
index b71a618..94154cd 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -540,7 +540,7 @@ static void image_load_done_cb(ImageLoader *il, gpointer data)
 
        if (options->image.enable_read_ahead && imd->image_fd && !imd->image_fd->pixbuf && image_loader_get_pixbuf(imd->il))
                {
-               imd->image_fd->pixbuf = gdk_pixbuf_ref(image_loader_get_pixbuf(imd->il));
+               imd->image_fd->pixbuf = g_object_ref(image_loader_get_pixbuf(imd->il));
                image_cache_set(imd, imd->image_fd);
                }
 
@@ -1619,10 +1619,19 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
        if (frame)
                {
                imd->frame = gtk_frame_new(NULL);
-               gtk_widget_ref(imd->pr);
+#if GTK_CHECK_VERSION(2,12,0)
+        g_object_ref(imd->pr);
+#else
+        gtk_widget_ref(imd->pr);
+#endif
                if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr);
                gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr);
-               gtk_widget_unref(imd->pr);
+
+#if GTK_CHECK_VERSION(2,12,0)
+        g_object_unref(imd->pr);
+#else
+        gtk_widget_unref(imd->pr);
+#endif
                g_signal_connect(G_OBJECT(imd->frame), "expose_event",
                                 G_CALLBACK(selectable_frame_expose_cb), NULL);
 
@@ -1641,7 +1650,11 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
                }
        else
                {
+#if GTK_CHECK_VERSION(2,12,0)
+               g_object_ref(imd->pr);
+#else
                gtk_widget_ref(imd->pr);
+#endif
                if (imd->frame)
                        {
                        gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr);
@@ -1649,7 +1662,12 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
                        imd->frame = NULL;
                        }
                gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr);
-               gtk_widget_unref(imd->pr);
+
+#if GTK_CHECK_VERSION(2,12,0)
+       g_object_unref(imd->pr);
+#else
+       gtk_widget_unref(imd->pr);
+#endif
                }
 
        gtk_widget_show(imd->pr);

diff --git a/src/layout.c b/src/layout.c
index 994034d..7ee2ec3 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -253,7 +253,11 @@ static void layout_sort_menu_ascend_cb(GtkWidget *widget, gpointer data)
 static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer data)
 {
        /* destroy the menu */
+#if GTK_CHECK_VERSION(2,12,0)
+       g_object_unref(widget);
+#else
        gtk_widget_unref(GTK_WIDGET(widget));
+#endif
 }
 
 static void layout_sort_button_press_cb(GtkWidget *widget, gpointer data)
@@ -1985,7 +1989,7 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, gint popped, gint hidde
 
                pixbuf = pixbuf_inline(PIXBUF_INLINE_LOGO);
                image_change_pixbuf(lw->image, pixbuf, 1.0);
-               gdk_pixbuf_unref(pixbuf);
+               g_object_unref(pixbuf);
                }
 
        if (geometry)

diff --git a/src/layout_image.c b/src/layout_image.c
index cfe8653..0b1f70f 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1507,8 +1507,11 @@ GtkWidget *layout_image_new(LayoutWindow *lw, gint i)
                {
                lw->split_images[i] = image_new(TRUE);
 
+#if GTK_CHECK_VERSION(2,12,0)
+               g_object_ref(lw->split_images[i]->widget);
+#else
                gtk_widget_ref(lw->split_images[i]->widget);
-
+#endif
                image_background_set_color(lw->split_images[i], options->image.use_custom_border_color ? &options->image.border_color : NULL);
 
                image_auto_refresh_enable(lw->split_images[i], TRUE);
@@ -1599,7 +1602,11 @@ GtkWidget *layout_image_setup_split_none(LayoutWindow *lw)
                {
                if (lw->split_images[i])
                        {
+#if GTK_CHECK_VERSION(2,12,0)
+                       g_object_unref(lw->split_images[i]->widget);
+#else
                        gtk_widget_unref(lw->split_images[i]->widget);
+#endif
                        lw->split_images[i] = NULL;
                        }
                }
@@ -1653,7 +1660,11 @@ GtkWidget *layout_image_setup_split_hv(LayoutWindow *lw, gboolean horizontal)
                {
                if (lw->split_images[i])
                        {
+#if GTK_CHECK_VERSION(2,12,0)
+                       g_object_unref(lw->split_images[i]->widget);
+#else
                        gtk_widget_unref(lw->split_images[i]->widget);
+#endif
                        lw->split_images[i] = NULL;
                        }
                }
@@ -1729,7 +1740,11 @@ GtkWidget *layout_image_setup_split_quad(LayoutWindow *lw)
                {
                if (lw->split_images[i])
                        {
+#if GTK_CHECK_VERSION(2,12,0)
+                       g_object_unref(lw->split_images[i]->widget);
+#else
                        gtk_widget_unref(lw->split_images[i]->widget);
+#endif
                        lw->split_images[i] = NULL;
                        }
                }

diff --git a/src/layout_util.h b/src/layout_util.h
index 6630503..bdc5137 100644 (file)
--- a/src/layout_util.h
+++ b/src/layout_util.h
@@ -34,9 +34,7 @@ void layout_actions_setup(LayoutWindow *lw);
 void layout_actions_add_window(LayoutWindow *lw, GtkWidget *window);
 GtkWidget *layout_actions_menu_bar(LayoutWindow *lw);
 
-GtkWidget *layout_button(GtkWidget *box, gchar **pixmap_data, const gchar *stock_id, gint toggle,
-                        GtkTooltips *tooltips, const gchar *tip_text,
-                        GtkSignalFunc func, gpointer data);
+
 GtkWidget *layout_button_bar(LayoutWindow *lw);
 
 void layout_keyboard_init(LayoutWindow *lw, GtkWidget *window);

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index bb25a03..f7125db 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -530,8 +530,9 @@ static void pixbuf_renderer_finalize(GObject *object)
        pr_queue_clear(pr);
        pr_tile_free_all(pr);
 
+
        if (pr->pixbuf) g_object_unref(pr->pixbuf);
-       if (pr->spare_tile) gdk_pixbuf_unref(pr->spare_tile);
+       if (pr->spare_tile) g_object_unref(pr->spare_tile);
 
        pr_scroller_timer_set(pr, FALSE);
        pr_overlay_list_clear(pr);
@@ -1837,7 +1838,7 @@ static void pr_tile_free(ImageTile *it)
 {
        if (!it) return;
 
-       if (it->pixbuf) gdk_pixbuf_unref(it->pixbuf);
+       if (it->pixbuf) g_object_unref(it->pixbuf);
        if (it->pixmap) g_object_unref(it->pixmap);
 
        g_free(it);

diff --git a/src/pixbuf_util.c b/src/pixbuf_util.c
index 15853c8..0ec19e7 100644 (file)
--- a/src/pixbuf_util.c
+++ b/src/pixbuf_util.c
@@ -330,7 +330,7 @@ GdkPixbuf *pixbuf_copy_rotate_90(GdkPixbuf *src, gint counter_clockwise)
                        }
                }
 
-       gdk_pixbuf_unref(buffer);
+       g_object_unref(buffer);
 
 #if 0
        /* this is the simple version of rotation (roughly 2-4x slower) */
@@ -472,7 +472,7 @@ GdkPixbuf *pixbuf_apply_orientation(GdkPixbuf *pixbuf, gint orientation)
                        dest = gdk_pixbuf_copy(pixbuf);
                        break;
                }
-       if (tmp) gdk_pixbuf_unref(tmp);
+       if (tmp) g_object_unref(tmp);
        return dest;
 
 }

diff --git a/src/thumb.c b/src/thumb.c
index a747ea5..fbd7b43 100644 (file)
--- a/src/thumb.c
+++ b/src/thumb.c
@@ -214,12 +214,13 @@ static void thumb_loader_done_cb(ImageLoader *il, gpointer data)
                        {
                        if (tl->fd->thumb_pixbuf) g_object_unref(tl->fd->thumb_pixbuf);
                        tl->fd->thumb_pixbuf = pixbuf;
-                       gdk_pixbuf_ref(tl->fd->thumb_pixbuf);
+
+                       g_object_ref(tl->fd->thumb_pixbuf);
                        }
                save = image_loader_get_shrunk(il);
                }
 
-       if (rotated) gdk_pixbuf_unref(rotated);
+       if (rotated) g_object_unref(rotated);
        
        /* save it ? */
        if (tl->cache_enable && save)
@@ -651,7 +652,7 @@ static GdkPixbuf *get_xv_thumbnail(gchar *thumb_filename, gint max_w, gint max_h
 
                        tmp = pixbuf;
                        pixbuf = gdk_pixbuf_scale_simple(tmp, width, height, GDK_INTERP_NEAREST);
-                       gdk_pixbuf_unref(tmp);
+                       g_object_unref(tmp);
                        }
 
                return pixbuf;

diff --git a/src/ui_misc.c b/src/ui_misc.c
index e933876..7bdd247 100644 (file)
--- a/src/ui_misc.c
+++ b/src/ui_misc.c
@@ -718,6 +718,8 @@ GtkWidget *pref_table_spin(GtkWidget *table, gint column, gint row,
        return spin;
 }
 
+#if ! GTK_CHECK_VERSION(2,12,0)
+
 static void pref_toolbar_destroy_cb(GtkWidget *widget, gpointer data)
 {
        GtkTooltips *tips = data;
@@ -725,11 +727,15 @@ static void pref_toolbar_destroy_cb(GtkWidget *widget, gpointer data)
        g_object_unref(G_OBJECT(tips));
 }
 
+#endif
+
 GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
 {
        GtkWidget *tbar;
+#if ! GTK_CHECK_VERSION(2,12,0)
        GtkTooltips *tips;
-
+#endif
+       
        tbar = gtk_toolbar_new();
        gtk_toolbar_set_style(GTK_TOOLBAR(tbar), style);
 
@@ -739,23 +745,25 @@ GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
                gtk_widget_show(tbar);
                }
 
+#if ! GTK_CHECK_VERSION(2,12,0)
        tips = gtk_tooltips_new();
 
        /* take ownership of tooltips */
-#ifdef GTK_OBJECT_FLOATING
+#  ifdef GTK_OBJECT_FLOATING
        /* GTK+ < 2.10 */
        g_object_ref(G_OBJECT(tips));
        gtk_object_sink(GTK_OBJECT(tips));
-#else
+#  else
        /* GTK+ >= 2.10 */
        g_object_ref_sink(G_OBJECT(tips));
-#endif
+#  endif
 
        g_object_set_data(G_OBJECT(tbar), "tooltips", tips);
        g_signal_connect(G_OBJECT(tbar), "destroy",
                         G_CALLBACK(pref_toolbar_destroy_cb), tips);
 
        gtk_tooltips_enable(tips);
+#endif
 
        return tbar;
 }
@@ -799,11 +807,18 @@ GtkWidget *pref_toolbar_button(GtkWidget *toolbar,
 
        if (description)
                {
+
+#if GTK_CHECK_VERSION(2,12,0)
+
+               gtk_widget_set_tooltip_text(GTK_TOOL_ITEM(item), description);
+                       
+#else
                GtkTooltips *tips;
 
                tips = g_object_get_data(G_OBJECT(toolbar), "tooltips");
                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), tips, description, NULL);
-               }
+#endif
+       }
 
        return item;
 }

diff --git a/src/ui_tabcomp.c b/src/ui_tabcomp.c
index c6d8527..8a94cf3 100644 (file)
--- a/src/ui_tabcomp.c
+++ b/src/ui_tabcomp.c
@@ -205,8 +205,11 @@ static gint tab_completion_popup_key_press(GtkWidget *widget, GdkEventKey *event
                /*close the menu */
                gtk_menu_popdown(GTK_MENU(widget));
                /* doing this does not emit the "selection done" signal, unref it ourselves */
+#if GTK_CHECK_VERSION(2,12,0)
+               g_object_unref(widget);
+#else
                gtk_widget_unref(widget);
-
+#endif
                return TRUE;
                }
 
@@ -634,7 +637,8 @@ static GtkWidget *tab_completion_create_complete_button(GtkWidget *entry, GtkWid
 
        pixbuf = gdk_pixbuf_new_from_inline(-1, icon_tabcomp, FALSE, NULL);
        icon = gtk_image_new_from_pixbuf(pixbuf);
-       gdk_pixbuf_unref(pixbuf);
+       g_object_unref(pixbuf);
+
        gtk_container_add(GTK_CONTAINER(button), icon);
        gtk_widget_show(icon);
 

diff --git a/src/ui_tree_edit.c b/src/ui_tree_edit.c
index d54122d..41d9035 100644 (file)
--- a/src/ui_tree_edit.c
+++ b/src/ui_tree_edit.c
@@ -266,7 +266,11 @@ gint tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint col
         * use x_offset instead for X scroll (sigh)
         */
        gtk_tree_view_get_cell_area(widget, tpath, tv_column, &rect);
+#if GTK_CHECK_VERSION(2,12,0)
+       gtk_tree_view_convert_bin_window_to_widget_coords(widget, 0, 0, &x_offset, &y_offset);
+#else
        gtk_tree_view_tree_to_widget_coords(widget, 0, 0, &x_offset, &y_offset);
+#endif
        gdk_window_get_origin(GTK_WIDGET(widget)->window, &x_origin, &y_origin);
 
        if (gtk_tree_view_get_headers_visible(widget))
@@ -358,7 +362,12 @@ gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gint f
        gtk_tree_view_get_cell_area(widget, tpath, NULL, &crect);
        gtk_tree_path_free(tpath);
 
+
+#if GTK_CHECK_VERSION(2,12,0)
+       gtk_tree_view_convert_bin_window_to_widget_coords(widget, crect.x, crect.y, &cx, &cy);
+#else
        gtk_tree_view_widget_to_tree_coords(widget, crect.x, crect.y, &cx, &cy);
+#endif
 
        if (fully_visible)
                {