Merge lp:~dobey/ubuntu/natty/ubuntuone-control-panel/release-0-8-3 into lp:ubuntu/natty/ubuntuone-control-panel

[dobey]

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-02-04 20:02:28 +0000
+++ PKG-INFO	2011-02-12 03:22:55 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntuone-control-panel
-Version: 0.8.2
+Version: 0.8.3
 Summary: Ubuntu One Control Panel
 Home-page: https://launchpad.net/ubuntuone-control-panel
 Author: Natalia Bidart
@@ -8,4 +8,26 @@
 License: GPL v3
 Description: Application to manage a Ubuntu One account. Provides aDBus service to query/modify all the Ubuntu One bits.
 Platform: UNKNOWN
+Requires: apt
+Requires: aptdaemon
+Requires: dbus
+Requires: defer
+Requires: desktopcouch.application.replication_services
+Requires: gi.repository
+Requires: gobject
+Requires: gtk
+Requires: mocker
+Requires: oauth
+Requires: pango
+Requires: simplejson
+Requires: twisted.application
+Requires: twisted.internet
+Requires: twisted.python.failure
+Requires: twisted.web
+Requires: ubuntu_sso
+Requires: ubuntuone.clientdefs
+Requires: ubuntuone.devtools.handlers
+Requires: ubuntuone.devtools.testcase
+Requires: ubuntuone.logger
+Requires: ubuntuone.platform.linux
 Provides: ubuntuone.controlpanel
 
=== added file 'data/contacts.png'
 Binary files data/contacts.png	1970-01-01 00:00:00 +0000 and data/contacts.png	2011-02-12 03:22:55 +0000 differ
=== modified file 'data/device.ui'
--- data/device.ui	2011-01-25 19:08:59 +0000
+++ data/device.ui	2011-02-12 03:22:55 +0000
@@ -154,7 +154,7 @@
         <child>
           <object class="GtkVButtonBox" id="vbuttonbox1">
             <property name="visible">True</property>
-            <property name="layout_style">center</property>
+            <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="remove">
                 <property name="label">gtk-remove</property>
 
=== added file 'data/files.png'
 Binary files data/files.png	1970-01-01 00:00:00 +0000 and data/files.png	2011-02-12 03:22:55 +0000 differ
=== modified file 'data/management.ui'
--- data/management.ui	2011-01-25 19:08:59 +0000
+++ data/management.ui	2011-02-12 03:22:55 +0000
@@ -20,25 +20,14 @@
                 <property name="border_width">10</property>
                 <property name="spacing">10</property>
                 <child>
-                  <object class="GtkHBox" id="quota_box">
+                  <object class="GtkVBox" id="quota_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment1">
+                      <object class="GtkProgressBar" id="quota_progressbar">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xscale">0</property>
-                        <property name="yscale">0</property>
-                        <child>
-                          <object class="GtkProgressBar" id="quota_progressbar">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                        </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -117,7 +106,6 @@
                             <property name="label" translatable="yes">Shares</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="draw_indicator">False</property>
                             <property name="group">dashboard_button</property>
                           </object>
@@ -133,7 +121,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="draw_indicator">False</property>
                             <property name="group">dashboard_button</property>
                           </object>
@@ -148,7 +135,6 @@
                             <property name="label" translatable="yes">Services</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="draw_indicator">False</property>
                             <property name="group">dashboard_button</property>
                           </object>
@@ -161,44 +147,36 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHSeparator" id="hseparator2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="pixbuf">banner.png</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -207,21 +185,17 @@
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkNotebook" id="notebook">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="show_tabs">False</property>
         <property name="show_border">False</property>
         <property name="homogeneous">True</property>
       </object>
       <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
 
=== added file 'data/music.png'
 Binary files data/music.png	1970-01-01 00:00:00 +0000 and data/music.png	2011-02-12 03:22:55 +0000 differ
=== added file 'data/notes.png'
 Binary files data/notes.png	1970-01-01 00:00:00 +0000 and data/notes.png	2011-02-12 03:22:55 +0000 differ
=== modified file 'data/overview.ui'
--- data/overview.ui	2011-01-25 19:08:59 +0000
+++ data/overview.ui	2011-02-12 03:22:55 +0000
@@ -4,74 +4,263 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkVBox" id="itself">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkImage" id="image">
+      <object class="GtkEventBox" id="header">
         <property name="visible">True</property>
-        <property name="pixbuf">overview.png</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkImage" id="image">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="pixbuf">overview.png</property>
+          </object>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
     <child>
-      <object class="GtkAlignment" id="alignment1">
+      <object class="GtkScrolledWindow" id="scrolledwindow1">
         <property name="visible">True</property>
-        <property name="yscale">0</property>
+        <property name="can_focus">True</property>
+        <property name="hscrollbar_policy">automatic</property>
+        <property name="vscrollbar_policy">automatic</property>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkViewport" id="viewport1">
             <property name="visible">True</property>
-            <property name="border_width">20</property>
-            <property name="spacing">5</property>
+            <property name="can_focus">False</property>
+            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkVBox" id="messages">
+              <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
-                <property name="spacing">10</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">20</property>
+                <property name="spacing">5</property>
                 <child>
-                  <placeholder/>
+                  <object class="GtkTable" id="table1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="n_rows">4</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">10</property>
+                    <property name="row_spacing">10</property>
+                    <child>
+                      <object class="GtkImage" id="image1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="pixbuf">files.png</property>
+                      </object>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="image2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="pixbuf">contacts.png</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="image3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="pixbuf">music.png</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="image4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="pixbuf">notes.png</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Files Anywhere
+&lt;span foreground="#909090"&gt;Backup and access your files from Windows, Ubuntu, or Mobile&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Keep connected
+&lt;span foreground="#909090"&gt;Unify your contacts accress Desktop, Mobile and Web&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Rock Out
+&lt;span foreground="#909090"&gt;Your library at your fingertips with Android, iPhone, and AirPlay
+Plus the Ubuntu One Music store to grow your collection&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Stay Productive
+&lt;span foreground="#909090"&gt;Keep your Firefox bookmarks and Tomboy notes synced&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkAlignment" id="alignment2">
-                <property name="visible">True</property>
-                <property name="xscale">0</property>
-                <property name="yscale">0</property>
                 <child>
-                  <object class="GtkVBox" id="vbox2">
+                  <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
-                    <property name="spacing">10</property>
-                    <child>
-                      <object class="GtkButton" id="join_now_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">True</property>
-                        <signal name="clicked" handler="on_join_now_button_clicked"/>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLabel" id="warning_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
                         <child>
-                          <object class="GtkVBox" id="vbox1">
+                          <object class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
-                            <property name="spacing">5</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">10</property>
                             <child>
-                              <object class="GtkLabel" id="label1">
+                              <object class="GtkButton" id="join_now_button">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;span font_size="xx-large"&gt;Join now&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="can_default">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
+                                <child>
+                                  <object class="GtkVBox" id="vbox3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">&lt;span font_size="xx-large"&gt;Join now&lt;/span&gt;</property>
+                                        <property name="use_markup">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label2">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;2GB of free storage&lt;/span&gt;</property>
+                                        <property name="use_markup">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label2">
+                              <object class="GtkLinkButton" id="connect_button">
+                                <property name="label" translatable="yes">I already have an account!</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;span foreground="grey"&gt;2GB of free storage&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="relief">none</property>
+                                <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -79,50 +268,28 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLinkButton" id="connect_button">
-                        <property name="label" translatable="yes">I already have an account!</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="relief">none</property>
-                        <signal name="clicked" handler="on_connect_button_clicked"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
         </child>
       </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkLabel" id="warning_label">
-        <property name="visible">True</property>
-        <property name="wrap">True</property>
-        <property name="ellipsize">end</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
   </object>
 </interface>
 
=== modified file 'data/volumes.ui'
--- data/volumes.ui	2011-01-25 19:08:59 +0000
+++ data/volumes.ui	2011-02-12 03:22:55 +0000
@@ -2,6 +2,26 @@
 <interface>
   <requires lib="gtk+" version="2.22"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkTreeStore" id="volumes_store">
+    <columns>
+      <!-- column-name description -->
+      <column type="gchararray"/>
+      <!-- column-name subscribed -->
+      <column type="gboolean"/>
+      <!-- column-name icon-name -->
+      <column type="gchararray"/>
+      <!-- column-name subscribed-visible -->
+      <column type="gboolean"/>
+      <!-- column-name subscribed-sensitive -->
+      <column type="gboolean"/>
+      <!-- column-name icon-size -->
+      <column type="gint"/>
+      <!-- column-name identifier -->
+      <column type="gchararray"/>
+      <!-- column-name path -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkAlignment" id="itself">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -18,6 +38,7 @@
             <property name="model">volumes_store</property>
             <property name="rules_hint">True</property>
             <property name="tooltip_column">0</property>
+            <signal name="row-activated" handler="on_volumes_view_row_activated" swapped="no"/>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn2">
                 <property name="resizable">True</property>
@@ -46,7 +67,7 @@
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn3">
                 <property name="sizing">autosize</property>
-                <property name="title">On this device?</property>
+                <property name="title" translatable="yes">Sync locally?</property>
                 <child>
                   <object class="GtkCellRendererToggle" id="cellrenderertoggle1">
                     <property name="indicator_size">15</property>
@@ -73,22 +94,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkTreeStore" id="volumes_store">
-    <columns>
-      <!-- column-name description -->
-      <column type="gchararray"/>
-      <!-- column-name subscribed -->
-      <column type="gboolean"/>
-      <!-- column-name icon-name -->
-      <column type="gchararray"/>
-      <!-- column-name subscribed-visible -->
-      <column type="gboolean"/>
-      <!-- column-name subscribed-sensitive -->
-      <column type="gboolean"/>
-      <!-- column-name icon-size -->
-      <column type="gint"/>
-      <!-- column-name identifier -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
 </interface>
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-02-07 07:55:07 +0000
+++ debian/changelog	2011-02-12 03:22:55 +0000
@@ -1,3 +1,20 @@
+ubuntuone-control-panel (0.8.3-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    - Support share subscription in Folders tab (LP: #714583)
+    - Use more concise text on overview page (LP: #715732)
+    - Set widget names to style properly (LP: #716678)
+    - Place usage bar label on top (LP: #715713)
+    - Inconsistent placement of 'remove' button (LP: #715804)
+    - Message text should say 'your personal cloud' (LP: #715858)
+    - Shares to me path looks awful (LP: #716431)
+    - Clicking a folder should open it (LP: #716499)
+    - Subtext in 'join now' button is hard to read (LP: #716504)
+    - "On this device?" string is inconsistent with its action (LP: #717159)
+    - Devices don't necessarily have a sync service (LP: #717230)
+
+ -- Rodney Dawes <[e-mail]>  Fri, 11 Feb 2011 22:07:23 -0500
+
 ubuntuone-control-panel (0.8.2-0ubuntu1) natty; urgency=low
 
   * New upstream release:
 
=== modified file 'debian/python-ubuntuone-control-panel.install'
--- debian/python-ubuntuone-control-panel.install	2010-12-06 12:27:11 +0000
+++ debian/python-ubuntuone-control-panel.install	2011-02-12 03:22:55 +0000
@@ -1,1 +1,4 @@
-debian/tmp/usr/lib/python2.*/*-packages/ubuntuone/controlpanel/*.py
+debian/tmp/usr/lib/python2.*/*-packages/*.pth
+debian/tmp/usr/lib/python2.*/*-packages/*/ubuntuone/__init__.py
+debian/tmp/usr/lib/python2.*/*-packages/*/ubuntuone/controlpanel/*.py
+
 
=== modified file 'debian/ubuntuone-control-panel-gtk.install'
--- debian/ubuntuone-control-panel-gtk.install	2011-01-27 22:13:48 +0000
+++ debian/ubuntuone-control-panel-gtk.install	2011-02-12 03:22:55 +0000
@@ -4,4 +4,5 @@
 debian/tmp/usr/share/ubuntuone-control-panel/*.ui
 debian/tmp/usr/share/ubuntuone-control-panel/*.png
 debian/tmp/usr/share/man/man1/ubuntuone-control-panel-gtk.*
-debian/tmp/usr/lib/python2.*/*-packages/ubuntuone/controlpanel/gtk/*.py
+debian/tmp/usr/lib/python2.*/*-packages/*/ubuntuone/controlpanel/gtk
+
 
=== modified file 'setup.py'
--- setup.py	2011-02-04 20:02:28 +0000
+++ setup.py	2011-02-12 03:22:55 +0000
@@ -76,7 +76,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-control-panel',
-    version='0.8.2',
+    version='0.8.3',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',
@@ -85,6 +85,7 @@
                      'DBus service to query/modify all the Ubuntu One bits.',
     url='https://launchpad.net/ubuntuone-control-panel',
     packages=['ubuntuone.controlpanel', 'ubuntuone.controlpanel.gtk'],
+    extra_path='ubuntuone-control-panel',
     data_files=[
         ('lib/ubuntuone-control-panel',
          ['bin/ubuntuone-control-panel-backend']),
 
=== modified file 'ubuntuone-control-panel-gtk.desktop.in'
--- ubuntuone-control-panel-gtk.desktop.in	2011-01-07 20:07:39 +0000
+++ ubuntuone-control-panel-gtk.desktop.in	2011-02-12 03:22:55 +0000
@@ -8,6 +8,7 @@
 StartupNotify=true
 Categories=GNOME;GTK;Settings;
 X-Ayatana-Desktop-Shortcuts=U1
+X-Ayatana-Appmenu-Show-Stubs=False
 
 [U1 Shortcut Group]
 Name=Ubuntu One
 
=== added file 'ubuntuone.controlpanel.pth'
--- ubuntuone.controlpanel.pth	1970-01-01 00:00:00 +0000
+++ ubuntuone.controlpanel.pth	2011-02-12 03:22:55 +0000
@@ -0,0 +1,2 @@
+ubuntuone-control-panel
+
 
=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-01-25 19:08:59 +0000
+++ ubuntuone/controlpanel/backend.py	2011-02-12 03:22:55 +0000
@@ -19,6 +19,8 @@
 
 """A backend for the Ubuntu One Control Panel."""
 
+from collections import defaultdict
+
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 from ubuntuone.controlpanel import dbus_client
@@ -62,12 +64,19 @@
 class ControlBackend(object):
     """The control panel backend."""
 
+    ROOT_TYPE = u'ROOT'
+    FOLDER_TYPE = u'UDF'
+    SHARE_TYPE = u'SHARE'
+    NAME_NOT_SET = u'ENAMENOTSET'
+
     def __init__(self):
         """Initialize the webclient."""
         self.wc = WebClient(dbus_client.get_credentials)
         self._status_changed_handler = None
         self.status_changed_handler = lambda *a: None
 
+        self._volumes = {}  # cache last known volume info
+
     def _process_file_sync_status(self, status):
         """Process raw file sync status into custom format.
 
@@ -328,17 +337,54 @@
     @inlineCallbacks
     def volumes_info(self):
         """Get the volumes info."""
+        self._volumes = {}
+
         account = yield self.account_info()
         root_dir = yield dbus_client.get_root_dir()
+        shares_dir = yield dbus_client.get_shares_dir()
+        shares_dir_link = yield dbus_client.get_shares_dir_link()
         folders = yield dbus_client.get_folders()
+        shares = yield dbus_client.get_shares()
 
         free_bytes = int(account['quota_total']) - int(account['quota_used'])
         root_volume = {u'volume_id': u'', u'path': root_dir,
-                       u'subscribed': 'True', u'type': u'ROOT'}
+                       u'subscribed': 'True', u'type': self.ROOT_TYPE}
+        self._volumes[u''] = root_volume
+
+        # group shares by the offering user
+        shares_result = defaultdict(list)
+        for share in shares:
+            share[u'type'] = self.SHARE_TYPE
+
+            vid = share['volume_id']
+            assert vid not in self._volumes
+            self._volumes[vid] = share
+
+            if not bool(share['accepted']):
+                continue
+
+            nicer_path = share[u'path'].replace(shares_dir, shares_dir_link)
+            share[u'path'] = nicer_path
+
+            username = share['other_visible_name']
+            if not username:
+                username = u'%s (%s)' % (share['other_username'],
+                                         self.NAME_NOT_SET)
+
+            shares_result[username].append(share)
+
+        for folder in folders:
+            folder[u'type'] = self.FOLDER_TYPE
+
+            vid = folder['volume_id']
+            assert vid not in self._volumes
+            self._volumes[vid] = folder
 
         result = [(u'', unicode(free_bytes), [root_volume] + folders)]
 
-        # later, we may request shares info as well
+        for other_username, shares in shares_result.iteritems():
+            result.append((other_username, shares[0][u'free_bytes'], shares))
+
         returnValue(result)
 
     @log_call(logger.debug)
@@ -359,16 +405,18 @@
     @inlineCallbacks
     def subscribe_volume(self, volume_id):
         """Subscribe to 'volume_id'."""
-        # when dealing with shares, we need to check if 'volume_id'
-        # is a folder or a share
-        yield dbus_client.subscribe_folder(volume_id)
+        if self._volumes[volume_id][u'type'] == self.FOLDER_TYPE:
+            yield dbus_client.subscribe_folder(volume_id)
+        elif self._volumes[volume_id][u'type'] == self.SHARE_TYPE:
+            yield dbus_client.subscribe_share(volume_id)
 
     @inlineCallbacks
     def unsubscribe_volume(self, volume_id):
         """Unsubscribe from 'volume_id'."""
-        # when dealing with shares, we need to check if 'volume_id'
-        # is a folder or a share
-        yield dbus_client.unsubscribe_folder(volume_id)
+        if self._volumes[volume_id][u'type'] == self.FOLDER_TYPE:
+            yield dbus_client.unsubscribe_folder(volume_id)
+        elif self._volumes[volume_id][u'type'] == self.SHARE_TYPE:
+            yield dbus_client.unsubscribe_share(volume_id)
 
     @log_call(logger.debug)
     @inlineCallbacks
 
=== modified file 'ubuntuone/controlpanel/dbus_client.py'
--- ubuntuone/controlpanel/dbus_client.py	2011-01-25 19:08:59 +0000
+++ ubuntuone/controlpanel/dbus_client.py	2011-02-12 03:22:55 +0000
@@ -221,6 +221,22 @@
     return d
 
 
+def get_shares_dir():
+    """Retrieve the shares information from syncdaemon."""
+    d = defer.Deferred()
+    proxy = get_syncdaemon_proxy("/", sd_dbus_iface.DBUS_IFACE_SYNC_NAME)
+    proxy.get_sharesdir(reply_handler=d.callback, error_handler=d.errback)
+    return d
+
+
+def get_shares_dir_link():
+    """Retrieve the shares information from syncdaemon."""
+    d = defer.Deferred()
+    proxy = get_syncdaemon_proxy("/", sd_dbus_iface.DBUS_IFACE_SYNC_NAME)
+    proxy.get_sharesdir_link(reply_handler=d.callback, error_handler=d.errback)
+    return d
+
+
 def get_folders():
     """Retrieve the folders information from syncdaemon."""
     d = defer.Deferred()
@@ -256,7 +272,7 @@
     proxy = get_folders_syncdaemon_proxy()
 
     sig = proxy.connect_to_signal('FolderSubscribed', d.callback)
-    cb = lambda folder_info, error: d.errback(VolumesError(folder_info, error))
+    cb = lambda info, error: d.errback(VolumesError(info['id'], error))
     esig = proxy.connect_to_signal('FolderSubscribeError', cb)
 
     proxy.subscribe(folder_id, reply_handler=no_op, error_handler=no_op)
@@ -277,7 +293,7 @@
     proxy = get_folders_syncdaemon_proxy()
 
     sig = proxy.connect_to_signal('FolderUnSubscribed', d.callback)
-    cb = lambda folder_info, error: d.errback(VolumesError(folder_info, error))
+    cb = lambda info, error: d.errback(VolumesError(info['id'], error))
     esig = proxy.connect_to_signal('FolderUnSubscribeError', cb)
 
     proxy.unsubscribe(folder_id, reply_handler=no_op, error_handler=no_op)
@@ -292,6 +308,31 @@
     return d
 
 
[e-mail]
+def get_shares():
+    """Retrieve the shares information from syncdaemon."""
+    result = yield SyncDaemonTool(bus=dbus.SessionBus()).get_shares()
+    defer.returnValue(result)
+
+
[e-mail]
+def subscribe_share(share_id):
+    """Subscribe to 'share_id'."""
+    try:
+        yield SyncDaemonTool(bus=dbus.SessionBus()).subscribe_share(share_id)
+    except Exception, e:
+        raise VolumesError(share_id, e)
+
+
[e-mail]
+def unsubscribe_share(share_id):
+    """Unsubscribe 'share_id'."""
+    try:
+        yield SyncDaemonTool(bus=dbus.SessionBus()).unsubscribe_share(share_id)
+    except Exception, e:
+        raise VolumesError(share_id, e)
+
+
 def get_current_status():
     """Retrieve the current status from syncdaemon."""
     d = defer.Deferred()
 
=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-02-04 20:02:28 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-02-12 03:22:55 +0000
@@ -61,24 +61,13 @@
 
 # To be replaced by values from the theme or Ubuntu One' specific (LP: #673663)
 ORANGE = '#c95724'
+ERROR_COLOR = 'red'
 LOADING = _('Loading...')
-OVERVIEW_MSGS = [
-    _('Backup and access your files from <b>any</b> computer (Ubuntu &amp; '
-      'Windows), mobile device (Android) or the web.'),
-    _('A <b>portable address book</b> that unifies your most important '
-      'contact sources: mobile phones, social networks, email clients and '
-      'services.'),
-    _('A <b>personal music library</b> that can be streamed to Android, '
-       'iPhone and AirPlay-enabled devices.'),
-    _('Add to that music library with a <b>Music Store</b> that automatically '
-      'delivers to your personal cloud and connected devices.'),
-    _('Keep your <b>Firefox bookmarks</b> and <b>Tomboy notes</b> in sync '
-      'across computers (Ubuntu &amp; Windows).'),
-]
 VALUE_ERROR = _('Value could not be retrieved.')
-WARNING_MARKUP = '<span foreground="%s"><b>%%s</b></span>' % ORANGE
+WARNING_MARKUP = '<span foreground="%s"><b>%%s</b></span>' % ERROR_COLOR
 KILOBYTES = 1024
 NO_OP = lambda *a, **kw: None
+FILE_URI_PREFIX = 'file://'
 
 
 def error_handler(*args, **kwargs):
@@ -109,7 +98,7 @@
 @log_call(logger.debug)
 def uri_hook(button, uri, *args, **kwargs):
     """Open an URI or do nothing if URI is not an URL."""
-    if uri.startswith('http'):
+    if uri.startswith('http') or uri.startswith(FILE_URI_PREFIX):
         gtk.show_uri(None, uri, gtk.gdk.CURRENT_TIME)
 
 
@@ -222,30 +211,27 @@
 
     CREDENTIALS_ERROR = _('There was a problem while retrieving the '
         'credentials.')
-    AUTHORIZATION_DENIED = _('The authentication was cancelled. Please either '
-        'click join or connect to continue.')
+    AUTHORIZATION_DENIED = _('The authentication was cancelled.')
     NETWORK_OFFLINE = _('An internet connection is required to join or sign '
         'in to %(app_name)s.')
     NETWORK_UNKNOWN = _('The internet connection state couldn\'t be '
         'discovered. Maybe NetworkManager is not running?')
 
     CONNECT = _('Connect to Ubuntu One')
-    BULLET = '<span foreground="%s">✔</span>' % ORANGE
 
-    def __init__(self, main_window, messages=None):
+    def __init__(self, main_window):
         GreyableBin.__init__(self)
         ControlPanelMixin.__init__(self, filename='overview.ui')
         self.add(self.itself)
         self.warning_label.set_text('')
         self.warning_label.set_property('xalign', 0.5)
-        self.connect('size-allocate', on_size_allocate, self.warning_label)
+
+        self.header.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(DEFAULT_BG))
 
         self.connect_button.set_uri(self.CONNECT)
 
         self.main_window = main_window
         self._credentials_are_new = False
-        self._messages = messages
-        self._build_messages()
         self.show()
 
         bus = dbus.SessionBus()
@@ -274,21 +260,6 @@
         self.network_manager_state = networkstate.NetworkManagerState(**kw)
         self.network_manager_state.find_online_state()
 
-    def _build_messages(self):
-        """List messages in a itemized list."""
-        if self._messages is None:
-            self._messages = OVERVIEW_MSGS
-
-        for msg in self._messages:
-            label = gtk.Label()
-            label.set_markup(self.BULLET + ' ' + msg)
-            label.set_property('xalign', 0)
-            label.set_property('wrap', True)
-            self.messages.connect('size-allocate', on_size_allocate, label)
-
-            self.messages.pack_start(label)
-        self.messages.show_all()
-
     def _set_warning(self, message, label=None):
         """Set 'message' as global warning."""
         ControlPanelMixin._set_warning(self, message,
@@ -419,18 +390,22 @@
 class VolumesPanel(UbuntuOneBin, ControlPanelMixin):
     """The volumes panel."""
 
-    TITLE = _('Select the folders from your cloud that you want synchronized '
-              'in this device.')
+    TITLE = _('Select the folders from your personal cloud that you want '
+              'synchronized in this device.')
     MY_FOLDERS = _('My folders')
     ALWAYS_SUBSCRIBED = _('Always in sync!')
     FREE_SPACE = _('%(free_space)s available storage')
+    NO_VOLUMES = _('No folders to show.')
+    NAME_NOT_SET = _('[unknown user name]')
+
+    MAX_COLS = 8
+
     CONTACT_ICON_NAME = 'system-users'
     FOLDER_ICON_NAME = 'folder'
     SHARE_ICON_NAME = 'folder-remote'
     ROW_HEADER = '<span font_size="large"><b>%s</b></span> ' \
                  '<span foreground="grey">%s</span>'
     ROOT = '%s - <span foreground="%s" font_size="small">%s</span>'
-    NO_VOLUMES = _('No folders to show.')
 
     def __init__(self, main_window=None):
         UbuntuOneBin.__init__(self)
@@ -438,6 +413,11 @@
         self.add(self.itself)
         self.show_all()
 
+        # name, subscribed, icon name, show toggle, sensitive, icon size,
+        # id, path
+        self._empty_row = ('', False, '', False, False, gtk.ICON_SIZE_MENU,
+                           None, None)
+
         self.backend.connect_to_signal('VolumesInfoReady',
                                        self.on_volumes_info_ready)
         self.backend.connect_to_signal('VolumesInfoError',
@@ -462,14 +442,16 @@
         else:
             self.on_success()
 
-        # pylint: disable=W0612
-        # name, subscribed, icon name, show toggle, sensitive, icon size, id
-        empty_row = ('', False, '', False, False, gtk.ICON_SIZE_MENU, None)
-
         for name, free_bytes, volumes in info:
+            if backend.ControlBackend.NAME_NOT_SET in name:
+                name = self.NAME_NOT_SET
+
             if name:
                 name = name + "'s"
                 icon_name = self.SHARE_ICON_NAME
+
+                # we already added user folders, let's add an empty row
+                treeiter = self.volumes_store.append(None, self._empty_row)
             else:
                 name = self.MY_FOLDERS
                 icon_name = self.FOLDER_ICON_NAME
@@ -477,30 +459,33 @@
             free_bytes_args = {'free_space': self.humanize(int(free_bytes))}
             row = (self.ROW_HEADER % (name, self.FREE_SPACE % free_bytes_args),
                    True, self.CONTACT_ICON_NAME, False, False,
-                   gtk.ICON_SIZE_LARGE_TOOLBAR, None)
+                   gtk.ICON_SIZE_LARGE_TOOLBAR, None, None)
             treeiter = self.volumes_store.append(None, row)
 
             volumes.sort(key=operator.itemgetter('path'))
             for volume in volumes:
                 sensitive = True
-                path = self._process_path(volume['path'])
-                if volume['type'] == u'ROOT':
+                name = self._process_path(volume[u'path'])
+
+                is_root = volume[u'type'] == backend.ControlBackend.ROOT_TYPE
+                is_share = volume[u'type'] == backend.ControlBackend.SHARE_TYPE
+
+                if is_root:
                     sensitive = False
-                    path = self.ROOT % (path, ORANGE, self.ALWAYS_SUBSCRIBED)
-
-                row = (path, bool(volume['subscribed']), icon_name, True,
-                       sensitive, gtk.ICON_SIZE_MENU, volume['volume_id'])
-
-                if volume['type'] == u'ROOT':  # root should go first!
+                    name = self.ROOT % (name, ORANGE, self.ALWAYS_SUBSCRIBED)
+                elif is_share:
+                    name = volume[u'name']
+
+                row = (name, bool(volume[u'subscribed']), icon_name, True,
+                       sensitive, gtk.ICON_SIZE_MENU, volume['volume_id'],
+                       volume[u'path'])
+
+                if is_root:  # root should go first!
                     self.volumes_store.prepend(treeiter, row)
                 else:
                     self.volumes_store.append(treeiter, row)
 
-            # When we display shares info, we'll need to smartly add
-            # an empty row to the tree view to separate volume groups
-            #treeiter = self.volumes_store.append(None, empty_row)
-
-        self.volumes_view.expand_row(0, True)
+        self.volumes_view.expand_all()
         self.volumes_view.show_all()
 
         self.is_processing = False
@@ -534,6 +519,12 @@
 
         self.is_processing = True
 
+    def on_volumes_view_row_activated(self, widget, path, *args, **kwargs):
+        """The user double clicked on a row."""
+        treeiter = self.volumes_store.get_iter(path)
+        volume_path = self.volumes_store.get_value(treeiter, 7)
+        uri_hook(None, FILE_URI_PREFIX + volume_path)
+
     def load(self):
         """Load the volume list."""
         self.backend.volumes_info(reply_handler=NO_OP,
@@ -739,7 +730,8 @@
                                  gobject.TYPE_NONE, ()),
     }
 
-    TITLE = _('The devices synced with your personal cloud are listed below.')
+    TITLE = _('The devices connected with your personal cloud are listed '
+              'below.')
     NO_DEVICES = _('No devices to show.')
     CONFIRM_REMOVE = _('Are you sure you want to remove this device '
                        'from Ubuntu One?')
@@ -1270,6 +1262,8 @@
     }
 
     QUOTA_LABEL = _('%(used)s used of %(total)s (%(percentage).1f%%)')
+    DASHBOARD_BUTTON_NAME = 'Account'
+    DEVICES_BUTTON_NAME = 'Devices'
 
     def __init__(self, main_window=None):
         gtk.VBox.__init__(self)
@@ -1287,6 +1281,7 @@
         self.quota_progressbar.set_sensitive(False)
         self.quota_label = LabelLoading(LOADING, fg_color=DEFAULT_FG)
         self.quota_box.pack_start(self.quota_label, expand=False)
+        self.quota_box.reorder_child(self.quota_label, 0)
 
         self.status_label = FileSyncStatus()
         self.status_box.pack_end(self.status_label, expand=False)
@@ -1309,9 +1304,13 @@
                                          gtk.gdk.Color(DEFAULT_FG))
             self.notebook.insert_page(getattr(self, tab), position=page_num)
 
+        self.dashboard_button.set_name(self.DASHBOARD_BUTTON_NAME)
+
         self.volumes_button.connect('clicked', lambda b: self.volumes.load())
+        self.services_button.connect('clicked', lambda b: self.services.load())
+
+        self.devices_button.set_name(self.DEVICES_BUTTON_NAME)
         self.devices_button.connect('clicked', lambda b: self.devices.load())
-        self.services_button.connect('clicked', lambda b: self.services.load())
         self.devices.connect('local-device-removed',
                              lambda widget: self.emit('local-device-removed'))
 
@@ -1397,7 +1396,7 @@
 class ControlPanelWindow(gtk.Window):
     """The main window for the Ubuntu One control panel."""
 
-    TITLE = _('%(app_name)s Dashboard')
+    TITLE = _('%(app_name)s Control Panel')
 
     def __init__(self, switch_to=None):
         super(ControlPanelWindow, self).__init__()
 
=== modified file 'ubuntuone/controlpanel/gtk/tests/__init__.py'
--- ubuntuone/controlpanel/gtk/tests/__init__.py	2011-01-25 19:08:59 +0000
+++ ubuntuone/controlpanel/gtk/tests/__init__.py	2011-02-12 03:22:55 +0000
@@ -45,11 +45,11 @@
 ]
 
 FAKE_SHARES_INFO = [
-    {u'volume_id': u'1234',
+    {u'volume_id': u'1234', u'name': u'do',
      u'path': u'/home/tester/.local/share/ubuntuone/shares/do from Other User',
      u'subscribed': u'', u'type': u'SHARE'},
 
-    {u'volume_id': u'5678',
+    {u'volume_id': u'5678', u'name': u're',
      u'path': u'/home/tester/.local/share/ubuntuone/shares/re from Other User',
      u'subscribed': u'True', u'type': u'SHARE'},
 ]
 
=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-01-25 19:08:59 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-02-12 03:22:55 +0000
@@ -27,7 +27,7 @@
 from ubuntuone.controlpanel.gtk import gui
 from ubuntuone.controlpanel.gtk.tests import (FAKE_ACCOUNT_INFO,
     FAKE_DEVICE_INFO, FAKE_DEVICES_INFO,
-    FAKE_VOLUMES_INFO, FAKE_REPLICATIONS_INFO, USER_HOME,
+    FAKE_VOLUMES_INFO, FAKE_REPLICATIONS_INFO, ROOT, USER_HOME,
     FakedNMState, FakedSSOBackend, FakedSessionBus, FakedInterface,
     FakedPackageManager, FakedConfirmDialog,
 )
@@ -82,21 +82,6 @@
         pb = gui.gtk.gdk.pixbuf_new_from_file(gui.get_data_file(filename))
         self.assertEqual(image.get_pixbuf().get_pixels(), pb.get_pixels())
 
-    def assert_messages_equal(self, widget, msgs):
-        """Check that 'widget' has all the entries in 'msgs'."""
-        children = list(reversed(widget.get_children()))
-        self.assertEqual(len(children), len(msgs))
-        for label, msg in zip(reversed(children), msgs):
-            full_msg = self.ui.BULLET + ' ' + msg
-            self.assertTrue(label.get_visible())
-            self.assertEqual(label.get_property('xalign'), 0)
-            self.assertEqual(label.get_property('wrap'), True)
-            self.assertEqual(label.get_label(), full_msg)
-
-            expected = gui.gtk.Label()
-            expected.set_markup(full_msg)
-            self.assertEqual(label.get_text(), expected.get_text())
-
     def assert_backend_called(self, method_name, args, backend=None):
         """Check that the control panel backend 'method_name' was called."""
         if backend is None:
@@ -392,7 +377,7 @@
     """The test suite for the overview panel."""
 
     klass = gui.OverviewPanel
-    kwargs = {'messages': None, 'main_window': gui.gtk.Window()}
+    kwargs = {'main_window': gui.gtk.Window()}
     ui_filename = 'overview.ui'
 
     def test_is_a_greyable_bin(self):
@@ -561,10 +546,7 @@
 class OverwiewPanelNoCredsTestCase(OverwiewPanelTestCase):
     """The test suite for the overview panel when no credentials are found."""
 
-    messages = None
-
     def setUp(self):
-        self.kwargs['messages'] = self.messages
         super(OverwiewPanelNoCredsTestCase, self).setUp()
         self.ui.on_credentials_not_found(gui.U1_APP_NAME)
 
@@ -581,10 +563,6 @@
         """There is an image attribute and is correct."""
         self.assert_image_equal(self.ui.image, 'overview.png')
 
-    def test_messages(self):
-        """If no messages are passed, the default list is used."""
-        self.assert_messages_equal(self.ui.messages, gui.OVERVIEW_MSGS)
-
     def test_join_now_is_default_widget(self):
         """The join now button is the default widget."""
         self.assertTrue(self.ui.join_now_button.get_property('can_default'))
@@ -683,18 +661,6 @@
         self.assertTrue(self.ui.connect_button.is_sensitive())
 
 
-class OverwiewPanelMessagesTestCase(OverwiewPanelTestCase):
-    """The test suite for the overview panel when messages are set."""
-
-    messages = ['Test me', 'A little bit more']
-
-
-class OverwiewPanelMarkupMessagesTestCase(OverwiewPanelTestCase):
-    """The test suite for the overview panel when markup messages are set."""
-
-    messages = ['<small>Test me</small>', 'A <b>little</b> bit more']
-
-
 class DashboardTestCase(ControlPanelMixinTestCase):
     """The test suite for the dashboard panel."""
 
@@ -835,7 +801,8 @@
         """The volumes info is processed when ready."""
         self.ui.on_volumes_info_ready(FAKE_VOLUMES_INFO)
 
-        self.assertEqual(len(FAKE_VOLUMES_INFO), len(self.ui.volumes_store))
+        self.assertEqual(len(FAKE_VOLUMES_INFO) + 1,  # count the empty row
+                         len(self.ui.volumes_store))
         treeiter = self.ui.volumes_store.get_iter_root()
         for name, free_bytes, volumes in FAKE_VOLUMES_INFO:
             name = "%s's" % name if name else self.ui.MY_FOLDERS
@@ -843,7 +810,8 @@
             header = (name, self.ui.FREE_SPACE % {'free_space': free_bytes})
 
             # check parent row
-            row = self.ui.volumes_store.get(treeiter, *xrange(7))
+            row = self.ui.volumes_store.get(treeiter,
+                                            *xrange(self.ui.MAX_COLS))
 
             self.assertEqual(row[0], self.ui.ROW_HEADER % header)
             self.assertTrue(row[1], 'parent will always be subscribed')
@@ -852,6 +820,7 @@
             self.assertFalse(row[4], 'toggle should be non sensitive.')
             self.assertEqual(row[5], gui.gtk.ICON_SIZE_LARGE_TOOLBAR)
             self.assertEqual(row[6], None)
+            self.assertEqual(row[7], None)
 
             # check children
             self.assertEqual(len(volumes),
@@ -860,7 +829,8 @@
 
             sorted_vols = sorted(volumes, key=gui.operator.itemgetter('path'))
             for volume in sorted_vols:
-                row = self.ui.volumes_store.get(childiter, *xrange(7))
+                row = self.ui.volumes_store.get(childiter,
+                                                *xrange(self.ui.MAX_COLS))
 
                 sensitive = True
                 path = volume['path'].replace(USER_HOME + '/', '')
@@ -868,6 +838,8 @@
                     sensitive = False
                     path = self.ui.ROOT % (path, gui.ORANGE,
                                            self.ui.ALWAYS_SUBSCRIBED)
+                elif volume['type'] == 'SHARE':
+                    path = volume['name']
 
                 self.assertEqual(row[0], path)
                 self.assertEqual(row[1], bool(volume['subscribed']))
@@ -879,17 +851,28 @@
                 self.assertEqual(row[4], sensitive)
                 self.assertEqual(row[5], gui.gtk.ICON_SIZE_MENU)
                 self.assertEqual(row[6], volume['volume_id'])
+                self.assertEqual(row[7], volume['path'])
 
                 childiter = self.ui.volumes_store.iter_next(childiter)
 
             treeiter = self.ui.volumes_store.iter_next(treeiter)
 
+            if treeiter is not None:
+                # skip the empty row
+                row = self.ui.volumes_store.get(treeiter,
+                                                *xrange(self.ui.MAX_COLS))
+                self.assertEqual(row, self.ui._empty_row)
+
+                # grab next non-empty row
+                treeiter = self.ui.volumes_store.iter_next(treeiter)
+
     def test_on_volumes_info_ready_clears_the_list(self):
         """The old volumes info is cleared before updated."""
         self.ui.on_volumes_info_ready(FAKE_VOLUMES_INFO)
         self.ui.on_volumes_info_ready(FAKE_VOLUMES_INFO)
 
-        self.assertEqual(len(self.ui.volumes_store), len(FAKE_VOLUMES_INFO))
+        self.assertEqual(len(FAKE_VOLUMES_INFO) + 1,
+                         len(self.ui.volumes_store))
 
     def test_on_volumes_info_ready_with_no_volumes(self):
         """When there are no volumes, a notification is shown."""
@@ -917,7 +900,9 @@
         """Clicking on 'subscribed' updates the folder subscription."""
         self.ui.on_volumes_info_ready(FAKE_VOLUMES_INFO)
 
-        for parent, (_, _, volumes) in enumerate(FAKE_VOLUMES_INFO):
+        real_rows = len(FAKE_VOLUMES_INFO)
+        data = zip(range(real_rows)[::2], FAKE_VOLUMES_INFO)  # skip emtpy rows
+        for parent, (_, _, volumes) in data:
 
             sorted_vols = sorted(volumes, key=gui.operator.itemgetter('path'))
             for child, volume in enumerate(sorted_vols):
@@ -964,6 +949,17 @@
         # reload folders list to sanitize the info in volumes_store
         self.assertTrue(self._called, ((), {}))
 
+    def test_clicking_on_row_opens_folder(self):
+        """The folder activated is opened."""
+        self.patch(gui, 'uri_hook', self._set_called)
+        self.ui.on_volumes_info_ready(FAKE_VOLUMES_INFO)
+
+        self.ui.volumes_view.row_activated('0:0',
+                                           self.ui.volumes_view.get_column(0))
+
+        self.assertEqual(self._called,
+                         ((None, gui.FILE_URI_PREFIX + ROOT['path']), {}))
+
 
 class DeviceTestCase(ControlPanelMixinTestCase):
     """The test suite for the device widget."""
@@ -2358,3 +2354,13 @@
         self.ui.devices.emit('local-device-removed')
 
         self.assertEqual(self._called, ((self.ui,), {}))
+
+    def test_dashboard_button_name(self):
+        """The dashboard_button widget has the proper name."""
+        self.assertEqual(self.ui.dashboard_button.get_name(),
+                         self.ui.DASHBOARD_BUTTON_NAME)
+
+    def test_devices_button_name(self):
+        """The devices_button widget has the proper name."""
+        self.assertEqual(self.ui.devices_button.get_name(),
+                         self.ui.DEVICES_BUTTON_NAME)
 
=== modified file 'ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py'
--- ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py	2011-01-25 19:08:59 +0000
+++ ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py	2011-02-12 03:22:55 +0000
@@ -19,9 +19,11 @@
 
 """Tests for the DBus service when accessing SyncDaemon."""
 
+import uuid
+
 import dbus
 
-from twisted.internet.defer import inlineCallbacks
+from twisted.internet.defer import inlineCallbacks, returnValue
 
 from ubuntuone.controlpanel import dbus_client
 from ubuntuone.controlpanel.dbus_client import sd_dbus_iface
@@ -34,6 +36,8 @@
     "download": "838",
 }
 
+SHARES = {}
+
 # pylint, you have to go to decorator's school
 # pylint: disable=C0322
 
@@ -302,7 +306,7 @@
 
 
 class FoldersTestCase(DBusClientTestCase):
-    """Test for the volumes dbus client methods."""
+    """Test for the shares dbus client methods."""
 
     def setUp(self):
         super(FoldersTestCase, self).setUp()
@@ -379,7 +383,7 @@
         try:
             yield dbus_client.subscribe_folder(fid)
         except dbus_client.VolumesError, e:
-            self.assertEqual(e[0], {'id': fid})
+            self.assertEqual(e[0], fid)
         else:
             self.fail('dbus_client.subscribe_folder should be errbacking')
 
@@ -405,11 +409,159 @@
         try:
             yield dbus_client.unsubscribe_folder(fid)
         except dbus_client.VolumesError, e:
-            self.assertEqual(e[0], {'id': fid})
+            self.assertEqual(e[0], fid)
         else:
             self.fail('dbus_client.unsubscribe_folder should be errbacking')
 
 
+class FakedSyncDaemonTool(object):
+    """Fake the FakedSyncDaemonTool."""
+
+    def __init__(self, bus):
+        """New instance."""
+
+    def _set_share_attr(self, share_id, attr, value):
+        """Set values to shares."""
+        if share_id not in SHARES:
+            raise dbus.DBusException('share_id not in SHARES.')
+
+        value = sd_dbus_iface.bool_str(value)
+        SHARES[share_id][attr] = value
+        return share_id
+
+    @inlineCallbacks
+    def accept_share(self, share_id):
+        """Accept the share with id: share_id."""
+        yield self._set_share_attr(share_id, u'accepted', True)
+
+    @inlineCallbacks
+    def reject_share(self, share_id):
+        """Reject the share with id: share_id."""
+        yield self._set_share_attr(share_id, u'accepted', False)
+
+    @inlineCallbacks
+    def subscribe_share(self, share_id):
+        """Subscribe to a share given its id."""
+        yield self._set_share_attr(share_id, u'subscribed', True)
+
+    @inlineCallbacks
+    def unsubscribe_share(self, share_id):
+        """Unsubscribe from a share given its id."""
+        yield self._set_share_attr(share_id, u'subscribed', False)
+
+    @inlineCallbacks
+    def get_shares(self):
+        """Get the list of shares (accepted or not)."""
+        result = yield SHARES.values()
+        returnValue(sorted(result))
+
+    @inlineCallbacks
+    def refresh_shares(self):
+        """Call refresh_shares method via DBus."""
+        yield
+
+    @classmethod
+    def create_share(cls, name, accepted=False, subscribed=False):
+        """Add a new share (fake)."""
+        sid = unicode(uuid.uuid4())
+        path = u'/home/tester/.hidden/shares/%s from The Othr User' % name
+        share = {
+            u'name': name, u'subscribed': sd_dbus_iface.bool_str(subscribed),
+            u'accepted': sd_dbus_iface.bool_str(accepted),
+            u'generation': u'36', u'type': u'Share',
+            u'node_id': u'ca3a1cec-09d2-485e-9685-1a5180bd6441',
+            u'volume_id': sid, u'access_level': u'View',
+            u'other_username': u'https://login.ubuntu.com/+id/nHRnYmz',
+            u'other_visible_name': u'The Other User',
+            u'free_bytes': u'2146703403', u'path': path,
+        }
+        SHARES[sid] = share
+        return share
+
+
+class SharesTestCase(DBusClientTestCase):
+    """Test for the shares dbus client methods."""
+
+    def setUp(self):
+        super(SharesTestCase, self).setUp()
+        self.patch(dbus_client, 'SyncDaemonTool', FakedSyncDaemonTool)
+        SHARES.clear()
+
+    @inlineCallbacks
+    def test_get_shares(self):
+        """Retrieve shares info list."""
+        share1 = FakedSyncDaemonTool.create_share(name='first, test me!')
+        share2 = FakedSyncDaemonTool.create_share(name='and test me more!',
+                                                accepted=True)
+        share3 = FakedSyncDaemonTool.create_share(name='last but not least',
+                                                accepted=True, subscribed=True)
+
+        result = yield dbus_client.get_shares()
+
+        self.assertEqual(result, sorted([share1, share2, share3]))
+
+    @inlineCallbacks
+    def test_get_shares_error(self):
+        """Handle error when retrieving current syncdaemon status."""
+        self.patch(FakedSyncDaemonTool, 'get_shares', self.fail)
+        try:
+            yield dbus_client.get_shares()
+        except:  # pylint: disable=W0702
+            pass  # test passes!
+        else:
+            self.fail('dbus_client.get_shares should be errbacking')
+
+    @inlineCallbacks
+    def test_subscribe_share(self):
+        """Subscribe to a share."""
+        share = FakedSyncDaemonTool.create_share(name='to be subscribed',
+                                               accepted=True, subscribed=False)
+        sid = share['volume_id']
+
+        yield dbus_client.subscribe_share(sid)
+
+        result = yield dbus_client.get_shares()
+        expected, = filter(lambda share: share['volume_id'] == sid, result)
+        self.assertEqual(expected['subscribed'], 'True')
+
+    @inlineCallbacks
+    def test_subscribe_share_error(self):
+        """Subscribe to a share."""
+        sid = u'does not exist'
+        try:
+            yield dbus_client.subscribe_share(sid)
+        except dbus_client.VolumesError, e:
+            self.assertEqual(e[0], sid)
+        else:
+            self.fail('dbus_client.subscribe_share should be errbacking')
+
+    @inlineCallbacks
+    def test_unsubscribe_share(self):
+        """Unsubscribe to a share."""
+        share = FakedSyncDaemonTool.create_share(name='to be unsubscribed',
+                                               accepted=True, subscribed=True)
+        sid = share['volume_id']
+        yield dbus_client.subscribe_share(sid)
+        # share is subscribed
+
+        yield dbus_client.unsubscribe_share(sid)
+
+        result = yield dbus_client.get_shares()
+        expected, = filter(lambda share: share['volume_id'] == sid, result)
+        self.assertEqual(expected['subscribed'], '')
+
+    @inlineCallbacks
+    def test_unsubscribe_share_error(self):
+        """Unsubscribe to a share."""
+        sid = u'does not exist'
+        try:
+            yield dbus_client.unsubscribe_share(sid)
+        except dbus_client.VolumesError, e:
+            self.assertEqual(e[0], sid)
+        else:
+            self.fail('dbus_client.unsubscribe_share should be errbacking')
+
+
 class StatusMockDBusSyncDaemon(dbus.service.Object):
     """A mock object that mimicks syncdaemon regarding the Status iface."""
 
@@ -549,6 +701,8 @@
     """A mock object that mimicks syncdaemon."""
 
     ROOT_DIR = u'/yadda/yoda/Test me'
+    SHARES_DIR = u'/yadda/yoda/.hidden/ugly/dir/name/shares'
+    SHARES_DIR_LINK = u'/yadda/yoda/Test me/Shared With Me'
 
     @dbus.service.method(sd_dbus_iface.DBUS_IFACE_SYNC_NAME,
                          in_signature='', out_signature='s')
@@ -556,6 +710,18 @@
         """Return the root dir/mount point."""
         return self.ROOT_DIR
 
+    @dbus.service.method(sd_dbus_iface.DBUS_IFACE_SYNC_NAME,
+                         in_signature='', out_signature='s')
+    def get_sharesdir(self):
+        """Return the shares dir/mount point."""
+        return self.SHARES_DIR
+
+    @dbus.service.method(sd_dbus_iface.DBUS_IFACE_SYNC_NAME,
+                         in_signature='', out_signature='s')
+    def get_sharesdir_link(self):
+        """Return the root dir/mount point."""
+        return self.SHARES_DIR_LINK
+
 
 class BasicTestCase(DBusClientTestCase):
     """Test for the basic dbus client methods."""
@@ -571,3 +737,17 @@
         root = yield dbus_client.get_root_dir()
 
         self.assertEqual(MockDBusSyncDaemon.ROOT_DIR, root)
+
+    @inlineCallbacks
+    def test_get_shares_dir(self):
+        """Retrieve current syncdaemon shares dir."""
+        result = yield dbus_client.get_shares_dir()
+
+        self.assertEqual(MockDBusSyncDaemon.SHARES_DIR, result)
+
+    @inlineCallbacks
+    def test_get_shares_dir_link(self):
+        """Retrieve current syncdaemon shares dir."""
+        result = yield dbus_client.get_shares_dir_link()
+
+        self.assertEqual(MockDBusSyncDaemon.SHARES_DIR_LINK, result)
 
=== modified file 'ubuntuone/controlpanel/tests/__init__.py'
--- ubuntuone/controlpanel/tests/__init__.py	2011-01-25 19:08:59 +0000
+++ ubuntuone/controlpanel/tests/__init__.py	2011-02-12 03:22:55 +0000
@@ -161,8 +161,14 @@
      u'volume_id': u'1deb2874-3d28-46ae-9999-d5f48de9f460'},
 ]
 
+ROOT_PATH = u'/home/tester/Ubuntu One'
+SHARES_PATH = u'/home/tester/.local/share/ubuntuone/shares'
+SHARES_PATH_LINK = ROOT_PATH + u'/Shared With Me'
+
 SAMPLE_SHARES = [
+
     {u'accepted': u'True',
+     u'subscribed': u'True',
      u'access_level': u'View',
      u'free_bytes': u'39892622746',
      u'generation': u'2704',
@@ -170,11 +176,12 @@
      u'node_id': u'c483f419-ed28-490a-825d-a8c074e2d795',
      u'other_username': u'otheruser',
      u'other_visible_name': u'Other User',
-     u'path': u'/home/tester/.local/share/ubuntuone/shares/re from Other User',
+     u'path': SHARES_PATH + u'/re from Other User',
      u'type': u'Share',
      u'volume_id': u'4a1b263b-a2b3-4f66-9e66-4cd18050810d'},
 
     {u'accepted': u'True',
+     u'subscribed': u'True',
      u'access_level': u'Modify',
      u'free_bytes': u'39892622746',
      u'generation': u'2704',
@@ -182,9 +189,78 @@
      u'node_id': u'84544ea4-aefe-4f91-9bb9-ed7b0a805baf',
      u'other_username': u'otheruser',
      u'other_visible_name': u'Other User',
-     u'path': u'/home/tester/.local/share/ubuntuone/shares/do from Other User',
+     u'path': SHARES_PATH + u'/do from Other User',
      u'type': u'Share',
      u'volume_id': u'7d130dfe-98b2-4bd5-8708-9eeba9838ac0'},
+
+    {u'name': u'yadda',
+     u'subscribed': u'True',
+     u'generation': u'36',
+     u'other_username': u'https://login.ubuntu.com/+id/nHRnYmz',
+     u'other_visible_name': u'',
+     u'access_level': u'View',
+     u'node_id': u'ca3a1cec-09d2-485e-9685-1a5180bd6441',
+     u'volume_id': u'f1f1741f-ba49-46ef-b682-816c97e6e3d6',
+     u'free_bytes': u'2146703403',
+     u'path': SHARES_PATH + u'/yadda from ',
+     u'accepted': u'True',
+     u'type': u'Share'},
+
+    {u'name': u'images',
+     u'subscribed': u'True',
+     u'generation': u'36',
+     u'other_username':
+     u'https://login.ubuntu.com/+id/nHRnYmz',
+     u'other_visible_name': u'',
+     u'access_level': u'Modify',
+     u'node_id':
+     u'b932f0d3-6998-423f-9225-7683a4adbd6f',
+     u'volume_id':
+     u'a73f889d-ffd3-4447-b351-f0d8130d1e1a',
+     u'free_bytes': u'2146703403',
+     u'path': SHARES_PATH + u'/images from ',
+     u'accepted': u'True',
+     u'type': u'Share'},
+
+    {u'name': u'read-only',
+     u'subscribed': u'True',
+     u'generation': u'315',
+     u'other_username': u'sharing-user',
+     u'other_visible_name': u'A Sharing User',
+     u'access_level': u'View',
+     u'node_id': u'fd944823-e4c2-45a4-8c95-05997698bdbc',
+     u'volume_id':
+     u'64b43c96-6c7c-4135-994f-03a1a3774512',
+     u'free_bytes': u'108786811673',
+     u'path': SHARES_PATH + u'/read-only from A Sharing User',
+     u'accepted': u'True',
+     u'type': u'Share'},
+
+    {u'name': u'read-write',
+     u'subscribed': u'True',
+     u'generation': u'314',
+     u'other_username': u'sharing-user',
+     u'other_visible_name': u'A Sharing User',
+     u'access_level': u'Modify',
+     u'node_id': u'e95662f7-9979-4745-8c21-8edaf893f143',
+     u'volume_id': u'8896e8f8-57a3-4bf9-8558-fc54b7a3a777',
+     u'free_bytes': u'108786811673',
+     u'path': SHARES_PATH + u'/read-write from A Sharing User',
+     u'accepted': u'True',
+     u'type': u'Share'},
+
+    {u'accepted': u'',
+     u'access_level': u'View',
+     u'free_bytes': u'',
+     u'generation': u'',
+     u'name': u'unaccepted',
+     u'node_id': u'67b61c92-855c-49d8-8e09-6d201d15c999',
+     u'other_username': u'bad guy',
+     u'other_visible_name': u'',
+     u'path': SHARES_PATH + u'/unaccepted from ',
+     u'subscribed': u'',
+     u'type': u'Share',
+     u'volume_id': u'19963c95-c684-48db-8668-ebe6d820d5c3'},
 ]
 
 SAMPLE_SHARED = [
@@ -196,7 +272,7 @@
      u'node_id': u'31e47530-9448-4f03-b4dc-4154fdf35225',
      u'other_username': u'otheruser',
      u'other_visible_name': u'Other User',
-     u'path': u'/home/tester/Ubuntu One/bar',
+     u'path': ROOT_PATH + u'/bar',
      u'type': u'Shared',
      u'volume_id': u'79584900-517f-4dff-b2f3-20e8c1e79365'},
 ]
 
=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2011-01-25 19:08:59 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2011-02-12 03:22:55 +0000
@@ -19,6 +19,8 @@
 
 """Tests for the control panel backend."""
 
+from collections import defaultdict
+
 import simplejson
 
 from twisted.internet import defer
@@ -42,6 +44,7 @@
     EXPECTED_ACCOUNT_INFO,
     EXPECTED_ACCOUNT_INFO_WITH_CURRENT_PLAN,
     EXPECTED_DEVICES_INFO,
+    ROOT_PATH,
     SAMPLE_ACCOUNT_NO_CURRENT_PLAN,
     SAMPLE_ACCOUNT_WITH_CURRENT_PLAN,
     SAMPLE_DEVICES_JSON,
@@ -49,6 +52,8 @@
     SAMPLE_QUOTA_JSON,
     SAMPLE_SHARED,
     SAMPLE_SHARES,
+    SHARES_PATH,
+    SHARES_PATH_LINK,
     TOKEN,
 )
 from ubuntuone.controlpanel.webclient import WebClientError
@@ -86,8 +91,8 @@
     }
     status_changed_handler = None
     subscribed_folders = []
+    subscribed_shares = []
     actions = []
-    root_dir = u'/home/tester/Something/Pepe Mosquito'
 
     def get_credentials(self):
         """Return the mock credentials."""
@@ -145,7 +150,15 @@
 
     def get_root_dir(self):
         """Grab the root dir."""
-        return self.root_dir
+        return ROOT_PATH
+
+    def get_shares_dir(self):
+        """Grab the shares dir."""
+        return SHARES_PATH
+
+    def get_shares_dir_link(self):
+        """Grab the shares dir."""
+        return SHARES_PATH_LINK
 
     def get_folders(self):
         """Grab list of folders."""
@@ -153,11 +166,23 @@
 
     def subscribe_folder(self, volume_id):
         """Subcribe to 'volume_id'."""
-        self.subscribed_folders.append(volume_id)
+        MockDBusClient.subscribed_folders.append(volume_id)
 
     def unsubscribe_folder(self, volume_id):
         """Unsubcribe from 'volume_id'."""
-        self.subscribed_folders.remove(volume_id)
+        MockDBusClient.subscribed_folders.remove(volume_id)
+
+    def get_shares(self):
+        """Grab list of shares."""
+        return SAMPLE_SHARES
+
+    def subscribe_share(self, volume_id):
+        """Subcribe to 'volume_id'."""
+        MockDBusClient.subscribed_shares.append(volume_id)
+
+    def unsubscribe_share(self, volume_id):
+        """Unsubcribe from 'volume_id'."""
+        MockDBusClient.subscribed_shares.remove(volume_id)
 
     def get_current_status(self):
         """Grab syncdaemon status."""
@@ -167,10 +192,6 @@
         """Connect a handler for tracking syncdaemon status changes."""
         self.status_changed_handler = handler
 
-    def get_shares(self):
-        """Grab list of shares (shares from others to the user)."""
-        return SAMPLE_SHARES
-
     def get_shared(self):
         """Grab list of shared (shares from the user to others)."""
         return SAMPLE_SHARED
@@ -370,40 +391,106 @@
 class BackendVolumesTestCase(BackendBasicTestCase):
     """Volumes tests for the backend."""
 
+    def setUp(self):
+        super(BackendVolumesTestCase, self).setUp()
+        # fake quota info and calculate free bytes
+        # pylint: disable=E1101
+        self.be.wc.results[ACCOUNT_API] = SAMPLE_ACCOUNT_NO_CURRENT_PLAN
+        self.be.wc.results[QUOTA_API] = SAMPLE_QUOTA_JSON
+
     @inlineCallbacks
     def test_volumes_info(self):
         """The volumes_info method exercises its callback."""
-        # fake quota info and calculate free bytes
-        # pylint: disable=E1101
-        self.be.wc.results[ACCOUNT_API] = SAMPLE_ACCOUNT_NO_CURRENT_PLAN
-        self.be.wc.results[QUOTA_API] = SAMPLE_QUOTA_JSON
         result = yield self.be.account_info()
         free_bytes = int(result['quota_total']) - int(result['quota_used'])
 
         # get root dir info
-        root_dir = MockDBusClient.root_dir
-        root_volume = {u'volume_id': u'', u'path': root_dir,
-                       u'subscribed': 'True', u'type': u'ROOT'}
+        root_volume = {u'volume_id': u'', u'path': ROOT_PATH,
+                       u'subscribed': 'True', u'type': self.be.ROOT_TYPE}
+
+        # get shares and group by sharing user
+        shares = defaultdict(list)
+        for share in SAMPLE_SHARES:
+            # filter out non accepted values
+            if not bool(share['accepted']):
+                continue
+
+            share = share.copy()
+
+            nicer_path = share[u'path'].replace(SHARES_PATH, SHARES_PATH_LINK)
+            share[u'path'] = nicer_path
+            share[u'type'] = self.be.SHARE_TYPE
+
+            username = share['other_visible_name']
+            if not username:
+                username = share['other_username'] + \
+                           ' (%s)' % self.be.NAME_NOT_SET
+
+            shares[username].append(share)
+
+        folders = []
+        for folder in SAMPLE_FOLDERS:
+            folder = folder.copy()
+            folder[u'type'] = self.be.FOLDER_TYPE
+            folders.append(folder)
+
+        expected = [(u'', unicode(free_bytes), [root_volume] + folders)]
+        for other_user, data in shares.iteritems():
+            expected.append((other_user, data[0][u'free_bytes'], data))
 
         result = yield self.be.volumes_info()
-
-        expected = [('', unicode(free_bytes), [root_volume] + SAMPLE_FOLDERS)]
-        # later, we should unify folders and shares info
         self.assertEqual(result, expected)
 
-    @inlineCallbacks
-    def test_subscribe_volume(self):
+    # pylint: disable=W0212
+
+    def test_cached_volumes_are_initially_empty(self):
+        """The cached volume list is empty."""
+        self.assertEqual(self.be._volumes, {})
+
+    @inlineCallbacks
+    def test_volumes_are_cached(self):
+        """The volume list is cached."""
+        # get root dir info
+        root_volume = {u'volume_id': u'', u'path': ROOT_PATH,
+                       u'subscribed': 'True', u'type': self.be.ROOT_TYPE}
+        expected = {u'': root_volume}
+        for volume in SAMPLE_SHARES + SAMPLE_FOLDERS:
+            if volume[u'type'] == u'UDF':
+                volume[u'type'] = self.be.FOLDER_TYPE
+            else:
+                volume[u'type'] = self.be.SHARE_TYPE
+
+            sid = volume['volume_id']
+            assert sid not in expected
+            expected[sid] = volume
+
+        _ = yield self.be.volumes_info()
+
+        self.assertEqual(self.be._volumes, expected)
+
+    @inlineCallbacks
+    def test_cached_volumes_are_updated_with_volume_info(self):
+        """The cached volume list is updated."""
+        yield self.test_volumes_are_cached()
+        yield self.test_volumes_are_cached()
+
+    @inlineCallbacks
+    def test_subscribe_volume_folder(self):
         """The subscribe_volume method subscribes a folder."""
         fid = '0123-4567'
+        self.be._volumes[fid] = {u'type': self.be.FOLDER_TYPE}
+
         yield self.be.subscribe_volume(volume_id=fid)
         self.addCleanup(lambda: MockDBusClient.subscribed_folders.remove(fid))
 
         self.assertEqual(MockDBusClient.subscribed_folders, [fid])
 
     @inlineCallbacks
-    def test_unsubscribe_volume(self):
+    def test_unsubscribe_volume_folder(self):
         """The unsubscribe_volume method unsubscribes a folder."""
         fid = '0123-4567'
+        self.be._volumes[fid] = {u'type': self.be.FOLDER_TYPE}
+
         yield self.be.subscribe_volume(volume_id=fid)
         self.assertEqual(MockDBusClient.subscribed_folders, [fid])
 
@@ -412,9 +499,34 @@
         self.assertEqual(MockDBusClient.subscribed_folders, [])
 
     @inlineCallbacks
-    def test_change_volume_settings(self):
+    def test_subscribe_volume_share(self):
+        """The subscribe_volume method subscribes a share."""
+        sid = '0123-4567'
+        self.be._volumes[sid] = {u'type': self.be.SHARE_TYPE}
+
+        yield self.be.subscribe_volume(volume_id=sid)
+        self.addCleanup(lambda: MockDBusClient.subscribed_shares.remove(sid))
+
+        self.assertEqual(MockDBusClient.subscribed_shares, [sid])
+
+    @inlineCallbacks
+    def test_unsubscribe_volume_share(self):
+        """The unsubscribe_volume method unsubscribes a share."""
+        sid = '0123-4567'
+        self.be._volumes[sid] = {u'type': self.be.SHARE_TYPE}
+
+        yield self.be.subscribe_volume(volume_id=sid)
+        self.assertEqual(MockDBusClient.subscribed_shares, [sid])
+
+        yield self.be.unsubscribe_volume(volume_id=sid)
+
+        self.assertEqual(MockDBusClient.subscribed_shares, [])
+
+    @inlineCallbacks
+    def test_change_volume_settings_folder(self):
         """The volume settings can be changed."""
         fid = '0123-4567'
+        self.be._volumes[fid] = {u'type': self.be.FOLDER_TYPE}
 
         yield self.be.change_volume_settings(fid, {'subscribed': 'True'})
         self.assertEqual(MockDBusClient.subscribed_folders, [fid])
@@ -423,10 +535,23 @@
         self.assertEqual(MockDBusClient.subscribed_folders, [])
 
     @inlineCallbacks
+    def test_change_volume_settings_share(self):
+        """The volume settings can be changed."""
+        sid = '0123-4567'
+        self.be._volumes[sid] = {u'type': self.be.SHARE_TYPE}
+
+        yield self.be.change_volume_settings(sid, {'subscribed': 'True'})
+        self.assertEqual(MockDBusClient.subscribed_shares, [sid])
+
+        yield self.be.change_volume_settings(sid, {'subscribed': ''})
+        self.assertEqual(MockDBusClient.subscribed_shares, [])
+
+    @inlineCallbacks
     def test_change_volume_settings_no_setting(self):
         """The change volume settings does not fail on empty settings."""
         yield self.be.change_volume_settings('test', {})
         self.assertEqual(MockDBusClient.subscribed_folders, [])
+        self.assertEqual(MockDBusClient.subscribed_shares, [])
 
 
 class BackendSyncStatusTestCase(BackendBasicTestCase):