Merge lp://staging/~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0beta1 into lp://staging/ubuntu/precise/cairo-dock-plug-ins

Proposed by Matthieu Baerts
Status: Merged
Merge reported by: Stefano Rivera
Merged at revision: not available
Proposed branch: lp://staging/~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0beta1
Merge into: lp://staging/ubuntu/precise/cairo-dock-plug-ins
Diff against target: 174493 lines (+69904/-47645)
482 files modified
.pc/01-removed-useless-g_print.patch/switcher/src/applet-draw.c (+0/-689)
.pc/01-removed-useless-g_print.patch/switcher/src/applet-load-icons.c (+0/-238)
.pc/applied-patches (+0/-1)
Animated-icons/data/Animated-icons.conf.in (+0/-9)
Animated-icons/src/applet-config.c (+0/-5)
Animated-icons/src/applet-pulse.c (+2/-1)
Animated-icons/src/applet-rays.c (+4/-2)
Animated-icons/src/applet-rotation.c (+3/-3)
Animated-icons/src/applet-spot.c (+3/-3)
Animated-icons/src/applet-unfold.c (+14/-19)
Animated-icons/src/applet-wave.c (+5/-5)
Animated-icons/src/applet-wobbly.c (+3/-3)
Applets.stable (+2/-0)
CMakeLists.txt (+284/-174)
Cairo-Penguin/data/Cairo-Penguin.conf.in (+2/-2)
Cairo-Penguin/src/applet-animation.c (+8/-13)
Cairo-Penguin/src/applet-animation.h (+2/-2)
Cairo-Penguin/src/applet-init.c (+6/-6)
Cairo-Penguin/src/applet-notifications.c (+5/-14)
Clipper/data/Clipper.conf.in (+3/-4)
Clipper/src/applet-clipboard.c (+5/-2)
Clipper/src/applet-config.c (+2/-23)
Clipper/src/applet-init.c (+13/-3)
Clipper/src/applet-notifications.c (+21/-7)
Clipper/src/applet-notifications.h (+3/-3)
Clipper/src/applet-struct.h (+2/-1)
Composite-Manager/data/Composite-Manager.conf.in (+4/-5)
Composite-Manager/src/applet-config.c (+2/-12)
Composite-Manager/src/applet-init.c (+11/-0)
Composite-Manager/src/applet-notifications.c (+9/-3)
Composite-Manager/src/applet-notifications.h (+4/-2)
Composite-Manager/src/applet-struct.h (+2/-1)
Dbus/interfaces/bash/CDBashApplet.py (+0/-83)
Dbus/interfaces/bash/CDBashApplet.py.in (+83/-0)
Dbus/interfaces/bash/CDBashApplet.sh (+4/-1)
Dbus/interfaces/bash/CMakeLists.txt (+4/-3)
Dbus/interfaces/mono/CDApplet.cs (+5/-1)
Dbus/interfaces/mono/CMakeLists.txt (+1/-1)
Dbus/interfaces/python/CDApplet.py (+0/-272)
Dbus/interfaces/python/CDApplet.py.in (+275/-0)
Dbus/interfaces/python/CMakeLists.txt (+5/-3)
Dbus/interfaces/python/CairoDock.py (+0/-115)
Dbus/interfaces/python/CairoDock.py.in (+117/-0)
Dbus/interfaces/ruby/CDApplet.rb (+3/-3)
Dbus/interfaces/vala/CDApplet.vala (+5/-1)
Dbus/interfaces/vala/src/CDApplet.h (+2/-2)
Dbus/src/applet-dbus.c (+7/-4)
Dbus/src/applet-struct.h (+2/-1)
Dbus/src/dbus-applet-spec.h (+200/-199)
Dbus/src/dbus-main-spec.h (+264/-264)
Dbus/src/dbus-sub-applet-spec.h (+104/-104)
Dbus/src/dbus_applet_introspectable.xml (+3/-0)
Dbus/src/interface-applet-methods.c (+112/-126)
Dbus/src/interface-applet-methods.h (+2/-0)
Dbus/src/interface-applet-object.c (+9/-6)
Dbus/src/interface-applet-signals.c (+9/-9)
Dbus/src/interface-main-methods.c (+11/-16)
Disks/data/Disks.conf.in (+2/-3)
Disks/src/applet-notifications.c (+0/-4)
Doncky/data/Doncky.conf.in (+3/-4)
Doncky/src/applet-notifications.c (+1/-2)
Folders/data/Folders.conf.in (+3/-4)
Folders/src/applet-notifications.c (+22/-20)
GMenu/data/GMenu.conf.in (+3/-4)
GMenu/src/applet-config.c (+0/-6)
GMenu/src/applet-init.c (+16/-4)
GMenu/src/applet-menu-callbacks.c (+31/-30)
GMenu/src/applet-menu.c (+35/-30)
GMenu/src/applet-menu.h (+1/-1)
GMenu/src/applet-notifications.c (+0/-5)
GMenu/src/applet-run-dialog.c (+3/-0)
GMenu/src/applet-struct.h (+7/-5)
Global-Menu/CMakeLists.txt (+6/-0)
Global-Menu/data/CMakeLists.txt (+12/-0)
Global-Menu/data/Global-Menu.conf.in (+131/-0)
Global-Menu/data/button-close.svg (+1198/-0)
Global-Menu/data/button-max.svg (+839/-0)
Global-Menu/data/button-min.svg (+323/-0)
Global-Menu/data/button-restore.svg (+1082/-0)
Global-Menu/data/icon.svg (+441/-0)
Global-Menu/registrar/CMakeLists.txt (+8/-0)
Global-Menu/registrar/appmenu-registrar.py.in (+95/-0)
Global-Menu/src/CMakeLists.txt (+50/-0)
Global-Menu/src/MwmUtil.h (+136/-0)
Global-Menu/src/applet-app.c (+462/-0)
Global-Menu/src/applet-app.h (+44/-0)
Global-Menu/src/applet-config.c (+57/-0)
Global-Menu/src/applet-config.h (+30/-0)
Global-Menu/src/applet-draw.c (+406/-0)
Global-Menu/src/applet-draw.h (+44/-0)
Global-Menu/src/applet-init.c (+228/-0)
Global-Menu/src/applet-init.h (+31/-0)
Global-Menu/src/applet-notifications.c (+365/-0)
Global-Menu/src/applet-notifications.h (+58/-0)
Global-Menu/src/applet-struct.h (+90/-0)
Impulse/data/Impulse.conf.in (+1/-2)
Impulse/src/CMakeLists.txt (+10/-3)
Impulse/src/Impulse.c (+69/-48)
Impulse/src/Impulse.h (+7/-7)
Impulse/src/applet-impulse.c (+5/-4)
Impulse/src/applet-init.c (+4/-3)
Impulse/src/applet-notifications.c (+1/-2)
Indicator-applet/CMakeLists.txt (+3/-0)
Indicator-applet/indicator-applet.c (+78/-36)
Indicator-applet/indicator-applet.h (+12/-4)
MeMenu/data/MeMenu.conf.in (+1/-2)
MeMenu/src/CMakeLists.txt (+6/-0)
MeMenu/src/about-me-menu-item.c (+14/-2)
MeMenu/src/about-me-menu-item.h (+1/-1)
MeMenu/src/applet-init.c (+2/-1)
MeMenu/src/applet-menu.c (+38/-4)
MeMenu/src/applet-menu.h (+4/-0)
MeMenu/src/applet-notifications.c (+1/-2)
Messaging-Menu/data/Messaging-Menu.conf.in (+11/-3)
Messaging-Menu/src/CMakeLists.txt (+3/-0)
Messaging-Menu/src/applet-config.c (+2/-2)
Messaging-Menu/src/applet-init.c (+18/-4)
Messaging-Menu/src/applet-menu.c (+125/-68)
Messaging-Menu/src/applet-menu.h (+4/-0)
Messaging-Menu/src/applet-notifications.c (+16/-4)
Messaging-Menu/src/applet-notifications.h (+3/-2)
Messaging-Menu/src/applet-struct.h (+2/-1)
Network-Monitor/data/Network-Monitor.conf.in (+2/-3)
Network-Monitor/src/applet-menu.c (+3/-2)
Network-Monitor/src/applet-notifications.c (+10/-28)
Network-Monitor/src/applet-wifi.c (+1/-1)
RSSreader/data/RSSreader.conf.in (+3/-4)
RSSreader/src/applet-notifications.c (+0/-4)
RSSreader/src/applet-rss.c (+2/-2)
Recent-Events/data/Recent-Events.conf.in (+2/-3)
Recent-Events/src/applet-config.c (+0/-4)
Recent-Events/src/applet-dialog.c (+9/-4)
Recent-Events/src/applet-init.c (+6/-3)
Recent-Events/src/applet-notifications.c (+6/-5)
Recent-Events/src/applet-struct.h (+1/-0)
Remote-Control/data/Remote-Control.conf.in (+5/-1)
Remote-Control/src/applet-config.c (+3/-6)
Remote-Control/src/applet-icon-finder.c (+57/-38)
Remote-Control/src/applet-init.c (+15/-11)
Remote-Control/src/applet-notifications.c (+158/-47)
Remote-Control/src/applet-notifications.h (+3/-3)
Remote-Control/src/applet-session.c (+85/-40)
Remote-Control/src/applet-session.h (+8/-3)
Remote-Control/src/applet-struct.h (+11/-3)
Scooby-Do/data/calc.sh (+4/-4)
Scooby-Do/data/updatedb.sh (+4/-4)
Scooby-Do/src/applet-config.c (+0/-2)
Scooby-Do/src/applet-init.c (+7/-2)
Scooby-Do/src/applet-listing.c (+24/-20)
Scooby-Do/src/applet-notifications.c (+7/-2)
Scooby-Do/src/applet-session.c (+7/-5)
Scooby-Do/src/applet-struct.h (+1/-0)
Status-Notifier/data/Status-Notifier.conf.in (+20/-6)
Status-Notifier/src/CMakeLists.txt (+3/-0)
Status-Notifier/src/applet-config.c (+2/-1)
Status-Notifier/src/applet-draw.c (+10/-10)
Status-Notifier/src/applet-draw.h (+0/-6)
Status-Notifier/src/applet-host-ias.c (+2/-2)
Status-Notifier/src/applet-host-kde.c (+3/-2)
Status-Notifier/src/applet-host.c (+3/-3)
Status-Notifier/src/applet-init.c (+8/-8)
Status-Notifier/src/applet-item.c (+18/-10)
Status-Notifier/src/applet-item.h (+3/-0)
Status-Notifier/src/applet-notifications.c (+1/-2)
Status-Notifier/src/applet-struct.h (+8/-4)
Status-Notifier/watcher/CMakeLists.txt (+2/-12)
Status-Notifier/watcher/status-notifier-watcher.py (+0/-131)
Status-Notifier/watcher/status-notifier-watcher.py.in (+143/-0)
System-Monitor/data/System-Monitor.conf.in (+4/-5)
System-Monitor/src/applet-notifications.c (+0/-4)
System-Monitor/src/applet-top.c (+1/-1)
Toons/data/Toons.conf.in (+2/-3)
Toons/src/applet-draw.c (+1/-1)
Toons/src/applet-notifications.c (+3/-4)
Xgamma/data/Xgamma.conf.in (+10/-4)
Xgamma/src/applet-config.c (+4/-0)
Xgamma/src/applet-init.c (+17/-0)
Xgamma/src/applet-notifications.c (+12/-7)
Xgamma/src/applet-notifications.h (+6/-3)
Xgamma/src/applet-struct.h (+4/-0)
Xgamma/src/applet-xgamma.c (+14/-4)
alsaMixer/data/AlsaMixer.conf.in (+30/-24)
alsaMixer/data/broken.svg (+737/-154)
alsaMixer/data/default.svg (+107/-73)
alsaMixer/data/mute.svg (+866/-327)
alsaMixer/src/CMakeLists.txt (+68/-67)
alsaMixer/src/applet-backend-alsamixer.c (+375/-0)
alsaMixer/src/applet-backend-alsamixer.h (+33/-0)
alsaMixer/src/applet-backend-sound-menu.c (+226/-0)
alsaMixer/src/applet-backend-sound-menu.h (+32/-0)
alsaMixer/src/applet-config.c (+1/-7)
alsaMixer/src/applet-draw.c (+26/-36)
alsaMixer/src/applet-draw.h (+2/-8)
alsaMixer/src/applet-generic.c (+123/-0)
alsaMixer/src/applet-generic.h (+45/-0)
alsaMixer/src/applet-init.c (+44/-91)
alsaMixer/src/applet-menu.c (+464/-0)
alsaMixer/src/applet-menu.h (+35/-0)
alsaMixer/src/applet-mixer.c (+0/-309)
alsaMixer/src/applet-mixer.h (+0/-55)
alsaMixer/src/applet-notifications.c (+27/-31)
alsaMixer/src/applet-struct.h (+27/-1)
alsaMixer/src/common-defs.h (+93/-0)
alsaMixer/src/dbus-shared-names.h (+37/-0)
alsaMixer/src/metadata-widget.c (+995/-0)
alsaMixer/src/metadata-widget.h (+55/-0)
alsaMixer/src/mute-widget.c (+135/-0)
alsaMixer/src/mute-widget.h (+67/-0)
alsaMixer/src/transport-widget.c (+1882/-0)
alsaMixer/src/transport-widget.h (+73/-0)
alsaMixer/src/voip-input-widget.c (+289/-0)
alsaMixer/src/voip-input-widget.h (+60/-0)
alsaMixer/src/volume-widget.c (+327/-0)
alsaMixer/src/volume-widget.h (+62/-0)
clock/data/clock.conf.in (+2/-3)
clock/src/applet-draw.c (+1/-1)
clock/src/applet-notifications.c (+2/-7)
clock/src/applet-task-editor.c (+2/-2)
clock/src/applet-timer.c (+11/-8)
cmake_modules/GNUInstallDirs.cmake (+182/-0)
debian/cairo-dock-plug-ins-data.install (+2/-1)
debian/cairo-dock-plug-ins-dbus-interface-mono.install (+1/-0)
debian/cairo-dock-plug-ins-dbus-interface-python.install (+2/-0)
debian/cairo-dock-plug-ins-dbus-interface-ruby.install (+1/-0)
debian/cairo-dock-plug-ins-dbus-interface-vala.install (+3/-0)
debian/cairo-dock-plug-ins-dbus-interface-vala.lintian-overrides (+3/-0)
debian/cairo-dock-plug-ins-dbus-interface-vala.postinst (+7/-0)
debian/cairo-dock-plug-ins-integration.install (+1/-1)
debian/cairo-dock-plug-ins.install (+3/-8)
debian/cairo-dock-plug-ins.lintian-overrides (+0/-4)
debian/changelog (+49/-0)
debian/compat (+1/-1)
debian/control (+100/-31)
debian/copyright (+1/-0)
debian/patches/01-removed-useless-g_print.patch (+0/-37)
debian/patches/series (+0/-1)
debian/rules (+3/-1)
debian/watch (+1/-1)
desklet-rendering/src/rendering-desklet-caroussel.c (+15/-15)
desklet-rendering/src/rendering-desklet-controler.c (+4/-4)
desklet-rendering/src/rendering-desklet-mediaplayer.c (+5/-5)
desklet-rendering/src/rendering-desklet-panel.c (+4/-1)
desklet-rendering/src/rendering-desklet-simple.c (+2/-2)
desklet-rendering/src/rendering-desklet-slide.c (+5/-3)
desklet-rendering/src/rendering-desklet-tree.c (+3/-1)
desklet-rendering/src/rendering-desklet-viewport.c (+4/-2)
dnd2share/data/dnd2share.conf.in (+3/-4)
dnd2share/data/upload2free.sh (+6/-1)
dnd2share/src/applet-notifications.c (+0/-4)
dock-rendering/data/rendering.conf.in (+3/-0)
dock-rendering/src/CMakeLists.txt (+1/-1)
dock-rendering/src/rendering-3D-plane.c (+22/-18)
dock-rendering/src/rendering-caroussel.c (+6/-6)
dock-rendering/src/rendering-commons.c (+45/-36)
dock-rendering/src/rendering-config.c (+2/-0)
dock-rendering/src/rendering-curve.c (+32/-73)
dock-rendering/src/rendering-diapo-simple.c (+563/-277)
dock-rendering/src/rendering-diapo.c (+0/-1)
dock-rendering/src/rendering-init.c (+1/-0)
dock-rendering/src/rendering-panel.c (+362/-224)
dock-rendering/src/rendering-parabole.c (+9/-10)
dock-rendering/src/rendering-rainbow.c (+6/-6)
drop-indicator/data/drop_indicator.conf.in (+2/-2)
drop-indicator/src/applet-init.c (+12/-12)
drop-indicator/src/applet-notifications.c (+15/-9)
dustbin/data/dustbin.conf.in (+2/-3)
dustbin/src/applet-notifications.c (+0/-6)
dustbin/src/applet-trashes-manager.c (+2/-2)
gnome-integration-old/src/applet-init.c (+1/-0)
gnome-integration/src/applet-init.c (+1/-0)
gnome-integration/src/applet-utils.c (+2/-2)
icon-effect/data/icon-effect.conf.in (+0/-6)
icon-effect/src/applet-config.c (+0/-3)
icon-effect/src/applet-fire.h (+1/-1)
icon-effect/src/applet-init.c (+0/-3)
illusion/src/applet-evaporate.c (+10/-8)
illusion/src/applet-evaporate.h (+1/-1)
illusion/src/applet-lightning.c (+1/-1)
kde-integration/src/applet-init.c (+1/-0)
kde-integration/src/applet-utils.c (+6/-1)
kde-integration/src/applet-utils.h (+2/-0)
keyboard-indicator/data/CMakeLists.txt (+2/-0)
keyboard-indicator/data/keyboard-indicator.conf.in (+11/-3)
keyboard-indicator/src/applet-config.c (+3/-4)
keyboard-indicator/src/applet-draw.c (+93/-52)
keyboard-indicator/src/applet-init.c (+35/-28)
keyboard-indicator/src/applet-notifications.c (+29/-9)
keyboard-indicator/src/applet-notifications.h (+2/-3)
keyboard-indicator/src/applet-struct.h (+7/-7)
keyboard-indicator/src/applet-xklavier.c (+18/-15)
logout/data/logout.conf.in (+27/-9)
logout/data/logout.sh (+21/-4)
logout/src/applet-config.c (+7/-2)
logout/src/applet-init.c (+22/-5)
logout/src/applet-logout.c (+456/-242)
logout/src/applet-logout.h (+0/-5)
logout/src/applet-notifications.c (+38/-98)
logout/src/applet-notifications.h (+3/-7)
logout/src/applet-struct.h (+21/-10)
mail/data/mail.conf.in (+8/-3)
mail/src/cd-mail-applet-config.c (+12/-4)
mail/src/cd-mail-applet-notifications.c (+6/-14)
motion-blur/src/applet-init.c (+8/-8)
musicPlayer/data/musicPlayer.conf.in (+15/-7)
musicPlayer/src/applet-amarok2.c (+1/-0)
musicPlayer/src/applet-amazon.c (+49/-133)
musicPlayer/src/applet-amazon.h (+1/-14)
musicPlayer/src/applet-audacious.c (+21/-5)
musicPlayer/src/applet-banshee.c (+12/-16)
musicPlayer/src/applet-clementine.c (+1/-0)
musicPlayer/src/applet-config.c (+4/-2)
musicPlayer/src/applet-cover.c (+297/-273)
musicPlayer/src/applet-cover.h (+1/-3)
musicPlayer/src/applet-dbus.c (+1/-3)
musicPlayer/src/applet-draw.c (+129/-314)
musicPlayer/src/applet-draw.h (+7/-10)
musicPlayer/src/applet-exaile.c (+2/-2)
musicPlayer/src/applet-exaile3.c (+1/-0)
musicPlayer/src/applet-gmusicbrowser.c (+1/-0)
musicPlayer/src/applet-guayadeque.c (+1/-0)
musicPlayer/src/applet-init.c (+18/-30)
musicPlayer/src/applet-listen.c (+1/-0)
musicPlayer/src/applet-mpris.c (+41/-6)
musicPlayer/src/applet-mpris.h (+3/-0)
musicPlayer/src/applet-mpris2.c (+43/-31)
musicPlayer/src/applet-musicplayer.c (+220/-88)
musicPlayer/src/applet-musicplayer.h (+1/-1)
musicPlayer/src/applet-notifications.c (+33/-22)
musicPlayer/src/applet-qmmp.c (+1/-0)
musicPlayer/src/applet-quodlibet.c (+7/-6)
musicPlayer/src/applet-rhythmbox.c (+28/-56)
musicPlayer/src/applet-songbird.c (+1/-0)
musicPlayer/src/applet-struct.h (+22/-12)
musicPlayer/src/applet-xmms2.c (+1/-0)
netspeed/data/netspeed.conf.in (+8/-5)
netspeed/src/applet-notifications.c (+3/-8)
po/ar.po (+1400/-1205)
po/cairo-dock.pot (+1388/-1196)
po/cs.po (+1392/-1207)
po/de.po (+2833/-2419)
po/el.po (+1389/-1207)
po/en_GB.po (+1392/-1206)
po/es.po (+1426/-1242)
po/et.po (+1396/-1201)
po/eu.po (+1396/-1199)
po/fr.po (+1428/-1221)
po/hu.po (+1800/-1430)
po/id.po (+1398/-1201)
po/it.po (+1390/-1212)
po/ja.po (+1396/-1213)
po/nl.po (+1397/-1222)
po/pl.po (+1398/-1201)
po/pt.po (+1394/-1199)
po/pt_BR.po (+1424/-1231)
po/ru.po (+1402/-1222)
po/sk.po (+1389/-1201)
po/sr.po (+1390/-1193)
po/sv.po (+1538/-1281)
po/tr.po (+1383/-1186)
po/uk.po (+1422/-1240)
po/zh_CN.po (+1391/-1196)
po/zh_TW.po (+1392/-1205)
powermanager/data/default-battery.svg (+382/-84)
powermanager/data/default-charge.svg (+79/-164)
powermanager/data/powermanager.conf.in (+3/-4)
powermanager/src/powermanager-config.c (+1/-1)
powermanager/src/powermanager-draw.c (+17/-9)
powermanager/src/powermanager-init.c (+10/-20)
powermanager/src/powermanager-menu-functions.c (+18/-13)
powermanager/src/powermanager-struct.h (+1/-1)
quick-browser/data/quick-browser.conf.in (+3/-4)
quick-browser/src/applet-config.c (+1/-3)
quick-browser/src/applet-init.c (+8/-2)
quick-browser/src/applet-notifications.c (+2/-6)
quick-browser/src/applet-struct.h (+1/-0)
shared-files/CMakeLists.txt (+2/-0)
shared-files/images/CMakeLists.txt (+9/-0)
shared-files/images/expose-desktops.svg (+894/-0)
shared-files/images/expose-windows.svg (+1478/-0)
shared-files/images/show-desktop.svg (+1127/-0)
shared-files/images/widget-layer.svg (+631/-0)
shared-files/scripts/CMakeLists.txt (+6/-0)
shared-files/scripts/lock-screen.sh (+26/-0)
shared-images/CMakeLists.txt (+0/-9)
shared-images/expose-desktops.svg (+0/-894)
shared-images/expose-windows.svg (+0/-1478)
shared-images/show-desktop.svg (+0/-1127)
shared-images/widget-layer.svg (+0/-631)
shortcuts/data/shortcuts.conf.in (+3/-4)
shortcuts/src/applet-bookmarks.c (+2/-1)
shortcuts/src/applet-init.c (+2/-2)
shortcuts/src/applet-notifications.c (+0/-2)
show-mouse/src/applet-init.c (+12/-12)
show-mouse/src/applet-notifications.c (+1/-1)
showDesktop/data/showDesktop.conf.in (+2/-3)
showDesktop/src/applet-config.c (+0/-2)
showDesktop/src/applet-init.c (+10/-2)
showDesktop/src/applet-notifications.c (+10/-14)
showDesktop/src/applet-struct.h (+1/-0)
slider/data/slider.conf.in (+2/-3)
slider/src/applet-notifications.c (+0/-8)
stack/data/stack.conf.in (+9/-6)
stack/src/applet-config.c (+15/-2)
stack/src/applet-load-icons.c (+11/-8)
stack/src/applet-notifications.c (+3/-8)
stack/src/applet-stack.c (+4/-15)
stack/src/applet-struct.h (+1/-0)
switcher/data/switcher.conf.in (+10/-7)
switcher/src/applet-config.c (+1/-0)
switcher/src/applet-desktops.c (+30/-12)
switcher/src/applet-draw.c (+38/-65)
switcher/src/applet-init.c (+8/-8)
switcher/src/applet-load-icons.c (+6/-6)
switcher/src/applet-notifications.c (+18/-23)
switcher/src/applet-struct.h (+7/-1)
systray/data/systray.conf.in (+3/-4)
systray/src/CMakeLists.txt (+7/-6)
systray/src/fixedtip.c (+0/-261)
systray/src/fixedtip.h (+0/-68)
systray/src/gtk2/fixedtip.c (+261/-0)
systray/src/gtk2/fixedtip.h (+68/-0)
systray/src/gtk2/na-marshal.c (+165/-0)
systray/src/gtk2/na-marshal.h (+36/-0)
systray/src/gtk2/na-tray-child.c (+520/-0)
systray/src/gtk2/na-tray-child.h (+71/-0)
systray/src/gtk2/na-tray-manager.c (+849/-0)
systray/src/gtk2/na-tray-manager.h (+97/-0)
systray/src/gtk2/na-tray.c (+836/-0)
systray/src/gtk2/na-tray.h (+67/-0)
systray/src/gtk3/fixedtip.c (+277/-0)
systray/src/gtk3/fixedtip.h (+68/-0)
systray/src/gtk3/main.c (+281/-0)
systray/src/gtk3/main.h (+57/-0)
systray/src/gtk3/na-marshal.c (+167/-0)
systray/src/gtk3/na-marshal.h (+36/-0)
systray/src/gtk3/na-tray-child.c (+525/-0)
systray/src/gtk3/na-tray-child.h (+71/-0)
systray/src/gtk3/na-tray-manager.c (+989/-0)
systray/src/gtk3/na-tray-manager.h (+114/-0)
systray/src/gtk3/na-tray.c (+862/-0)
systray/src/gtk3/na-tray.h (+76/-0)
systray/src/gtk3/testtray.c (+220/-0)
systray/src/na-marshal.c (+0/-165)
systray/src/na-marshal.h (+0/-36)
systray/src/na-tray-child.c (+0/-520)
systray/src/na-tray-child.h (+0/-71)
systray/src/na-tray-manager.c (+0/-849)
systray/src/na-tray-manager.h (+0/-97)
systray/src/na-tray.c (+0/-836)
systray/src/na-tray.h (+0/-67)
systray/src/systray-config.c (+0/-2)
systray/src/systray-init.c (+10/-5)
systray/src/systray-interface.c (+0/-7)
systray/src/systray-interface.h (+0/-2)
systray/src/systray-notifications.c (+0/-3)
systray/src/systray-struct.h (+1/-0)
template/data/template.conf.in (+3/-4)
template/src/applet-notifications.c (+1/-2)
terminal/data/terminal.conf.in (+3/-4)
terminal/src/terminal-callbacks.c (+6/-5)
terminal/src/terminal-config.c (+0/-2)
terminal/src/terminal-init.c (+9/-2)
terminal/src/terminal-menu-functions.c (+3/-6)
terminal/src/terminal-struct.h (+1/-0)
terminal/src/terminal-widget.c (+60/-38)
tomboy/data/tomboy.conf.in (+4/-5)
tomboy/src/tomboy-dbus.c (+3/-3)
tomboy/src/tomboy-draw.c (+2/-2)
tomboy/src/tomboy-notifications.c (+0/-10)
weather/data/weather.conf.in (+8/-5)
weather/src/applet-config.c (+5/-3)
weather/src/applet-notifications.c (+0/-4)
weblets/data/weblets.conf.in (+3/-4)
weblets/src/applet-notifications.c (+2/-6)
weblets/src/applet-widget.c (+3/-3)
wifi/data/wifi.conf.in (+2/-3)
wifi/src/applet-notifications.c (+2/-6)
xfce-integration/data/CMakeLists.txt (+0/-4)
xfce-integration/data/lock-screen.sh (+0/-11)
xfce-integration/src/CMakeLists.txt (+9/-6)
xfce-integration/src/applet-init.c (+1/-0)
xfce-integration/src/applet-utils.c (+1/-1)
To merge this branch: bzr merge lp://staging/~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0beta1
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+92987@code.staging.launchpad.net

Description of the change

Hello,

The Cairo-Dock team proposes a new version of its Cairo-Dock packages.

This is the Upstream (short) ChangeLog:
 * Upstream (short) ChangeLog:
   - The Log out applet has been rewritten, now allows to switch users.
   - Many shortkeys have been added in different applets
   - The Sound Menu from Ubuntu has been integrated into the
      Sound-Control applet.
   - The Sound Menu from Ubuntu has been integrated into the
      Sound-Control applet.
   - Cairo-Dock now uses GTK3, for a better integration in a Gnome desktop
   - Few additions to the DBus API.

Note that the next stable version if scheduled for March. (before the beta freeze)

This branch should be ready to be pushed on lp:ubuntu/cairo-dock-plug-ins (except the UNRELEASED version in debian/changelog)

Please upload this version before the Feature Freeze :)

Thank you for your help!

PS: 'cairo-dock' source package has to be uploaded before this package (if possible, min 20min before these plug-ins) ( LP: #932041 )

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches