Merge lp://staging/~thisfred/ubuntuone-client/lp-702055 into lp://staging/ubuntuone-client

Proposed by Eric Casteleijn
Status: Merged
Approved by: dobey
Approved revision: 851
Merged at revision: 854
Proposed branch: lp://staging/~thisfred/ubuntuone-client/lp-702055
Merge into: lp://staging/ubuntuone-client
Diff against target: 501 lines (+173/-63)
6 files modified
tests/platform/linux/test_messaging.py (+8/-3)
tests/status/test_aggregator.py (+90/-27)
ubuntuone/platform/linux/messaging.py (+28/-11)
ubuntuone/platform/windows/messaging.py (+15/-8)
ubuntuone/status/aggregator.py (+28/-12)
ubuntuone/status/messaging.py (+4/-2)
To merge this branch: bzr merge lp://staging/~thisfred/ubuntuone-client/lp-702055
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Alejandro J. Cura (community) Approve
Review via email: mp+48987@code.staging.launchpad.net

Commit message

This adds notifications and messaging on new incoming shares and UDFs.

Description of the change

This adds notifications and messaging on new incoming shares and UDFs.

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Great branch!

Two small issues:
 * I think that new_share_available in StatusFrontend should also pass _callback to messaging.show_message, just like new_udf_available
 * I think that StatusFrontend._callback should be named more descriptively.

Otherwise great work :-)

review: Needs Fixing
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Also, StatusAggregator.restart_progress_bubble should be called after any send_notification. In fact, I believe we should make an aggregating/updating mechanism (like the one in FileDiscoveryBubble) in an upcoming branch, so if more events are received they are shown on the current notification.

For instance, turning on the computer and finding out 3 new udfs are available. With this branch we'll see three bubbles one after the other, each popping up immediately after the previous is hidden. With an updating mechanism we would only see one bubble, and the message would be updated as soon as the second and third udfs are found.

Revision history for this message
Eric Casteleijn (thisfred) wrote :

The reason share_available does not pass the callback, is because it does not need a special callback method that updates the count like new_udf. If no callback is passed in, the default is used, which opens the volumes tab in the control panel and hides the message.

I'll rename the _callback method.

And yes, we probably will want to aggregate the notifications (though maybe not for new shares.) I'll look into that on a new branch.

Revision history for this message
Eric Casteleijn (thisfred) wrote :

method renamed in r851

Revision history for this message
Alejandro J. Cura (alecu) wrote :

+1

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (192.5 KiB)

The attempt to merge lp:~thisfred/ubuntuone-client/lp-702055 into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.16
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches