Update to new glib 2.15.2 API, bump glib dep and remove a

remaining gnome-vfs bit from configure.ac.

svn path=/trunk/; revision=7864

5 files changed, 9 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index 9972b03a0..6d92db6e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,16 +90,15 @@ GECKO_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
 if test "$enable_maintainer_mode" = "yes"; then
 	AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
 	enable_debug=yes
-	DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+	DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 	GECKO_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $GECKO_WARN_CXXFLAGS"
 fi
 
-GLIB_REQUIRED=2.15.1
+GLIB_REQUIRED=2.15.2
 GTK_REQUIRED=2.11.6
 LIBXML_REQUIRED=2.6.12
 LIBXSLT_REQUIRED=1.1.7
 LIBGLADE_REQUIRED=2.3.1
-LIBGNOMEVFS_REQUIRED=2.9.2
 LIBGNOME_REQUIRED=2.14.0
 LIBGNOMEUI_REQUIRED=2.14.0
 GNOME_DESKTOP_REQUIRED=2.9.91
diff --git a/embed/ephy-base-embed.c b/embed/ephy-base-embed.c
index 4d57c496c..802f8c15e 100644
--- a/embed/ephy-base-embed.c
+++ b/embed/ephy-base-embed.c
@@ -1397,7 +1397,7 @@ ephy_base_embed_update_file_monitor (EphyBaseEmbed *embed,
   g_object_unref (file_info);
 
   if (file_type == G_FILE_TYPE_DIRECTORY) {
-    monitor = g_file_monitor_directory (file, 0, NULL);
+    monitor = g_file_monitor_directory (file, 0, NULL, NULL);
     g_signal_connect (monitor, "changed",
                       G_CALLBACK (ephy_base_embed_file_monitor_cb),
                       embed);
@@ -1405,7 +1405,7 @@ ephy_base_embed_update_file_monitor (EphyBaseEmbed *embed,
     LOG ("Installed monitor for directory '%s'", address);
   }
   else if (file_type == G_FILE_TYPE_REGULAR) {
-    monitor = g_file_monitor_file (file, 0, NULL);
+    monitor = g_file_monitor_file (file, 0, NULL, NULL);
     g_signal_connect (monitor, "changed",
                       G_CALLBACK (ephy_base_embed_file_monitor_cb),
                       embed);
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 05f081fac..79b513c29 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -516,7 +516,8 @@ user_css_enabled_notify (GConfClient *client,
 		g_assert (priv->user_css_file_monitor == NULL);
 		priv->user_css_file_monitor =
 			g_file_monitor_file (file,
-					     G_FILE_MONITOR_NONE, NULL);
+					     G_FILE_MONITOR_NONE,
+					     NULL, NULL);
 		g_file_monitor_set_rate_limit (priv->user_css_file_monitor,
 					       USER_CSS_LOAD_DELAY);
 		g_signal_connect (priv->user_css_file_monitor, "changed",
diff --git a/embed/xulrunner/embed/mozilla-embed-single.cpp b/embed/xulrunner/embed/mozilla-embed-single.cpp
index 437d656bf..d5c3974e2 100644
--- a/embed/xulrunner/embed/mozilla-embed-single.cpp
+++ b/embed/xulrunner/embed/mozilla-embed-single.cpp
@@ -511,7 +511,8 @@ user_css_enabled_notify (GConfClient *client,
 		g_assert (priv->user_css_file_monitor == NULL);
 		priv->user_css_file_monitor =
 			g_file_monitor_file (file,
-					     G_FILE_MONITOR_NONE, NULL);
+					     G_FILE_MONITOR_NONE,
+					     NULL, NULL);
 		g_file_monitor_set_rate_limit (priv->user_css_file_monitor,
 					       USER_CSS_LOAD_DELAY);
 		g_signal_connect (priv->user_css_file_monitor, "changed",
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index 10aa75f9c..069d4691e 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -1059,7 +1059,7 @@ ephy_extensions_manager_load_dir (EphyExtensionsManager *manager,
 	closedir (d);
 
 	directory = g_file_new_for_path (path);
-	monitor = g_file_monitor_directory (directory, 0, NULL);
+	monitor = g_file_monitor_directory (directory, 0, NULL, NULL);
 
 	if (monitor != NULL)
 	{