gvfs r1077 - in trunk: . client daemon programs

[alexl svn gnome org]

Author: alexl
Date: Mon Jan  7 13:46:31 2008
New Revision: 1077
URL: http://svn.gnome.org/viewvc/gvfs?rev=1077&view=rev

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

        * client/Makefile.am:
        * client/gdaemondirectorymonitor.[ch]:
        * client/gdaemonfile.c:
        * daemon/gvfsbackendtrash.c:
        * programs/gvfs-monitor-dir.c:
	Update to handle removed GDirectoryMonitor from
	API.
	
        * daemon/gvfsbackendsftp.c:
	Fix warnings




Removed:
   trunk/client/gdaemondirectorymonitor.c
   trunk/client/gdaemondirectorymonitor.h
Modified:
   trunk/ChangeLog
   trunk/client/Makefile.am
   trunk/client/gdaemonfile.c
   trunk/daemon/gvfsbackendsftp.c
   trunk/daemon/gvfsbackendtrash.c
   trunk/programs/gvfs-monitor-dir.c

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Mon Jan  7 13:46:31 2008
@@ -1,5 +1,18 @@
 2008-01-07  Alexander Larsson  <alexl redhat com>
 
+        * client/Makefile.am:
+        * client/gdaemondirectorymonitor.[ch]:
+        * client/gdaemonfile.c:
+        * daemon/gvfsbackendtrash.c:
+        * programs/gvfs-monitor-dir.c:
+	Update to handle removed GDirectoryMonitor from
+	API.
+	
+        * daemon/gvfsbackendsftp.c:
+	Fix warnings
+
+2008-01-07  Alexander Larsson  <alexl redhat com>
+
         * daemon/gvfsbackendsftp.c:
 	Remove debug spew
 	

Modified: trunk/client/Makefile.am
==============================================================================
--- trunk/client/Makefile.am	(original)
+++ trunk/client/Makefile.am	Mon Jan  7 13:46:31 2008
@@ -30,7 +30,6 @@
 	gdaemonfileinputstream.c gdaemonfileinputstream.h \
 	gdaemonfileoutputstream.c gdaemonfileoutputstream.h \
 	gdaemonfileenumerator.c gdaemonfileenumerator.h \
-	gdaemondirectorymonitor.c gdaemondirectorymonitor.h \
 	gdaemonfilemonitor.c gdaemonfilemonitor.h \
 	gvfsdaemondbus.c gvfsdaemondbus.h \
 	gvfsuriutils.c gvfsuriutils.h \

Modified: trunk/client/gdaemonfile.c
==============================================================================
--- trunk/client/gdaemonfile.c	(original)
+++ trunk/client/gdaemonfile.c	Mon Jan  7 13:46:31 2008
@@ -34,7 +34,6 @@
 #include <gvfsdaemonprotocol.h>
 #include <gdaemonfileinputstream.h>
 #include <gdaemonfileoutputstream.h>
-#include <gdaemondirectorymonitor.h>
 #include <gdaemonfilemonitor.h>
 #include <gdaemonfileenumerator.h>
 #include <glib/gi18n-lib.h>
@@ -1843,12 +1842,12 @@
   return TRUE;
 }
 
-static GDirectoryMonitor*
+static GFileMonitor*
 g_daemon_file_monitor_dir (GFile* file,
 			   GFileMonitorFlags flags,
 			   GCancellable *cancellable)
 {
-  GDirectoryMonitor *monitor;
+  GFileMonitor *monitor;
   char *obj_path;
   dbus_uint32_t flags_dbus;
   GMountInfo *mount_info;
@@ -1881,8 +1880,8 @@
       return NULL;
     }
   
-  monitor = g_daemon_directory_monitor_new (mount_info->dbus_id,
-					    obj_path);
+  monitor = g_daemon_file_monitor_new (mount_info->dbus_id,
+				       obj_path);
   
   g_mount_info_unref (mount_info);
   dbus_message_unref (reply);

Modified: trunk/daemon/gvfsbackendsftp.c
==============================================================================
--- trunk/daemon/gvfsbackendsftp.c	(original)
+++ trunk/daemon/gvfsbackendsftp.c	Mon Jan  7 13:46:31 2008
@@ -406,7 +406,7 @@
   GDataOutputStream *data_stream;
   guint32 id;
 
-  mem_stream = g_memory_output_stream_new (NULL, 0, g_realloc, NULL);
+  mem_stream = g_memory_output_stream_new (NULL, 0, (GReallocFunc)g_realloc, NULL);
   data_stream = g_data_output_stream_new (mem_stream);
   g_object_unref (mem_stream);
 
@@ -428,7 +428,6 @@
 {
   GOutputStream *mem_stream;
   gpointer data;
-  GByteArray *array;
   guint32 *len_ptr;
   
   mem_stream = g_filter_output_stream_get_base_stream (G_FILTER_OUTPUT_STREAM (command_stream));

Modified: trunk/daemon/gvfsbackendtrash.c
==============================================================================
--- trunk/daemon/gvfsbackendtrash.c	(original)
+++ trunk/daemon/gvfsbackendtrash.c	Mon Jan  7 13:46:31 2008
@@ -103,7 +103,7 @@
   /* All these are protected by the root_monitor lock */
   GVfsMonitor *file_vfs_monitor;
   GVfsMonitor *vfs_monitor;
-  GList *trash_dir_monitors; /* GDirectoryMonitor objects */
+  GList *trash_dir_monitors; /* GFileMonitor objects */
   GUnixMountMonitor *mount_monitor;
   gboolean trash_file_update_running;
   gboolean trash_file_update_scheduled;
@@ -1365,7 +1365,7 @@
 }
 
 static void
-trash_dir_changed (GDirectoryMonitor      *monitor,
+trash_dir_changed (GFileMonitor           *monitor,
                    GFile                  *child,
                    GFile                  *other_file,
                    GFileMonitorEvent       event_type,
@@ -1381,7 +1381,7 @@
 {
   GFile *file;
   char *trashdir;
-  GDirectoryMonitor *monitor;
+  GFileMonitor *monitor;
   GList *monitors, *l, *trashdirs;
 
   /* Remove old monitors */
@@ -1575,7 +1575,7 @@
     {
       GFile *file;
       char *path;
-      GDirectoryMonitor *monitor;
+      GFileMonitor *monitor;
       MonitorProxy *proxy;
       
       path = g_build_filename (trashdir, "files", trashfile, relative_path, NULL);

Modified: trunk/programs/gvfs-monitor-dir.c
==============================================================================
--- trunk/programs/gvfs-monitor-dir.c	(original)
+++ trunk/programs/gvfs-monitor-dir.c	Mon Jan  7 13:46:31 2008
@@ -37,7 +37,7 @@
 };
 
 static gboolean
-dir_monitor_callback (GDirectoryMonitor* monitor,
+dir_monitor_callback (GFileMonitor* monitor,
 		      GFile* child,
 		      GFile* other_file,
 		      GFileMonitorEvent eflags)
@@ -80,7 +80,7 @@
 int
 main (int argc, char *argv[])
 {
-  GDirectoryMonitor* dmonitor;
+  GFileMonitor* dmonitor;
   GError *error;
   GOptionContext *context;
   GFile *file;