gimp r28111 - in trunk: . app/widgets plug-ins/print

[neo svn gnome org]

Author: neo
Date: Thu Mar  5 19:59:45 2009
New Revision: 28111
URL: http://svn.gnome.org/viewvc/gimp?rev=28111&view=rev

Log:
2009-03-05  Sven Neumann  <sven gimp org>

	* app/widgets/gimpviewrendererimagefile.c
	(gimp_view_renderer_imagefile_get_icon)
	* plug-ins/print/print.c (query): removed GTK+ version checks 
that
	have become obsolete.



Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimpviewrendererimagefile.c
   trunk/plug-ins/print/print.c

Modified: trunk/app/widgets/gimpviewrendererimagefile.c
==============================================================================
--- trunk/app/widgets/gimpviewrendererimagefile.c	(original)
+++ trunk/app/widgets/gimpviewrendererimagefile.c	Thu Mar  5 19:59:45 2009
@@ -163,7 +163,6 @@
   if (! gimp_object_get_name (GIMP_OBJECT (imagefile)))
     return NULL;
 
-#if GTK_CHECK_VERSION (2, 13, 4)
   if (! pixbuf)
     {
       GFile       *file;
@@ -175,9 +174,7 @@
 
       if (file_info)
         {
-          GIcon *icon;
-
-          icon = g_file_info_get_icon (file_info);
+          GIcon *icon = g_file_info_get_icon (file_info);
 
           info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, 0);
           pixbuf = gtk_icon_info_load_icon (info, NULL);
@@ -187,7 +184,6 @@
 
       g_object_unref (file);
     }
-#endif
 
   if (! pixbuf && imagefile->thumbnail->image_mimetype)
     {

Modified: trunk/plug-ins/print/print.c
==============================================================================
--- trunk/plug-ins/print/print.c	(original)
+++ trunk/plug-ins/print/print.c	Thu Mar  5 19:59:45 2009
@@ -127,11 +127,8 @@
                           print_args, NULL);
 
   gimp_plugin_menu_register (PAGE_SETUP_PROC_NAME, "<Image>/File/Send");
-
-#if GTK_CHECK_VERSION(2,13,0)
   gimp_plugin_icon_register (PAGE_SETUP_PROC_NAME, GIMP_ICON_TYPE_STOCK_ID,
                              (const guint8 *) GTK_STOCK_PAGE_SETUP);
-#endif
 }
 
 static void