gnome-settings-daemon r421 - in trunk: . plugins/xsettings

[jensg svn gnome org]

Author: jensg
Date: Tue Aug  5 19:01:05 2008
New Revision: 421
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=421&view=rev

Log:
2008-08-05  Jens Granseuer  <jensgr gmx net>

	* configure.ac: require glib >= 2.17.3

	* plugins/xsettings/fontconfig-monitor.c: (monitor_files): use
	g_file_monitor instead of g_file_monitor_file/directory (bug #546372)


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/xsettings/fontconfig-monitor.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Aug  5 19:01:05 2008
@@ -43,10 +43,10 @@
 dnl ---------------------------------------------------------------------------
 
 DBUS_GLIB_REQUIRED_VERSION=0.74
-GLIB_REQUIRED_VERSION=2.15.0
+GLIB_REQUIRED_VERSION=2.17.3
 GTK_REQUIRED_VERSION=2.10.0
 GCONF_REQUIRED_VERSION=2.6.1
-GIO_REQUIRED_VERSION=2.15.0
+GIO_REQUIRED_VERSION=2.17.3
 GNOME_DESKTOP_REQUIRED_VERSION=2.23.5
 LIBNOTIFY_REQUIRED_VERSION=0.4.3
 

Modified: trunk/plugins/xsettings/fontconfig-monitor.c
==============================================================================
--- trunk/plugins/xsettings/fontconfig-monitor.c	(original)
+++ trunk/plugins/xsettings/fontconfig-monitor.c	Tue Aug  5 19:01:05 2008
@@ -46,10 +46,7 @@
 
                 file = g_file_new_for_path (str);
 
-                if (g_file_test (str, G_FILE_TEST_IS_DIR))
-                        monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, NULL);
-                else
-                        monitor = g_file_monitor_file      (file, G_FILE_MONITOR_NONE, NULL, NULL);
+                monitor = g_file_monitor (file, G_FILE_MONITOR_NONE, NULL, NULL);
 
                 g_object_unref (file);
 
@@ -130,7 +127,7 @@
         /* wait for quiescence */
         if (handle->timeout)
                 g_source_remove (handle->timeout);
-        
+
         handle->timeout = g_timeout_add_seconds (TIMEOUT_SECONDS, update, data);
 }