Merge lp:~rye/ubuntuone-client/bring-emblems-back into lp:ubuntuone-client

[Roman Yepishev]

Create the missing u1_fs dbus proxy, and unref it when done

[Roman Yepishev (rye)]

Depends on add-marshallers branch for proper callbacks support.

[Vincenzo Di Somma (vds)]

Could you please describe what this branch does?

[Roman Yepishev (rye)]

> Could you please describe what this branch does?

This branch adds missing dbus proxy that was preventing calls to syncdaemon for file info. Additionally, it fixes the path for updated & needsupdating hash tables and file emblem updates (utime call is then replaced by stop-killing-thumbnails branch)

[dobey (dobey)]

+ new_path = g_strdup_printf ("%s/%s", uon->managed, path);

This should be g_build_filename (uon->managed, path, NULL); instead. Although, we'll need to get the full path in some other way, since this won't work once user defined folders are working in syncdaemon. The path and uon->managed might not match up, and we don't want to have to iterate through a potentially large list, checking that the file exists for each one (ignore the fact that the same filename might exist in multiple folders as well).

review: Needs Fixing

[dobey (dobey)]

Also, as discussed in IRC, we will need to have the syncdaemon give us the full path. Filing a bug right now, and making a branch to fix it. :)

[lp:~rye/ubuntuone-client/bring-emblems-back]

297. By Roman Yepishev on 2009-12-18

Changed printf path construct to g_build_filename

[Roman Yepishev (rye)]

- new_path = g_strdup_printf ("%s/%s", uon->managed, path);
+ new_path = g_build_filename (uon->managed, path, NULL);

Done.

[dobey (dobey)]

29 - new_path = g_strdup (path);
30 + new_path = g_build_filename (uon->managed, path, NULL);

Can you please revert this change so that it is just "new_path = g_strdup (path);" again? The changes in https://edge.launchpad.net/~dobey/ubuntuone-client/getmetadata-fullpath/+merge/16340 fix syncdaemon to just return the full path instead, which will give us the desired results, and is a better fix. :)

review: Needs Fixing

[lp:~rye/ubuntuone-client/bring-emblems-back]

298. By Roman Yepishev on 2009-12-18

Since syncdaemon now returns full path (#498224), no g_build_filename is necessary

[Roman Yepishev (rye)]

> Can you please revert this change so that it is just "new_path = g_strdup
> (path);" again?

Done :)

[dobey (dobey)]

My branch has landed, and this looks good to me. Thanks!

review: Approve

[John O'Brien (jdobrien)]

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2009-12-18 22:26:17 +0000
+++ nautilus/ubuntuone-nautilus.c	2009-12-18 22:26:17 +0000
@@ -593,6 +593,10 @@
 					      "com.ubuntuone.SyncDaemon",
 					      "/shares",
 					      "com.ubuntuone.SyncDaemon.Shares");
+  uon->u1_fs     = dbus_g_proxy_new_for_name (uon->bus,
+					      "com.ubuntuone.SyncDaemon",
+					      "/filesystem",
+					      "com.ubuntuone.SyncDaemon.FileSystem");
 
   /* Default to ~/Ubuntu One for now, as it's all we really support */
   uon->managed = g_build_filename (g_get_home_dir (), "Ubuntu One", NULL);
@@ -708,6 +712,9 @@
   if (uon->u1_shares)
     g_object_unref (uon->u1_shares);
 
+  if (uon->u1_fs)
+    g_object_unref (uon->u1_fs);
+
   if (uon->bus)
     g_object_unref (uon->bus);
 
@@ -826,7 +833,7 @@
     g_hash_table_replace (uon->updated, new_path, new_path);
   else
     g_hash_table_replace (uon->needsupdating, new_path, new_path);
-  utime (path, NULL);
+  utime (new_path, NULL);
 }
 
 static void ubuntuone_nautilus_state_toggled (DBusGProxy * proxy,