Author: alexl
Date: Mon Jan 28 19:50:35 2008
New Revision: 1189
URL: http://svn.gnome.org/viewvc/gvfs?rev=1189&view=rev
Log:
2008-01-28 Alexander Larsson <[EMAIL PROTECTED]>
* client/gdaemonfile.c (g_daemon_file_move):
Fix typo G_DAEMON_FILE -> G_IS_DAEMON_FILE
* configure.ac:
Require glib >= 2.15.4
* client/gdaemonvfs.c:
* client/gdaemonvolumemonitor.c:
* hal/ghalvolumemonitor.c:
Register with the new extension points API.
Modified:
trunk/ChangeLog
trunk/client/gdaemonfile.c
trunk/client/gdaemonvfs.c
trunk/client/gdaemonvolumemonitor.c
trunk/configure.ac
trunk/hal/ghalvolumemonitor.c
Modified: trunk/client/gdaemonfile.c
==============================================================================
--- trunk/client/gdaemonfile.c (original)
+++ trunk/client/gdaemonfile.c Mon Jan 28 19:50:35 2008
@@ -1966,8 +1966,8 @@
dbus_uint32_t flags_dbus;
struct ProgressCallbackData data;
- if (!G_DAEMON_FILE (source) ||
- !G_DAEMON_FILE (destination))
+ if (!G_IS_DAEMON_FILE (source) ||
+ !G_IS_DAEMON_FILE (destination))
{
/* Fall back to default move */
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Move not
supported");
Modified: trunk/client/gdaemonvfs.c
==============================================================================
--- trunk/client/gdaemonvfs.c (original)
+++ trunk/client/gdaemonvfs.c Mon Jan 28 19:50:35 2008
@@ -769,9 +769,6 @@
vfs_class = G_VFS_CLASS (class);
- vfs_class->name = "gvfs";
- vfs_class->priority = 10;
-
vfs_class->is_active = g_daemon_vfs_is_active;
vfs_class->get_file_for_path = g_daemon_vfs_get_file_for_path;
vfs_class->get_file_for_uri = g_daemon_vfs_get_file_for_uri;
@@ -791,6 +788,11 @@
g_daemon_vfs_register_type (G_TYPE_MODULE (module));
g_daemon_volume_monitor_register_types (G_TYPE_MODULE (module));
+ g_io_extension_point_implement (G_VFS_EXTENSION_POINT_NAME,
+ G_TYPE_DAEMON_VFS,
+ "gvfs",
+ 10);
+
g_vfs_uri_mapper_register (module);
g_vfs_uri_mapper_smb_register (module);
g_vfs_uri_mapper_sftp_register (module);
Modified: trunk/client/gdaemonvolumemonitor.c
==============================================================================
--- trunk/client/gdaemonvolumemonitor.c (original)
+++ trunk/client/gdaemonvolumemonitor.c Mon Jan 28 19:50:35 2008
@@ -252,4 +252,8 @@
g_daemon_volume_monitor_register_types (GTypeModule *module)
{
g_daemon_volume_monitor_register_type (G_TYPE_MODULE (module));
+ g_io_extension_point_implement (G_VOLUME_MONITOR_EXTENSION_POINT_NAME,
+ G_TYPE_DAEMON_VOLUME_MONITOR,
+ "gvfs",
+ 0);
}
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jan 28 19:50:35 2008
@@ -39,7 +39,7 @@
DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.15.2 gthread-2.0 gobject-2.0
gmodule-no-export-2.0 gio-unix-2.0 gio-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.15.4 gthread-2.0 gobject-2.0
gmodule-no-export-2.0 gio-unix-2.0 gio-2.0)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
Modified: trunk/hal/ghalvolumemonitor.c
==============================================================================
--- trunk/hal/ghalvolumemonitor.c (original)
+++ trunk/hal/ghalvolumemonitor.c Mon Jan 28 19:50:35 2008
@@ -1183,4 +1183,8 @@
g_hal_volume_monitor_register (GIOModule *module)
{
g_hal_volume_monitor_register_type (G_TYPE_MODULE (module));
+ g_io_extension_point_implement (G_NATIVE_VOLUME_MONITOR_EXTENSION_POINT_NAME,
+ G_TYPE_HAL_VOLUME_MONITOR,
+ "hal",
+ 1);
}
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
