Merge lp://staging/~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1 into lp://staging/ubuntu/precise/cairo-dock-plug-ins
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 26 | ||||
Proposed branch: | lp://staging/~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1 | ||||
Merge into: | lp://staging/ubuntu/precise/cairo-dock-plug-ins | ||||
Diff against target: |
206862 lines (+66950/-58008) 126 files modified
CMakeLists.txt (+66/-49) Clipper/src/applet-clipboard.c (+4/-3) Dbus/interfaces/bash/CDBashApplet.sh (+2/-0) Dbus/interfaces/mono/CDApplet.cs (+4/-0) Dbus/interfaces/python/CDApplet.py.in (+5/-0) Dbus/interfaces/python/CairoDock.py.in (+3/-0) Dbus/interfaces/ruby/CDApplet.rb (+2/-0) Dbus/interfaces/vala/CDApplet.vala (+4/-0) Dbus/src/applet-dbus.c (+2/-2) Dbus/src/interface-applet-methods.c (+1/-1) Dbus/src/interface-main-methods.c (+3/-3) Folders/src/applet-notifications.c (+7/-1) GMenu/src/applet-init.c (+1/-0) GMenu/src/applet-menu-callbacks.c (+5/-5) GMenu/src/applet-menu.c (+8/-4) GMenu/src/applet-menu.h (+1/-1) GMenu/src/applet-recent.c (+2/-2) GMenu/src/applet-run-dialog.c (+1/-1) GMenu/src/applet-struct.h (+1/-0) Global-Menu/src/applet-draw.c (+38/-13) Indicator-applet/indicator-applet.c (+45/-13) Messaging-Menu/data/Messaging-Menu.conf.in (+2/-2) Network-Monitor/data/Network-Monitor.conf.in (+2/-2) Recent-Events/data/Recent-Events.conf.in (+1/-1) Recent-Events/src/applet-dialog.c (+29/-14) Recent-Events/src/applet-dialog.h (+3/-0) Recent-Events/src/applet-init.c (+11/-1) Recent-Events/src/applet-notifications.c (+2/-1) Recent-Events/src/applet-struct.h (+3/-0) Remote-Control/src/applet-notifications.c (+14/-6) Remote-Control/src/applet-struct.h (+1/-1) Scooby-Do/src/applet-appli-finder.c (+7/-6) Scooby-Do/src/applet-icon-finder.c (+1/-1) Status-Notifier/data/Status-Notifier.conf.in (+2/-2) Status-Notifier/src/CMakeLists.txt (+1/-0) Status-Notifier/src/applet-draw.c (+23/-10) Status-Notifier/src/applet-host-ias.c (+109/-21) Status-Notifier/src/applet-host.c (+5/-3) Status-Notifier/src/applet-item.c (+28/-9) Status-Notifier/src/applet-item.h (+1/-1) Status-Notifier/src/applet-notifications.c (+20/-9) Status-Notifier/src/applet-struct.h (+2/-1) System-Monitor/data/System-Monitor.conf.in (+2/-2) Toons/data/Toons.conf.in (+2/-2) Toons/src/applet-notifications.c (+1/-1) alsaMixer/data/AlsaMixer.conf.in (+2/-2) alsaMixer/src/CMakeLists.txt (+1/-0) alsaMixer/src/applet-backend-sound-menu.c (+4/-0) alsaMixer/src/applet-draw.c (+3/-2) alsaMixer/src/applet-init.c (+5/-8) alsaMixer/src/applet-notifications.c (+28/-14) alsaMixer/src/dbus-shared-names-old.h (+37/-0) alsaMixer/src/dbus-shared-names.h (+4/-4) alsaMixer/src/metadata-widget.c (+42/-34) alsaMixer/src/transport-widget.c (+7/-0) alsaMixer/src/volume-widget.c (+1/-1) clock/data/clock.conf.in (+5/-2) clock/src/CMakeLists.txt (+0/-52) clock/src/applet-config.c (+36/-26) clock/src/applet-digital.c (+0/-239) clock/src/applet-digital.h (+0/-38) clock/src/applet-draw.c (+41/-38) clock/src/applet-timer.c (+0/-1) debian/changelog (+69/-0) debian/control (+3/-3) dnd2share/src/applet-notifications.c (+5/-4) drop-indicator/src/applet-notifications.c (+1/-0) dustbin/src/applet-init.c (+3/-3) gnome-integration/src/applet-init.c (+22/-13) gnome-integration/src/applet-utils.c (+1/-0) gvfs-integration/cairo-dock-gio-vfs.c (+3/-3) kde-integration/src/applet-vfs.c (+1/-1) keyboard-indicator/data/keyboard-indicator.conf.in (+2/-2) logout/src/applet-init.c (+2/-0) logout/src/applet-logout.c (+29/-16) logout/src/applet-struct.h (+1/-0) mail/data/mail.conf.in (+2/-2) mail/src/cd-mail-applet-config.c (+2/-2) mail/src/cd-mail-applet-init.c (+2/-2) musicPlayer/data/musicPlayer.conf.in (+2/-2) musicPlayer/src/applet-draw.c (+1/-1) musicPlayer/src/applet-musicplayer.c (+2/-2) musicPlayer/src/applet-notifications.c (+2/-0) musicPlayer/src/applet-rhythmbox.c (+1/-1) netspeed/data/netspeed.conf.in (+2/-2) po/ar.po (+2509/-2205) po/cairo-dock.pot (+2477/-2166) po/cs.po (+2537/-2210) po/de.po (+2507/-2173) po/el.po (+2502/-2165) po/en_GB.po (+2572/-2231) po/es.po (+2497/-2164) po/et.po (+2541/-2225) po/eu.po (+2508/-2203) po/fr.po (+2502/-2166) po/hu.po (+2555/-2229) po/id.po (+2507/-2203) po/it.po (+2502/-2167) po/ja.po (+2772/-2266) po/nl.po (+2496/-2159) po/pl.po (+2515/-2213) po/pt.po (+2536/-2210) po/pt_BR.po (+2487/-2145) po/ru.po (+2508/-2171) po/sk.po (+2511/-2174) po/sr.po (+2528/-2200) po/sv.po (+2517/-2198) po/tr.po (+2529/-2215) po/uk.po (+2484/-2145) po/zh_CN.po (+2543/-2212) po/zh_TW.po (+2568/-2179) powermanager/data/powermanager.conf.in (+2/-2) powermanager/src/powermanager-menu-functions.c (+14/-1) quick-browser/src/applet-menu.c (+1/-1) shortcuts/src/applet-drives.c (+1/-1) slider/data/slider.conf.in (+2/-2) slider/src/applet-config.c (+0/-15) slider/src/applet-init.c (+29/-81) slider/src/applet-notifications.c (+27/-27) slider/src/applet-slider.c (+279/-135) slider/src/applet-slider.h (+6/-12) stack/src/applet-config.c (+2/-2) stack/src/applet-load-icons.c (+1/-1) switcher/src/applet-draw.c (+21/-16) weather/data/weather.conf.in (+2/-2) wifi/data/wifi.conf.in (+2/-2) |
||||
To merge this branch: | bzr merge lp://staging/~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jamie Strandboge | Approve | ||
Review via email: mp+98724@code.staging.launchpad.net |
Description of the change
Hello,
The Cairo-Dock team proposes a new "bugs fixed" version of their Cairo-Dock packages.
This is the Upstream (short) ChangeLog:
* Upstream ChangeLog: (main changes)
- Updated translations
- MusicPlayer:
+ When choosing the player the first time, launch it and set the name
+ It seems the latest stable version of rhythmbox now re-uses this DBus
address: org.mpris.
- Use the default bg color for always visible icons
- GMenu: check if kde4-applicatio
are available
- Dbus:
+ Bash interface: fixed a typo
+ Changed the third-party applets dir on the server for the 3.0
+ Enabling threads on the Python Interface
+ Modified the old SetEmblem method to use the new overlays
- Enable GVFS if detected
- Indicators: handle the case where the service crashes
- Status-Notifier:
+ Indicator 0.4.90 (and newer) has a new variable (Title)
+ Display Label first if it's available instead of Title first
+ Fixed a bug with empty labels
+ KDE's watcher: if ItemIsMenu is true (e.g. Klipper) and if we only show
the menu on left click, we emit a signal to the application to show
its own menu
+ checked if the menu path is different that '/NO_DBUSMENU'
+ IAS: checked if an item is not already available in the systray
(workaround) and fixed a few typos
+ Added a space between icons and fixed the wrong drawing of the icon
on a vertical dock if the icon can be resized
+ Used cairo_dock_
- Sound control:
+ Fixed a small bug on reload (invisible icon)
+ Updated the Dbus names to match with Ubuntu 12.04
+ Backported the latest version of Ubuntu's indicator-sound into the
+ Make some items in the menu invisible if not available
+ Worked around a bug in libindicator, which keeps internally
the service pointer
- Logout:
+ Fixed a tiny memory leak
+ Look for a different icon's size if we want to display this icon in
a menu/a dock/an emblem
- PowerManager:
+ Removed an extraseparators in the menu
- Clock:
+ Used the logical rectangle in order to fix the position of the text
+ Removed unused files
+ Removed useless translations (log.x and log.y = 0)
+ Only used this ratio to limit the deformation with the height
+ Fixed a problem with the ratio if this applet is displayed in
a vertical dock
- Remote Control: fixed a crash during the 'click' signal
- Slider:
+ When reloading, display the changes immediately
+ Added the possibility to refresh the images list from the menu
+ Fixed the loading of the image on startup, when the applet's size is
not yet stable
+ Code cleaning
- Fixed an error when compiling without libindicator
- A few minor changes (comments, factorisation, etc)
- Recent-Events: if zeitgeist is not yet running on first search,
try 3 times before giving up.
This bzr branch has been linked to this bug report: lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1
This branch should be ready to be pushed on lp:ubuntu/cairo-dock-plug-ins (except the UNRELEASED version in debian/changelog)
Thank you for your help! ;)
PS: 'cairo-dock' package has to be uploaded before this package! (if possible, 30min before) ( LP: #961578 )
Verified changes against the upstream tarball and successfully build locally. ACK. Thanks!