Merge lp://staging/~cairo-dock-team/ubuntu/precise/cairo-dock/3.0.0.0rc1 into lp://staging/ubuntu/precise/cairo-dock
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 23 | ||||
| Proposed branch: | lp://staging/~cairo-dock-team/ubuntu/precise/cairo-dock/3.0.0.0rc1 | ||||
| Merge into: | lp://staging/ubuntu/precise/cairo-dock | ||||
| Diff against target: |
170366 lines (+36170/-32583) 92 files modified
CMakeLists.txt (+2/-2) data/cairo-dock-simple.conf.in (+3/-4) data/cairo-dock.conf.in (+18/-13) data/default-theme/cairo-dock.conf (+2/-3) data/default-theme/plug-ins/musicPlayer/musicPlayer.conf (+1/-1) debian/changelog (+45/-0) po/ar.po (+846/-782) po/be.po (+878/-800) po/bn.po (+841/-793) po/ca.po (+859/-791) po/cairo-dock.pot (+812/-757) po/cs.po (+880/-810) po/cy.po (+830/-781) po/de.po (+906/-836) po/el.po (+899/-829) po/en_GB.po (+1075/-1004) po/es.po (+911/-840) po/et.po (+833/-782) po/eu.po (+873/-799) po/fi.po (+831/-781) po/fo.po (+838/-781) po/fr.po (+913/-843) po/gl.po (+862/-796) po/hu.po (+894/-818) po/id.po (+832/-783) po/it.po (+899/-828) po/ja.po (+1401/-1059) po/ko.po (+1028/-856) po/nb.po (+874/-799) po/nl.po (+910/-840) po/oc.po (+830/-779) po/pl.po (+866/-794) po/pt.po (+874/-802) po/pt_BR.po (+891/-819) po/ro.po (+838/-780) po/ru.po (+901/-829) po/sk.po (+877/-804) po/sl.po (+875/-803) po/sr.po (+880/-812) po/sv.po (+839/-791) po/tr.po (+847/-785) po/uk.po (+901/-829) po/vi.po (+834/-785) po/zh_CN.po (+979/-846) po/zh_TW.po (+1020/-864) src/cairo-dock-gui-items.c (+3/-2) src/cairo-dock-gui-main.c (+126/-167) src/cairo-dock-gui-simple.c (+8/-7) src/cairo-dock-menu.c (+36/-12) src/cairo-dock.c (+13/-8) src/gldit/cairo-dock-X-manager.c (+9/-7) src/gldit/cairo-dock-X-utilities.c (+18/-6) src/gldit/cairo-dock-animations.c (+1/-1) src/gldit/cairo-dock-applet-manager.c (+1/-1) src/gldit/cairo-dock-application-facility.c (+51/-0) src/gldit/cairo-dock-application-facility.h (+2/-0) src/gldit/cairo-dock-applications-manager.c (+27/-8) src/gldit/cairo-dock-applications-manager.h (+2/-0) src/gldit/cairo-dock-callbacks.c (+60/-14) src/gldit/cairo-dock-class-manager.c (+133/-79) src/gldit/cairo-dock-class-manager.h (+2/-0) src/gldit/cairo-dock-config.c (+1/-19) src/gldit/cairo-dock-container.c (+3/-21) src/gldit/cairo-dock-container.h (+28/-8) src/gldit/cairo-dock-data-renderer.c (+32/-6) src/gldit/cairo-dock-data-renderer.h (+1/-0) src/gldit/cairo-dock-desklet-factory.c (+41/-30) src/gldit/cairo-dock-desklet-factory.h (+1/-1) src/gldit/cairo-dock-desklet-manager.c (+24/-24) src/gldit/cairo-dock-desklet-manager.h (+25/-23) src/gldit/cairo-dock-dialog-factory.c (+2/-1) src/gldit/cairo-dock-dialog-manager.c (+11/-2) src/gldit/cairo-dock-dock-facility.c (+5/-3) src/gldit/cairo-dock-dock-factory.c (+25/-10) src/gldit/cairo-dock-dock-manager.c (+72/-48) src/gldit/cairo-dock-dock-manager.h (+1/-0) src/gldit/cairo-dock-file-manager.c (+6/-1) src/gldit/cairo-dock-file-manager.h (+2/-0) src/gldit/cairo-dock-flying-container.c (+4/-3) src/gldit/cairo-dock-gui-factory.c (+151/-56) src/gldit/cairo-dock-gui-factory.h (+8/-1) src/gldit/cairo-dock-gui-manager.c (+0/-1) src/gldit/cairo-dock-icon-factory.h (+2/-1) src/gldit/cairo-dock-icon-manager.c (+84/-12) src/gldit/cairo-dock-icon-manager.h (+15/-1) src/gldit/cairo-dock-keybinder.c (+26/-25) src/gldit/cairo-dock-launcher-manager.c (+2/-2) src/gldit/cairo-dock-log.c (+24/-23) src/gldit/cairo-dock-module-factory.c (+19/-3) src/gldit/cairo-dock-module-manager.c (+3/-10) src/gldit/cairo-dock-opengl.c (+10/-1) src/gldit/cairo-dock-surface-factory.c (+2/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~cairo-dock-team/ubuntu/precise/cairo-dock/3.0.0.0rc1 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jamie Strandboge | Approve | ||
|
Review via email:
|
|||
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
- Fixed the default theme (wrong sensitivity)
- Fixed a small regression with the module loader
- Added a modifier to display a widget in cairo or opengl only
(an option for poor drivers)
- Fixed a regression that made incorrect dock size in Parabolic view
and the rendering of docks
- Fixed a small bug in the advanced config window and fixed a memory leak
- Avoid some 'unforseen consequences' when the icon theme changes
- Copyright: Fixed a few typo with the licences
- Advanced mode of the config panel: a few tweaks to get a better look
- Fixed a bug where class container-icons were invisible
- Added a workaround to fix a bug in Compiz (or X?) where down-sizing
the screen resolution does not trigger the _NET_DESKTOP_
- Fixed a possible (although probably very rare) crash case with sub-docks
- When entering a dock, update correctly the pointed icon to avoid
animation on the previously pointed icon
- Take into account the window border to compute the right window
position and size
- quick-info: reduce the background size to minimize their surface
- GTK3: gdk_window_
are deprecated
- GTK3: since the release of GTK 3.3.18, we have to add GDK_SCROLL_MASK
to be notified with scroll events.
- data-renderer: ensure the container's window has reached its correct
size before drawing
- resize the containers to 1x1 initially, to avoid seeing them before
a correct size has been set
- Icons from GTK themes: specify the right icons size in order to not load
too detailed images for tiny icons sizes
- Reduced the icon size in the advanced GUI window (32 -> 28)
- Added cairo_dock_
cairo_
- Handle the case where the icon tries to draw itself before the GL
context is ready
- Fixed the server adress in the simple GUI
- A few code cleaning
- Fixed a few details and tiny bugs (-> BZR logs)
This branch should be ready to be pushed on lp:ubuntu/cairo-dock (except the UNRELEASED version in debian/changelog)
Thank you for your help! ;)
PS: Don't forget our plug-ins ! ( LP: #961579 )
Verified changes against the upstream tarball and successfully build locally. ACK. Thanks!