Ubuntu One Client

Merge lp://qastaging/~dobey/ubuntuone-client/nautilus-button-weirdness into lp://qastaging/ubuntuone-client

  1. nautilus-button-weirdness
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 8
Merged at revision: not available
Proposed branch: lp://qastaging/~dobey/ubuntuone-client/nautilus-button-weirdness
Merge into: lp://qastaging/ubuntuone-client
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~dobey/ubuntuone-client/nautilus-button-weirdness
Reviewer Review Type Date Requested Status
Guillermo Gonzalez Approve
Rick McBride (community) Approve
Review via email: mp+6548@code.qastaging.launchpad.net

Commit message

[r=rmcbride, r=verterok] If we're not disconnected, we must be connected

To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

This should fix the "Connect" button in nautilus not showing the correct state most of the time.

Revision history for this message
Rick McBride (rmcbride) wrote :

Looks good. I do notice that we fail an import of nautilus during check. Not sure what's going on there.

review: Approve
Revision history for this message
dobey (dobey) wrote :

On Wed, 2009-05-13 at 19:34 +0000, Rick McBride wrote:
> Review: Approve
> Looks good. I do notice that we fail an import of nautilus during check. Not sure what's going on there.

It seems to just be weirdness in pylint. I have no idea why it's trying
to actually load the nautilus module (which is only loadable from within
nautilus). I would like to get it fixed, but it's a separate problem
from this.

Revision history for this message
Rick McBride (rmcbride) wrote :

Rodney Dawes wrote:
> On Wed, 2009-05-13 at 19:34 +0000, Rick McBride wrote:
>> Review: Approve
>> Looks good. I do notice that we fail an import of nautilus during check. Not sure what's going on there.
>
> It seems to just be weirdness in pylint. I have no idea why it's trying
> to actually load the nautilus module (which is only loadable from within
> nautilus). I would like to get it fixed, but it's a separate problem
> from this.
>
>
 Yea, didn't think it was directly related, as I saw it in an earlier
review branch and had made a mental note to investigate.

Revision history for this message
Guillermo Gonzalez (verterok) wrote :

looks, ok.

review: Approve
lp://qastaging/~dobey/ubuntuone-client/nautilus-button-weirdness updated
9. By dobey

 Merged from trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'canonical/ubuntuone/nautilus/storage.py'
2--- canonical/ubuntuone/nautilus/storage.py 2009-05-12 13:36:05 +0000
3+++ canonical/ubuntuone/nautilus/storage.py 2009-05-13 19:08:45 +0000
4@@ -103,7 +103,7 @@
5 str(status).startswith("READY"):
6 self.__button.set_label("Connect")
7 self.__connected = False
8- elif str(status).startswith("IDLE"):
9+ else:
10 self.__button.set_label("Disconnect")
11 self.__connected = True
12

Subscribers

People subscribed via source and target branches