gnome-desktop r5275 - in trunk: . libgnome-desktop

[vuntz svn gnome org]

Author: vuntz
Date: Wed Nov  5 13:01:54 2008
New Revision: 5275
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5275&view=rev

Log:
2008-11-05  Vincent Untz  <vuntz gnome org>

	* configure.in: require glib 2.19.1 again


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-desktop-thumbnail.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Nov  5 13:01:54 2008
@@ -71,7 +71,7 @@
 
 GDK_PIXBUF_REQUIRED=2.4.0
 GTK_REQUIRED=2.11.3
-GLIB_REQUIRED=2.18.0
+GLIB_REQUIRED=2.19.1
 GCONF_REQUIRED=2.0.0
 STARTUP_NOTIFICATION_REQUIRED=0.5
 XRANDR_REQUIRED=1.2

Modified: trunk/libgnome-desktop/gnome-desktop-thumbnail.c
==============================================================================
--- trunk/libgnome-desktop/gnome-desktop-thumbnail.c	(original)
+++ trunk/libgnome-desktop/gnome-desktop-thumbnail.c	Wed Nov  5 13:01:54 2008
@@ -137,9 +137,7 @@
     gboolean has_frame;
     SizePrepareContext info;
     GFile *file;
-#if 0
     GFileInfo *file_info;
-#endif
     GInputStream *input_stream;
 
     g_return_val_if_fail (uri != NULL, NULL);
@@ -148,7 +146,6 @@
 
     file = g_file_new_for_uri (uri);
 
-#if 0
     /* First see if we can get an input stream via preview::icon  */
     file_info = g_file_query_info (file,
                                    G_FILE_ATTRIBUTE_PREVIEW_ICON,
@@ -169,7 +166,6 @@
         }
         g_object_unref (file_info);
     }
-#endif
 
     if (input_stream == NULL) {
         input_stream = G_INPUT_STREAM (g_file_read (file, NULL, NULL));