Merge lp://staging/~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3 into lp://staging/ubuntu/oneiric/cairo-dock-plug-ins
Proposed by
Matthieu Baerts
| Status: | Merged |
|---|---|
| Merged at revision: | 20 |
| Proposed branch: | lp://staging/~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3 |
| Merge into: | lp://staging/ubuntu/oneiric/cairo-dock-plug-ins |
| Diff against target: |
1611 lines (+21/-1508) 10 files modified
.pc/01-ubuntuone-fix_upstream-version-2.3.0~2.1.patch/CMakeLists.txt (+0/-941) .pc/01-ubuntuone-fix_upstream-version-2.3.0~2.1.patch/dnd2share/src/applet-backend-ubuntuone.c (+0/-95) .pc/02-weather-fix_upstream-version-2.3.0~2.2.patch/weather/src/applet-read-data.c (+0/-462) .pc/applied-patches (+0/-2) CMakeLists.txt (+1/-1) Status-Notifier/src/CMakeLists.txt (+2/-2) debian/changelog (+14/-0) debian/control (+3/-3) debian/patches/series (+0/-2) weather/src/applet-load-icons.c (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Terry | Approve | ||
|
Review via email:
|
|||
Description of the change
This is a bugs fixed version.
How to reproduce the bugs:
* Simply drop a file into the Drop to Share (aka DND2Share) applet configured to use UbuntuOne and u1sdtool will crash.
* If the connection is stopped/slowed down during the download of weather xml files, the dock (version 2.3.0~1 and 2.3.0~2.1) will crash.
* Translations of Status Notifier applet are not enabled.
Thank you
PS: please don't forget to update the core too (LP: #799773)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good, thanks! Merged.