gnome-settings-daemon r131 - in trunk: . plugins plugins/background plugins/default-editor

[rodrigo svn gnome org]

Author: rodrigo
Date: Mon Feb 11 12:02:51 2008
New Revision: 131
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=131&view=rev

Log:
2008-02-11  Rodrigo Moya <rodrigo gnome-db org>

	Fixes bug #513990

	* plugins/background/gsd-background-manager.c: use GIO instead of
	gnome-vfs.

	* plugins/configure.ac:
	* plugins/Makefile.am:
	* plugins/default-editor/*: removed useless default editor plugin.

Removed:
   trunk/plugins/default-editor/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/Makefile.am
   trunk/plugins/background/gsd-background-manager.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Feb 11 12:02:51 2008
@@ -5,7 +5,7 @@
 m4_define([gsd_api_version],[gsd_api_version_major.gsd_api_version_minor])
 
 AC_INIT([gnome-settings-daemon],
-        [2.21.90.2],
+        [2.21.91],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
 
 AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])
@@ -44,7 +44,7 @@
 GLIB_REQUIRED_VERSION=2.13.0
 GTK_REQUIRED_VERSION=2.10.0
 GCONF_REQUIRED_VERSION=2.6.1
-GNOME_VFS_REQUIRED_VERSION=2.18.0
+GIO_REQUIRED_VERSION=2.15.0
 GNOME_DESKTOP_REQUIRED_VERSION=2.21.4
 
 EXTRA_COMPILE_WARNINGS(yes)
@@ -63,7 +63,7 @@
         gtk+-2.0 >= $GTK_REQUIRED_VERSION
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
         gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-        gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED_VERSION
+        gio-2.0 >= $GIO_REQUIRED_VERSION
         libglade-2.0 >= 2.0.0
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
 )
@@ -384,7 +384,6 @@
 plugins/background/Makefile
 plugins/background/libbackground/Makefile
 plugins/clipboard/Makefile
-plugins/default-editor/Makefile
 plugins/dummy/Makefile
 plugins/font/Makefile
 plugins/keybindings/Makefile

Modified: trunk/plugins/Makefile.am
==============================================================================
--- trunk/plugins/Makefile.am	(original)
+++ trunk/plugins/Makefile.am	Mon Feb 11 12:02:51 2008
@@ -4,7 +4,6 @@
 	a11y-keyboard	\
 	background	\
 	clipboard	\
-	default-editor	\
 	dummy		\
 	font		\
 	keybindings	\

Modified: trunk/plugins/background/gsd-background-manager.c
==============================================================================
--- trunk/plugins/background/gsd-background-manager.c	(original)
+++ trunk/plugins/background/gsd-background-manager.c	Mon Feb 11 12:02:51 2008
@@ -36,7 +36,6 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gconf/gconf-client.h>
-#include <libgnomevfs/gnome-vfs.h>
 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-bg.h>
@@ -409,8 +408,6 @@
 gsd_background_manager_init (GsdBackgroundManager *manager)
 {
         manager->priv = GSD_BACKGROUND_MANAGER_GET_PRIVATE (manager);
-
-        gnome_vfs_init ();
 }
 
 static void