Merge lp:~dobey/ubuntuone-client/fix-744383 into lp:ubuntuone-client/stable-1-4

[dobey]

Default to using volume_id if owner_id is not in the dict
Properly call the parent dispose

[lp:~dobey/ubuntuone-client/fix-744383]

752. By dobey on 2011-04-05

Fix a warning

[Natalia Bidart (nataliabidart)]

review: Approve

[Eric Casteleijn (thisfred)]

review: Approve

=== modified file 'gsd-plugin/gsd-ubuntuone.c'
--- gsd-plugin/gsd-ubuntuone.c	2011-01-19 18:52:53 +0000
+++ gsd-plugin/gsd-ubuntuone.c	2011-04-05 18:52:43 +0000
@@ -143,6 +143,8 @@
 
         volume_type = g_hash_table_lookup (file_info, "type");
         owner_id = g_hash_table_lookup (file_info, "owner_id");
+        if (owner_id == NULL)
+            owner_id = g_hash_table_lookup (file_info, "volume_id");
         data = g_hash_table_lookup (plugin->map_quota_dialogs, owner_id);
 
         if (data == NULL) {
@@ -308,8 +310,6 @@
 gsd_ubuntuone_dispose (GObject *object)
 {
 	GsdUbuntuOne *plugin = GSD_UBUNTUONE (object);
-	GsdUbuntuOneClass *klass = GSD_UBUNTUONE_GET_CLASS (object);
-	GObjectClass *parent_class = G_OBJECT_CLASS (klass);
 
 	if (plugin->syncdaemon != NULL)
                 g_object_unref (plugin->syncdaemon);
@@ -317,7 +317,7 @@
         if (plugin->map_quota_dialogs != NULL)
                 g_hash_table_destroy (plugin->map_quota_dialogs);
 
-	parent_class->dispose (object);
+	G_OBJECT_CLASS (gsd_ubuntuone_parent_class)->dispose (object);
 }
 
 static void
@@ -329,3 +329,4 @@
 	g_class->dispose = gsd_ubuntuone_dispose;
 	gsp_class->activate = gsd_ubuntuone_activate;
 }
+
 
=== modified file 'gsd-plugin/test-send-signal.py'
--- gsd-plugin/test-send-signal.py	2011-01-13 16:38:00 +0000
+++ gsd-plugin/test-send-signal.py	2011-04-05 18:52:43 +0000
@@ -33,7 +33,6 @@
 OBJECT_INTERFACE = "com.ubuntuone.SyncDaemon.SyncDaemon"
 SAMPLE_VOLUME_INFO = {
     "volume_id": "sample_volume_id",
-    "owner_id": "sample_owner_id",
     "volume_name": "sample_volume_name",
     "type": "UDF",
 }
@@ -46,6 +45,7 @@
     "path": "~/A shared folder",
 }
 
+
 class SyncDaemonMocker(dbus.service.Object):
     def __init__(self, conn, object_path=OBJECT_PATH):
         dbus.service.Object.__init__(self, conn, object_path)
@@ -68,15 +68,15 @@
 
     bus = dbus.SessionBus()
     name = dbus.service.BusName(OBJECT_NAME, bus)
-    object = SyncDaemonMocker(bus)
+    sd = SyncDaemonMocker(bus)
 
     main_loop = gobject.MainLoop()
 
     if "-d" not in sys.argv:
         if "-3" in sys.argv:
-            gobject.timeout_add(10, object.QuotaExceeded, SAMPLE_SHARE_INFO)
+            gobject.timeout_add(10, sd.QuotaExceeded, SAMPLE_SHARE_INFO)
         else:
-            gobject.timeout_add(10, object.QuotaExceeded, SAMPLE_VOLUME_INFO)
+            gobject.timeout_add(10, sd.QuotaExceeded, SAMPLE_VOLUME_INFO)
         gobject.timeout_add(200, main_loop.quit)
 
     main_loop.run()