Commit 07ff14e5 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Require glib 2.15.2

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.


svn path=/trunk/; revision=13597
parent 3c33b98d
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.
2008-01-14 Alexander Larsson <alexl@redhat.com>
* src/file-manager/fm-directory-view.c:
......
......@@ -6,7 +6,7 @@ m4_define(bonobo_activation_minver, 2.1.0)
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)
......
......@@ -365,7 +365,7 @@ update_xdg_dir_cache (void)
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);
......
......@@ -46,7 +46,7 @@ nautilus_monitor_active (void)
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 @@ nautilus_monitor_directory (GFile *location)
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;
......
......@@ -176,7 +176,7 @@ nautilus_trash_monitor_init (NautilusTrashMonitor *trash_monitor)
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);
......
......@@ -162,7 +162,7 @@ nautilus_bookmark_list_init (NautilusBookmarkList *bookmarks)
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 @@ error:
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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment