Mercurial > geeqie
diff src/image.c @ 1043:5fc64d6252e7
Replaced gtk depreceated code.
author | bruclik |
---|---|
date | Sun, 07 Sep 2008 23:01:30 +0000 |
parents | 7c87b324b9bb |
children | 0ab0deb0cfcc |
line wrap: on
line diff
--- a/src/image.c Sun Sep 07 19:42:19 2008 +0000 +++ b/src/image.c Sun Sep 07 23:01:30 2008 +0000 @@ -540,7 +540,7 @@ 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 @@ 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 @@ } 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 @@ 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);