nautilus r13597 - in trunk: . libnautilus-private src

[alexl svn gnome org]

Author: alexl
Date: Mon Jan 14 15:11:51 2008
New Revision: 13597
URL: http://svn.gnome.org/viewvc/nautilus?rev=13597&view=rev

Log:
2008-01-14  Alexander Larsson  <alexl redhat com>

	* configure.in:
	Require glib 2.15.2

        * libnautilus-private/nautilus-file-utilities.c:
        * libnautilus-private/nautilus-monitor.c:
        * libnautilus-private/nautilus-trash-monitor.c:
        * src/nautilus-bookmark-list.c:
	Update to new gio API.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libnautilus-private/nautilus-file-utilities.c
   trunk/libnautilus-private/nautilus-monitor.c
   trunk/libnautilus-private/nautilus-trash-monitor.c
   trunk/src/nautilus-bookmark-list.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jan 14 15:11:51 2008
@@ -6,7 +6,7 @@
 m4_define(bonobo_minver,               2.1.0)
 m4_define(eel_minver,                  2.21.1)
 m4_define(esound_minver,               0.2.27)
-m4_define(glib_minver,                 2.15.1)
+m4_define(glib_minver,                 2.15.2)
 m4_define(gnome_desktop_minver,        2.9.91)
 m4_define(gnome_minver,                2.14.0)
 m4_define(gnome_ui_minver,             2.6.0)

Modified: trunk/libnautilus-private/nautilus-file-utilities.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-utilities.c	(original)
+++ trunk/libnautilus-private/nautilus-file-utilities.c	Mon Jan 14 15:11:51 2008
@@ -365,7 +365,7 @@
 		config_file = g_build_filename (g_get_user_config_dir (),
 						     "user-dirs.dirs", NULL);
 		file = g_file_new_for_path (config_file);
-		cached_xdg_dirs_monitor = g_file_monitor_file (file, 0, NULL);
+		cached_xdg_dirs_monitor = g_file_monitor_file (file, 0, NULL, NULL);
 		g_signal_connect (cached_xdg_dirs_monitor, "changed",
 				  G_CALLBACK (xdg_dir_cache_changed_cb), NULL);
 		g_object_unref (file);

Modified: trunk/libnautilus-private/nautilus-monitor.c
==============================================================================
--- trunk/libnautilus-private/nautilus-monitor.c	(original)
+++ trunk/libnautilus-private/nautilus-monitor.c	Mon Jan 14 15:11:51 2008
@@ -46,7 +46,7 @@
 
 	if (tried_monitor == FALSE) {	
 		file = g_file_new_for_path (g_get_home_dir ());
-		dir_monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL);
+		dir_monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, NULL);
 		g_object_unref (file);
 		
 		monitor_success = (dir_monitor != NULL);
@@ -124,7 +124,7 @@
 	GFileMonitor *dir_monitor;
 	NautilusMonitor *ret;
 
-	dir_monitor = g_file_monitor_directory (location, G_FILE_MONITOR_WATCH_MOUNTS, NULL);
+	dir_monitor = g_file_monitor_directory (location, G_FILE_MONITOR_WATCH_MOUNTS, NULL, NULL);
 
 	if (dir_monitor == NULL) {
 		return NULL;

Modified: trunk/libnautilus-private/nautilus-trash-monitor.c
==============================================================================
--- trunk/libnautilus-private/nautilus-trash-monitor.c	(original)
+++ trunk/libnautilus-private/nautilus-trash-monitor.c	Mon Jan 14 15:11:51 2008
@@ -176,7 +176,7 @@
 
 	location = g_file_new_for_uri ("trash:///");
 
-	trash_monitor->details->file_monitor = g_file_monitor_file (location, 0, NULL);
+	trash_monitor->details->file_monitor = g_file_monitor_file (location, 0, NULL, NULL);
 
 	g_signal_connect (trash_monitor->details->file_monitor, "changed",
 			  (GCallback)file_changed, trash_monitor);

Modified: trunk/src/nautilus-bookmark-list.c
==============================================================================
--- trunk/src/nautilus-bookmark-list.c	(original)
+++ trunk/src/nautilus-bookmark-list.c	Mon Jan 14 15:11:51 2008
@@ -162,7 +162,7 @@
 	nautilus_bookmark_list_load_file (bookmarks);
 
 	file = nautilus_bookmark_list_get_file ();
-	bookmarks->monitor = g_file_monitor_file (file, 0, NULL);
+	bookmarks->monitor = g_file_monitor_file (file, 0, NULL, NULL);
 	g_signal_connect (bookmarks->monitor, "changed",
 			  G_CALLBACK (bookmark_monitor_changed_cb), bookmarks);
 
@@ -570,7 +570,7 @@
 		g_error_free (error);
 
 	/* re-enable bookmark file monitoring */
-	bookmarks->monitor = g_file_monitor_file (file, 0, NULL);
+	bookmarks->monitor = g_file_monitor_file (file, 0, NULL, NULL);
 	g_signal_connect (bookmarks->monitor, "changed",
 			  G_CALLBACK (bookmark_monitor_changed_cb), bookmarks);