Mercurial > geeqie.yaz
changeset 1182:6ae6d77a1f15
Fix up deprecated function and not a prototype warnings.
| author | zas_ |
|---|---|
| date | Thu, 27 Nov 2008 12:29:38 +0000 |
| parents | 475986f8f298 |
| children | 8738237cb029 |
| files | src/image.c |
| diffstat | 1 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image.c Wed Nov 26 20:39:50 2008 +0000 +++ b/src/image.c Thu Nov 27 12:29:38 2008 +0000 @@ -470,7 +470,7 @@ fd->pixbuf = NULL; } -static FileCacheData *image_get_cache() +static FileCacheData *image_get_cache(void) { static FileCacheData *cache = NULL; if (!cache) cache = file_cache_new(image_cache_release_cb, 1); @@ -1659,9 +1659,12 @@ g_signal_connect_after(G_OBJECT(imd->frame), "expose_event", G_CALLBACK(image_focus_expose), imd); - - gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame); - gtk_widget_show(imd->frame); +#if GTK_CHECK_VERSION(2,14,0) + gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0); +#else + gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame); +#endif + gtk_widget_show(imd->frame); } else { @@ -1676,7 +1679,11 @@ gtk_widget_destroy(imd->frame); imd->frame = NULL; } +#if GTK_CHECK_VERSION(2,14,0) + gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0); +#else gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr); +#endif #if GTK_CHECK_VERSION(2,12,0) g_object_unref(imd->pr);