Add some GFile version and rename the old to _by_uri

2007-11-29  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/nautilus-file-changes-queue.[ch]:
	Add some GFile version and rename the old to _by_uri
	
        * libnautilus-private/nautilus-file-operations.c:
	Emit change events
	
        * libnautilus-private/nautilus-file-operations-progress.c:
        * libnautilus-private/nautilus-file.c:
        * libnautilus-private/nautilus-icon-dnd.c:
        * libnautilus-private/nautilus-metafile.c:
        * libnautilus-private/nautilus-monitor.c:
        * src/file-manager/fm-directory-view.c:
        * src/file-manager/fm-icon-view.c:
	Update to latest APIs


svn path=/branches/gio-branch/; revision=13459

11 files changed, 68 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 90bcd123a..7bde2246e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-11-29  Alexander Larsson  <alexl@redhat.com>
+
+        * libnautilus-private/nautilus-file-changes-queue.[ch]:
+	Add some GFile version and rename the old to _by_uri
+	
+        * libnautilus-private/nautilus-file-operations.c:
+	Emit change events
+	
+        * libnautilus-private/nautilus-file-operations-progress.c:
+        * libnautilus-private/nautilus-file.c:
+        * libnautilus-private/nautilus-icon-dnd.c:
+        * libnautilus-private/nautilus-metafile.c:
+        * libnautilus-private/nautilus-monitor.c:
+        * src/file-manager/fm-directory-view.c:
+        * src/file-manager/fm-icon-view.c:
+	Update to latest APIs
+
 2007-11-23  Alexander Larsson  <alexl@redhat.com>
 
         * libnautilus-private/nautilus-file-operations.c:
diff --git a/libnautilus-private/nautilus-file-changes-queue.c b/libnautilus-private/nautilus-file-changes-queue.c
index bff9b9ed7..396742a2b 100644
--- a/libnautilus-private/nautilus-file-changes-queue.c
+++ b/libnautilus-private/nautilus-file-changes-queue.c
@@ -139,7 +139,21 @@ nautilus_file_changes_queue_add_common (NautilusFileChangesQueue *queue,
 }
 
 void
-nautilus_file_changes_queue_file_added (const char *uri)
+nautilus_file_changes_queue_file_added (GFile *location)
+{
+	NautilusFileChange *new_item;
+	NautilusFileChangesQueue *queue;
+
+	queue = nautilus_file_changes_queue_get();
+
+	new_item = g_new0 (NautilusFileChange, 1);
+	new_item->kind = CHANGE_FILE_ADDED;
+	new_item->from_uri = g_file_get_uri (location);
+	nautilus_file_changes_queue_add_common (queue, new_item);
+}
+
+void
+nautilus_file_changes_queue_file_added_by_uri (const char *uri)
 {
 	NautilusFileChange *new_item;
 	NautilusFileChangesQueue *queue;
@@ -153,7 +167,21 @@ nautilus_file_changes_queue_file_added (const char *uri)
 }
 
 void
-nautilus_file_changes_queue_file_changed (const char *uri)
+nautilus_file_changes_queue_file_changed (GFile *location)
+{
+	NautilusFileChange *new_item;
+	NautilusFileChangesQueue *queue;
+
+	queue = nautilus_file_changes_queue_get();
+
+	new_item = g_new0 (NautilusFileChange, 1);
+	new_item->kind = CHANGE_FILE_CHANGED;
+	new_item->from_uri = g_file_get_uri (location);
+	nautilus_file_changes_queue_add_common (queue, new_item);
+}
+
+void
+nautilus_file_changes_queue_file_changed_by_uri (const char *uri)
 {
 	NautilusFileChange *new_item;
 	NautilusFileChangesQueue *queue;
diff --git a/libnautilus-private/nautilus-file-changes-queue.h b/libnautilus-private/nautilus-file-changes-queue.h
index 4f50a14c8..a5fa890f3 100644
--- a/libnautilus-private/nautilus-file-changes-queue.h
+++ b/libnautilus-private/nautilus-file-changes-queue.h
@@ -26,8 +26,10 @@
 #include <gdk/gdktypes.h>
 #include <gio/gfile.h>
 
-void nautilus_file_changes_queue_file_added                      (const char *uri);
-void nautilus_file_changes_queue_file_changed                    (const char *uri);
+void nautilus_file_changes_queue_file_added                      (GFile      *location);
+void nautilus_file_changes_queue_file_added_by_uri               (const char *uri);
+void nautilus_file_changes_queue_file_changed                    (GFile      *location);
+void nautilus_file_changes_queue_file_changed_by_uri             (const char *uri);
 void nautilus_file_changes_queue_file_removed                    (GFile      *location);
 void nautilus_file_changes_queue_file_removed_by_uri             (const char *uri);
 void nautilus_file_changes_queue_file_moved                      (const char *from_uri,
diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c
index e7c13550e..e6293b50f 100644
--- a/libnautilus-private/nautilus-file-operations-progress.c
+++ b/libnautilus-private/nautilus-file-operations-progress.c
@@ -40,7 +40,7 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtkvbox.h>
 #include <glib/gi18n.h>
-#include <gio/gurifuncs.h>
+#include <glib/gurifuncs.h>
 #include "nautilus-file-operations-progress-icons.h"
 
 /* The default width of the progress dialog. It will be wider
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index b81094859..1e2dcddc7 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -63,7 +63,7 @@
 #include <libgnomevfs/gnome-vfs-volume.h>
 #include <libgnomevfs/gnome-vfs-volume-monitor.h>
 #include <gio/gfile.h>
-#include <gio/gurifuncs.h>
+#include <glib/gurifuncs.h>
 #include <gio/gioscheduler.h>
 #include "nautilus-file-changes-queue.h"
 #include "nautilus-file-private.h"
@@ -79,7 +79,7 @@ static gboolean confirm_trash_auto_value;
 /* TODO:
  *  Implement missing functions
  *  Use CommonJob in trash/delete code
- *  Queue changes and metadata ops in the copy code
+ *  Queue metadata ops in the copy code
  *  Set coords if passed in
  */
 
@@ -4984,6 +4984,7 @@ create_dest_dir (CommonJob *job,
 		}
 		return FALSE;
 	}
+	nautilus_file_changes_queue_file_added (dest);
 	return TRUE;
 }
 
@@ -5223,6 +5224,8 @@ remove_target_recursively (CommonJob *job,
 		
 		return FALSE;
 	}
+	nautilus_file_changes_queue_file_removed (file);
+	nautilus_file_changes_queue_schedule_metadata_remove (file);
 	
 	return TRUE;
 	
@@ -5309,6 +5312,9 @@ copy_file (CopyJob *copy_job,
 			g_hash_table_replace (debuting_files, g_object_ref (dest), GINT_TO_POINTER (TRUE));
 		}
 		g_object_unref (dest);
+
+		nautilus_file_changes_queue_file_added (dest);
+		/* TODO: copy metadata? */
 		return;
 	}
 
@@ -5443,6 +5449,8 @@ copy_file (CopyJob *copy_job,
 				goto out;
 				
 			}
+			nautilus_file_changes_queue_file_removed (dest);
+			nautilus_file_changes_queue_schedule_metadata_remove (dest);
 		}
 
 		copy_directory (copy_job, src, dest, same_fs,
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 5312ff9c3..e4d9f4ec1 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -56,7 +56,7 @@
 #include <gtk/gtksignal.h>
 #include <glib/gi18n.h>
 #include <gio/gcontenttype.h>
-#include <gio/gurifuncs.h>
+#include <glib/gurifuncs.h>
 #include <libgnome/gnome-macros.h>
 #include <glib/gfileutils.h>
 #include <gio/gthemedicon.h>
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index cf396d137..5ffa525a1 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -1764,7 +1764,7 @@ drag_data_received_callback (GtkWidget *widget,
 				   drag_info->direct_save_uri != NULL) {
 				GdkPoint p;
 
-				nautilus_file_changes_queue_file_added (drag_info->direct_save_uri);
+				nautilus_file_changes_queue_file_added_by_uri (drag_info->direct_save_uri);
 				p.x = x; p.y = y;
 				nautilus_file_changes_queue_schedule_position_set (drag_info->direct_save_uri,
 										   p,
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index f313b2d80..1d445882a 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -36,7 +36,7 @@
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-xml-extensions.h>
-#include <gio/gurifuncs.h>
+#include <glib/gurifuncs.h>
 #include <libxml/parser.h>
 #include <gtk/gtkmain.h>
 #include <stdlib.h>
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index 2e3cae869..ab9454f73 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -92,14 +92,14 @@ dir_changed (GDirectoryMonitor* monitor,
 		break;
 	case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
 	case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-		nautilus_file_changes_queue_file_changed (uri);
+		nautilus_file_changes_queue_file_changed (child);
 		break;
 	case G_FILE_MONITOR_EVENT_DELETED:
 		nautilus_file_changes_queue_schedule_metadata_remove_by_uri (uri);
 		nautilus_file_changes_queue_file_removed_by_uri (uri);
 		break;
 	case G_FILE_MONITOR_EVENT_CREATED:
-		nautilus_file_changes_queue_file_added (uri);
+		nautilus_file_changes_queue_file_added (child);
 		break;
 		
 	case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index a2e352393..35ce1d052 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1273,7 +1273,7 @@ action_save_search_as_callback (GtkAction *action,
 			g_free (path);
 			
 			nautilus_search_directory_save_to_file (search, uri);
-			nautilus_file_changes_queue_file_added (uri);
+			nautilus_file_changes_queue_file_added_by_uri (uri);
 			nautilus_file_changes_consume_changes (TRUE);
 			g_free (uri);
 		}
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index ed89d96af..721d7eb9c 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -49,7 +49,6 @@
 #include <gtk/gtkstock.h>
 #include <glib/gi18n.h>
 #include <gio/gcontenttype.h>
-#include <gio/gsocketoutputstream.h>
 #include <libnautilus-private/nautilus-directory-background.h>
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-dnd.h>