Mercurial > geeqie.yaz

comparison src/image.c @ 1182:6ae6d77a1f15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up deprecated function and not a prototype warnings.
author zas_
date Thu, 27 Nov 2008 12:29:38 +0000
parents 1646720364cf
children 09da3f14490d
comparison
equal deleted inserted replaced
1181:475986f8f298 1182:6ae6d77a1f15
468 { 468 {
469 g_object_unref(fd->pixbuf); 469 g_object_unref(fd->pixbuf);
470 fd->pixbuf = NULL; 470 fd->pixbuf = NULL;
471 } 471 }
472 472
473 static FileCacheData *image_get_cache() 473 static FileCacheData *image_get_cache(void)
474 { 474 {
475 static FileCacheData *cache = NULL; 475 static FileCacheData *cache = NULL;
476 if (!cache) cache = file_cache_new(image_cache_release_cb, 1); 476 if (!cache) cache = file_cache_new(image_cache_release_cb, 1);
477 file_cache_set_max_size(cache, (gulong)options->image.image_cache_max * 1048576); /* update from options */ 477 file_cache_set_max_size(cache, (gulong)options->image.image_cache_max * 1048576); /* update from options */
478 return cache; 478 return cache;
1657 G_CALLBACK(image_focus_out_cb), imd); 1657 G_CALLBACK(image_focus_out_cb), imd);
1658 1658
1659 g_signal_connect_after(G_OBJECT(imd->frame), "expose_event", 1659 g_signal_connect_after(G_OBJECT(imd->frame), "expose_event",
1660 G_CALLBACK(image_focus_expose), imd); 1660 G_CALLBACK(image_focus_expose), imd);
1661 1661
1662 1662 #if GTK_CHECK_VERSION(2,14,0)
1663 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame); 1663 gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
1664 gtk_widget_show(imd->frame); 1664 #else
1665 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame);
1666 #endif
1667 gtk_widget_show(imd->frame);
1665 } 1668 }
1666 else 1669 else
1667 { 1670 {
1668 #if GTK_CHECK_VERSION(2,12,0) 1671 #if GTK_CHECK_VERSION(2,12,0)
1669 g_object_ref(imd->pr); 1672 g_object_ref(imd->pr);
1674 { 1677 {
1675 gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr); 1678 gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr);
1676 gtk_widget_destroy(imd->frame); 1679 gtk_widget_destroy(imd->frame);
1677 imd->frame = NULL; 1680 imd->frame = NULL;
1678 } 1681 }
1682 #if GTK_CHECK_VERSION(2,14,0)
1683 gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
1684 #else
1679 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr); 1685 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr);
1686 #endif
1680 1687
1681 #if GTK_CHECK_VERSION(2,12,0) 1688 #if GTK_CHECK_VERSION(2,12,0)
1682 g_object_unref(imd->pr); 1689 g_object_unref(imd->pr);
1683 #else 1690 #else
1684 gtk_widget_unref(imd->pr); 1691 gtk_widget_unref(imd->pr);