Merge lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.4.0-1 into lp:ubuntu/oneiric/cairo-dock-plug-ins

Proposed by Matthieu Baerts on 2011-09-26
Status: Merged
Merged at revision: 22
Proposed branch: lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.4.0-1
Merge into: lp:ubuntu/oneiric/cairo-dock-plug-ins
Diff against target: 166580 lines (+31190/-78303)
233 files modified
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+1/-0)
.pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in (+177/-0)
.pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c (+78/-0)
.pc/applied-patches (+1/-0)
Animated-icons/src/applet-unfold.c (+2/-2)
Applets.stable (+8/-2)
CMakeLists.txt (+68/-56)
Cairo-Penguin/src/applet-animation.c (+2/-2)
Clipper/data/Clipper.conf.in (+2/-2)
Clipper/src/applet-clipboard.c (+15/-9)
Clipper/src/applet-clipboard.h (+1/-0)
Clipper/src/applet-init.c (+14/-0)
Composite-Manager/data/Composite-Manager.conf.in (+1/-1)
Composite-Manager/src/applet-composite-manager.c (+7/-7)
Dbus/demos/demo_bash/demo_bash.conf (+1/-1)
Dbus/demos/demo_mono/auto-load.conf (+1/-1)
Dbus/demos/demo_mono/demo_mono.conf (+3/-3)
Dbus/demos/demo_python/auto-load.conf (+2/-2)
Dbus/demos/demo_python/demo_python.conf (+3/-3)
Dbus/demos/demo_ruby/auto-load.conf (+1/-1)
Dbus/demos/demo_ruby/demo_ruby.conf (+3/-3)
Dbus/demos/demo_vala/auto-load.conf (+1/-1)
Dbus/demos/demo_vala/demo_vala.conf (+3/-3)
Dbus/interfaces/bash/CDBashApplet.sh (+9/-5)
Dbus/interfaces/mono/CDApplet.cs (+9/-5)
Dbus/interfaces/python/CDApplet.py (+9/-5)
Dbus/interfaces/python/CairoDock.py (+9/-5)
Dbus/interfaces/ruby/CDApplet.rb (+9/-5)
Dbus/interfaces/vala/CDApplet.vala (+13/-9)
Dbus/interfaces/vala/src/CDApplet.h (+11/-7)
Dbus/interfaces/vala/src/CDApplet.vapi (+9/-5)
Dbus/src/applet-struct.h (+0/-1)
Dbus/src/interface-applet-methods.c (+18/-9)
Dbus/src/interface-applet-object.c (+5/-4)
Dbus/src/interface-applet-signals.c (+1/-1)
Dbus/src/interface-main-methods.c (+18/-10)
Disks/data/Disks.conf.in (+5/-2)
Disks/src/applet-config.c (+1/-0)
Disks/src/applet-disks.c (+1/-0)
Disks/src/applet-init.c (+6/-2)
Disks/src/applet-struct.h (+1/-0)
Doncky/data/Doncky.conf.in (+1/-1)
Folders/data/CMakeLists.txt (+1/-1)
Folders/data/Folders.conf.in (+1/-1)
Folders/data/icon.svg (+0/-127)
Folders/src/CMakeLists.txt (+1/-1)
Folders/src/applet-config.c (+3/-4)
Folders/src/applet-init.c (+74/-38)
Folders/src/applet-notifications.c (+51/-15)
Folders/src/applet-struct.h (+1/-1)
GMenu/data/GMenu.conf.in (+1/-1)
Impulse/data/Impulse.conf.in (+1/-1)
Impulse/src/Impulse.c (+4/-4)
Impulse/src/applet-config.c (+2/-0)
Impulse/src/applet-impulse.c (+1/-1)
Indicator-applet/indicator-applet.c (+9/-4)
MeMenu/data/MeMenu.conf.in (+1/-1)
Messaging-Menu/data/Messaging-Menu.conf.in (+1/-1)
Messaging-Menu/src/applet-config.c (+0/-3)
Messaging-Menu/src/applet-menu.c (+68/-24)
Messaging-Menu/src/applet-messaging.c (+3/-3)
Messaging-Menu/src/make-dbus-headers.sh (+2/-0)
Messaging-Menu/src/make-dbus-heaers.sh (+0/-2)
Messaging-Menu/src/messages-service.xml (+2/-4)
Network-Monitor/data/Network-Monitor.conf.in (+7/-4)
Network-Monitor/src/applet-connections.c (+7/-7)
Network-Monitor/src/applet-draw.c (+4/-1)
Network-Monitor/src/applet-menu.c (+32/-28)
Network-Monitor/src/applet-notifications.c (+1/-4)
Network-Monitor/src/applet-wifi.c (+3/-4)
RSSreader/data/RSSreader.conf.in (+1/-1)
Recent-Events/data/Recent-Events.conf.in (+1/-1)
Recent-Events/src/applet-dialog.c (+15/-7)
Recent-Events/src/applet-notifications.c (+10/-5)
Recent-Events/src/applet-search.c (+0/-1)
Remote-Control/src/applet-icon-finder.c (+1/-1)
Scooby-Do/src/applet-draw.c (+4/-4)
Scooby-Do/src/applet-icon-finder.c (+1/-1)
Status-Notifier/data/Status-Notifier.conf.in (+1/-1)
Status-Notifier/src/CMakeLists.txt (+1/-0)
Status-Notifier/src/applet-host-ias.c (+55/-12)
Status-Notifier/src/applet-host-kde.c (+3/-3)
Status-Notifier/src/applet-item.c (+1/-1)
System-Monitor/data/System-Monitor.conf.in (+8/-3)
System-Monitor/src/applet-config.c (+1/-0)
System-Monitor/src/applet-init.c (+9/-5)
System-Monitor/src/applet-monitor.c (+6/-1)
System-Monitor/src/applet-sensors.c (+2/-2)
System-Monitor/src/applet-struct.h (+1/-0)
Toons/data/Toons.conf.in (+5/-2)
Xgamma/data/Xgamma.conf.in (+1/-1)
alsaMixer/data/AlsaMixer.conf.in (+18/-6)
alsaMixer/src/applet-config.c (+9/-1)
alsaMixer/src/applet-draw.c (+82/-2)
alsaMixer/src/applet-draw.h (+2/-1)
alsaMixer/src/applet-init.c (+55/-44)
alsaMixer/src/applet-mixer.c (+0/-20)
alsaMixer/src/applet-struct.h (+3/-1)
clock/data/clock.conf.in (+5/-2)
clock/src/applet-backend-ical.c (+1/-1)
debian/cairo-dock-plug-ins-data.lintian-overrides (+0/-5)
debian/cairo-dock-plug-ins-integration.lintian-overrides (+7/-0)
debian/cairo-dock-plug-ins.install (+2/-1)
debian/cairo-dock-plug-ins.lintian-overrides (+6/-0)
debian/changelog (+101/-0)
debian/control (+8/-8)
debian/copyright (+6/-4)
debian/patches/01-switcher-force-compact-view.patch (+34/-0)
debian/patches/series (+1/-0)
debian/rules (+4/-4)
desklet-rendering/src/rendering-desklet-panel.c (+3/-3)
dnd2share/data/dnd2share.conf.in (+1/-1)
dnd2share/src/applet-dnd2share.c (+1/-1)
dnd2share/src/applet-notifications.c (+11/-9)
dock-rendering/src/rendering-diapo-simple.c (+2/-5)
dock-rendering/src/rendering-rainbow.c (+1/-1)
dock-rendering/toto (+0/-217)
dustbin/data/dustbin.conf.in (+1/-1)
dustbin/data/themes/CMakeLists.txt (+0/-11)
dustbin/src/applet-init.c (+7/-5)
dustbin/src/applet-trashes-manager.c (+2/-2)
gvfs-integration/cairo-dock-gio-vfs.c (+161/-122)
illusion/src/applet-break.c (+1/-1)
illusion/src/applet-lightning.c (+2/-2)
keyboard-indicator/data/keyboard-indicator.conf.in (+1/-1)
keyboard-indicator/src/applet-xklavier.c (+3/-3)
logout/data/logout.conf.in (+1/-1)
logout/src/applet-logout.c (+20/-6)
mail/data/mail.conf.in (+1/-1)
mail/src/cd-mail-applet-notifications.c (+1/-1)
musicPlayer/data/musicPlayer.conf.in (+6/-5)
musicPlayer/src/3dcover-draw.c (+1/-5)
musicPlayer/src/CMakeLists.txt (+26/-130)
musicPlayer/src/applet-amarok1.c (+3/-4)
musicPlayer/src/applet-amarok2.c (+2/-3)
musicPlayer/src/applet-audacious.c (+73/-134)
musicPlayer/src/applet-banshee.c (+59/-134)
musicPlayer/src/applet-clementine.c (+2/-3)
musicPlayer/src/applet-config.c (+6/-12)
musicPlayer/src/applet-cover.c (+23/-23)
musicPlayer/src/applet-dbus.c (+71/-139)
musicPlayer/src/applet-dbus.h (+6/-17)
musicPlayer/src/applet-draw.c (+40/-15)
musicPlayer/src/applet-exaile.c (+39/-91)
musicPlayer/src/applet-exaile3.c (+6/-7)
musicPlayer/src/applet-gmusicbrowser.c (+6/-7)
musicPlayer/src/applet-guayadeque.c (+2/-3)
musicPlayer/src/applet-init.c (+23/-34)
musicPlayer/src/applet-listen.c (+29/-69)
musicPlayer/src/applet-mpris.c (+58/-148)
musicPlayer/src/applet-mpris.h (+1/-1)
musicPlayer/src/applet-mpris2.c (+637/-0)
musicPlayer/src/applet-mpris2.h (+30/-0)
musicPlayer/src/applet-musicplayer.c (+312/-49)
musicPlayer/src/applet-musicplayer.h (+12/-6)
musicPlayer/src/applet-notifications.c (+234/-132)
musicPlayer/src/applet-qmmp.c (+6/-7)
musicPlayer/src/applet-quodlibet.c (+59/-121)
musicPlayer/src/applet-rhythmbox.c (+94/-133)
musicPlayer/src/applet-songbird.c (+9/-9)
musicPlayer/src/applet-struct.h (+24/-61)
musicPlayer/src/applet-xmms.c (+3/-4)
musicPlayer/src/applet-xmms2.c (+6/-7)
netspeed/data/netspeed.conf.in (+5/-2)
netspeed/src/applet-config.c (+1/-0)
netspeed/src/applet-init.c (+9/-4)
netspeed/src/applet-netspeed.c (+11/-17)
netspeed/src/applet-struct.h (+1/-0)
po/ar.po (+1038/-946)
po/cairo-dock.pot (+1022/-925)
po/cs.po (+1035/-1908)
po/de.po (+1035/-2030)
po/el.po (+1031/-1592)
po/en_GB.po (+1078/-4687)
po/es.po (+1061/-3078)
po/et.po (+1037/-1073)
po/eu.po (+1037/-981)
po/fr.po (+1083/-5108)
po/hu.po (+1205/-1752)
po/id.po (+1037/-936)
po/it.po (+1069/-5592)
po/ja.po (+1281/-4780)
po/nl.po (+1077/-5437)
po/pl.po (+1038/-937)
po/pt.po (+1035/-2479)
po/pt_BR.po (+1059/-4798)
po/ru.po (+1038/-4831)
po/sk.po (+1031/-4302)
po/sr.po (+1034/-1128)
po/sv.po (+1032/-2633)
po/tr.po (+1037/-1350)
po/uk.po (+1033/-4630)
po/zh_CN.po (+1036/-3113)
po/zh_TW.po (+1032/-3988)
powermanager/data/powermanager.conf.in (+10/-4)
powermanager/src/powermanager-common.c (+3/-3)
powermanager/src/powermanager-config.c (+1/-0)
powermanager/src/powermanager-dbus.c (+0/-580)
powermanager/src/powermanager-dbus.h (+0/-37)
powermanager/src/powermanager-draw.c (+40/-21)
powermanager/src/powermanager-init.c (+30/-17)
powermanager/src/powermanager-menu-functions.c (+40/-12)
powermanager/src/powermanager-struct.h (+7/-16)
powermanager/src/powermanager-upower.c (+7/-10)
quick-browser/data/quick-browser.conf.in (+1/-1)
quick-browser/src/applet-menu.c (+3/-1)
shortcuts/data/shortcuts.conf.in (+1/-1)
shortcuts/src/applet-disk-usage.c (+1/-1)
showDesktop/data/showDesktop.conf.in (+1/-1)
slider/data/slider.conf.in (+5/-2)
stack/data/stack.conf.in (+1/-1)
stack/src/applet-load-icons.c (+1/-1)
stack/src/applet-stack.c (+1/-1)
switcher/data/switcher.conf.in (+0/-4)
switcher/src/applet-config.c (+4/-2)
switcher/src/applet-desktops.c (+1/-1)
switcher/src/applet-draw.c (+4/-4)
switcher/src/applet-load-icons.c (+1/-1)
systray/data/systray.conf.in (+1/-1)
template/data/template.conf.in (+1/-1)
terminal/data/terminal.conf.in (+2/-2)
tomboy/data/tomboy.conf.in (+1/-1)
tomboy/src/tomboy-dbus.c (+1/-1)
tomboy/src/tomboy-draw.c (+1/-1)
weather/data/weather.conf.in (+1/-1)
weblets/data/weblets.conf.in (+1/-1)
wifi/data/wifi.conf.in (+6/-3)
wifi/src/applet-draw.c (+35/-7)
wifi/src/applet-init.c (+3/-2)
xfce-integration/data/lock-screen.sh (+2/-2)
xfce-integration/src/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.4.0-1
Reviewer Review Type Date Requested Status
Ken VanDine Disapprove on 2011-10-07
Fabrice Coutadeur (community) 2011-09-26 Needs Fixing on 2011-10-04
Review via email: mp+77046@code.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 (2.4.0~0beta2 -> 2.4.0~1):
   - Powermanager: correctly release the reference on the device object
   - logout: now works if there is no session-manager
   - Status-Notifier: fixed a small bug
      (wrong callback in cairo_dock_stop_watching_dbus_name_owner)
   - Folders: fixed the positionning of the new icon
      and the dialog when dropping a folder inside the dock
      and fixed the icon-rendering
   - Dustbin: use the default theme if no icon is found
   - Impulse: the default context seems to be ok and not an error
   - Status-Notifier: On Ubuntu Oneiric (with indicator-0.4)
      the ApplicationAdded signal has changed and has a new parameter
   - Disable MeMenu on Oneiric (no longer available with indicator-0.4)
   - CMakeLists.txt: Improved output messages
   - Slide view: fixed a small offset in vertical view
   - musicPlayer:
    + split MPRIS 1.0 and 2.0 to help debugging and finding the right
       name of the bug.
    + 'rhythmbox-client' tool is no longer available: used MPRIS
    + Disable Amazon service (it no longer work)
    + Cover: fixed corrupted icons: some players (e.g. the latest version
       of RB) copy covers on their cache forlder but it takes a few time.
    + Fixed the update the icon and its name if the player is stopped.
    + Prevent a crash if the name given by MPRIS is NULL
   - Powermanager: try to prevent to have a few dialogues at the same time
   - PowerManager and AlsaMixer: hidden gnome2 or 3 apps if not available
   - Messaging-Menu: Updated for Natty and Oneiric
      (dbus-menu gives us GVariant instead of GValue objects)
   - Alsamixer: fixed a small bug on reload
   - Dbus: Bash interface: Fixed a typo with emblem positions
   - Sys-monitor: fixed a bug which prevented from getting
      the CPU temperature in some cases
   - Compiz (0.9): type filter: replaced type=utility by type=Utility
   - Updated the version of all applets that have gauges
     in order to use the right directory
   - Wifi: Fixed the status if we are not connected
   - Dbus: removed a conflict with the Help applet
   - Messaging-Menu: updated applet-menu.c => Memory leaks on pixbufs
   - Dbus: Fixed a crash when changing dock theme if a 'third-party' applet
      is running
   - Netspeed: in /proc/net/dev, there are 8 values to drop after the card id
      except if there is whitespaces just after this ':' character
      and fixed order and value for ON_ICON display
   - dock-rendering/toto: removed a useless file
   - Clipper: fixed the loading of the remembered items
      (they had the wrong type) and fixed a bug if we reduce the list of items
   - Folders, dustbin, Network-Monitor: tried to not use cast if it's possible
   - Code cleaned and re-organised a few functions
     (e.g. emblem references has been renamed)
   - Removed useless files: powermanager-dbus*
   - Updating translations
   - Fixed a few warnings at the compilation
   - Removed a few useless output messages
   - Fixed these LP bugs:
    + Empty trash from the trashcan does not delete files
       from usb harddisks: LP: #658681
    + Switcher applet doesn't respect desktop numbers LP: #626782

Note that this is the stable version of the 2.4 branch. It fixes a lot of bugs of the previous version (2.4.0~0beta2).

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: Don't forget to upload this package AND THE CORE ( LP: #859982 )

To post a comment you must log in.
22. By Matthieu Baerts on 2011-09-27

* New upstream bug fix release. (LP: #859984)
* Upstream (short) ChangeLog (2.4.0~0beta2 -> 2.4.0~1):
 - Powermanager: correctly release the reference on the device object
 - logout: now works if there is no session-manager
 - Status-Notifier: fixed a small bug
    (wrong callback in cairo_dock_stop_watching_dbus_name_owner)
 - Folders: fixed the positionning of the new icon
    and the dialog when dropping a folder inside the dock
    and fixed the icon-rendering
 - Dustbin: use the default theme if no icon is found
 - Impulse: the default context seems to be ok and not an error
 - Status-Notifier: On Ubuntu Oneiric (with indicator-0.4)
    the ApplicationAdded signal has changed and has a new parameter
 - Disable MeMenu on Oneiric (no longer available with indicator-0.4)
 - CMakeLists.txt: Improved output messages
 - Slide view: fixed a small offset in vertical view
 - musicPlayer:
  + split MPRIS 1.0 and 2.0 to help debugging and finding the right
     name of the bug.
  + 'rhythmbox-client' tool is no longer available: used MPRIS
  + Disable Amazon service (it no longer work)
  + Cover: fixed corrupted icons: some players (e.g. the latest version
     of RB) copy covers on their cache forlder but it takes a few time.
  + Fixed the update the icon and its name if the player is stopped.
  + Prevent a crash if the name given by MPRIS is NULL
 - Powermanager: try to prevent to have a few dialogues at the same time
 - PowerManager and AlsaMixer: hidden gnome2 or 3 apps if not available
 - Messaging-Menu: Updated for Natty and Oneiric
    (dbus-menu gives us GVariant instead of GValue objects)
 - Alsamixer: fixed a small bug on reload
 - Dbus: Bash interface: Fixed a typo with emblem positions
 - Sys-monitor: fixed a bug which prevented from getting
    the CPU temperature in some cases
 - Compiz (0.9): type filter: replaced type=utility by type=Utility
 - Updated the version of all applets that have gauges
   in order to use the right directory
 - Wifi: Fixed the status if we are not connected
 - Dbus: removed a conflict with the Help applet
 - Messaging-Menu: updated applet-menu.c => Memory leaks on pixbufs
 - Dbus: Fixed a crash when changing dock theme if a 'third-party' applet
    is running
 - Netspeed: in /proc/net/dev, there are 8 values to drop after the card id
    except if there is whitespaces just after this ':' character
    and fixed order and value for ON_ICON display
 - dock-rendering/toto: removed a useless file
 - Clipper: fixed the loading of the remembered items
    (they had the wrong type) and fixed a bug if we reduce the list of items
 - Folders, dustbin, Network-Monitor: tried to not use cast if it's possible
 - Code cleaned and re-organised a few functions
   (e.g. emblem references has been renamed)
 - Removed useless files: powermanager-dbus*
 - Updating translations
 - Fixed a few warnings at the compilation
 - Removed a few useless output messages
 - Fixed these LP bugs:
  + Empty trash from the trashcan does not delete files
     from usb harddisks: LP: #658681
  + Switcher applet doesn't respect desktop numbers LP: #626782
* debian/control:
 - Updated the version of cairo-dock-[core;data;dev].
 - Added gvfs as 'Suggests' for cairo-dock-plug-ins-integration
    (Used for managing files)
 - Removed 'libthunar-vfs-1-dev' (libthunar-vfs is no longer installed
    by default since XFCE 4.8 and it is replaced by gvfs)
 - Removed 'indicator-me' (no longer available
    and the installation of Cairo-Dock produces an error)
 - Moved 'indicator-messages' to 'Recommends'
* debian/rules:
 - Updated the name of CMake extras flags

23. By Matthieu Baerts on 2011-10-04

* Upstream (short) ChangeLog (2.4.0~1 -> 2.4.0~2):
 - Messaging-Menu: fixed a wrong g_object_unref (double free)
    and a small memory leak
 - Folders: fixed a tiny warning at the compilation (32bits)
 - switcher: removed an unnecessary config parameter
 - Folders: file size: used English instead of French translation.
 - Indicator applet: Forced a cast to remove an annoying warning
    due to clumsy dbusmenu_gtkmenu_new() declaration
 - Fixed the detection of the screensaver
 - Fixed tiny warnings at the compilation (with CAIRO_CONTAINER)

Fabrice Coutadeur (fabricesp) wrote :

Hi,

Please follow the FFe process as described at https://wiki.ubuntu.com/FreezeExceptionProcess as we are way past Feature Freeze, as described in Bug #859984. Marking as Needs fixing in the meantime.

review: Needs Fixing
Matthieu Baerts (matttbe) wrote :

ACK given by pitti. Thanks to him!

Ken VanDine (ken-vandine) wrote :

FTBFS for me. Looks like there is a problem with the branch, files not removed then trying to keep the changes in the diff.

dpkg-source: error: cannot represent change to cairo-dock-plug-ins-2.4.0~2/terminal/data/icon.png: binary file contents changed

review: Disapprove
Matthieu Baerts (matttbe) wrote :

@Ken VanDine: I don't understand... this file is the same as before. The last changed has been made more than one year ago.
So... what can I do to fix this strange bug?

24. By Matthieu Baerts on 2011-10-08

* debian/cairo-dock-plug-ins-data.lintian-overrides:
 - Deleted (now useless)
* debian/cairo-dock-plug-ins.lintian-overrides:
 - Cairo-Dock Plug-Ins are not linked to gldi
 - shlib-without-versioned-soname: forwarded to upstream.
* debian/cairo-dock-plug-ins-integration.lintian-overrides:
 - Cairo-Dock Plug-Ins are not linked to gldi
 - ldconfig and shlibs are not needed
* debian/cairo-dock-plug-ins.install:
 - Fixed lintian errors: package-installs-python-bytecode
* debian/control: Fixed lintian warnings:
 - python-script-but-no-python-dep
 - description-synopsis-starts-with-article
* debian/changelog:
 - Fixed lintian warning: old-fsf-address-in-copyright-file
* debian/patches/01-switcher-force-compact-view.patch:
 - Forced the compact view because the other doesn't work

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.pc'
2=== added file '.pc/.quilt_patches'
3--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
4+++ .pc/.quilt_patches 2011-10-08 22:23:24 +0000
5@@ -0,0 +1,1 @@
6+debian/patches
7
8=== added file '.pc/.quilt_series'
9--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
10+++ .pc/.quilt_series 2011-10-08 22:23:24 +0000
11@@ -0,0 +1,1 @@
12+series
13
14=== added file '.pc/.version'
15--- .pc/.version 1970-01-01 00:00:00 +0000
16+++ .pc/.version 2011-10-08 22:23:24 +0000
17@@ -0,0 +1,1 @@
18+2
19
20=== added directory '.pc/01-switcher-force-compact-view.patch'
21=== added directory '.pc/01-switcher-force-compact-view.patch/switcher'
22=== added directory '.pc/01-switcher-force-compact-view.patch/switcher/data'
23=== added file '.pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in'
24--- .pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in 1970-01-01 00:00:00 +0000
25+++ .pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in 2011-10-08 22:23:24 +0000
26@@ -0,0 +1,177 @@
27+#@VERSION_SWITCHER@
28+
29+#[gtk-about]
30+[Icon]
31+
32+#F[Icon]
33+frame_maininfo=
34+
35+#d Name of the dock it belongs to:
36+dock name =
37+
38+#s Name of the icon as it will appear in its caption in the dock:
39+name =
40+ #v
41+sep_display=
42+
43+#S+ Image filename:
44+#{Leave empty to use the default one.}
45+icon =
46+
47+#j+[0;400] Desired icon size for this applet
48+#{Set to 0 to use the default applet size}
49+icon size = 0;0
50+
51+order=
52+
53+#F[Applet's Handbook]
54+frame_hand=
55+#A
56+handbook=switcher
57+
58+#[gtk-convert]
59+[Desklet]
60+
61+#X[Position]
62+frame_pos =
63+
64+#b Lock position?
65+#{If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.}
66+locked = false
67+
68+#j+[24;512] Desklet dimensions (width x height):
69+#{Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.}
70+size = 96;96
71+
72+#i[-2048;2048] Desklet position (x, y):
73+x position=10
74+#i[-2048;2048] ...
75+y position=10
76+
77+#X[Visibility]
78+frame_visi =
79+
80+#b Is detached from the dock
81+initially detached=false
82+#l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
83+accessibility=0
84+#b Should be visible on all desktops?
85+sticky=true
86+
87+
88+
89+
90+#F[Decorations;gtk-orientation-portrait]
91+frame_deco=
92+
93+#o+ Choose a decoration theme for this desklet:
94+#{Choose 'Custom decorations' to define your own decorations below.}
95+decorations = default
96+
97+#v
98+sep_deco =
99+
100+#S+ Background image:
101+#{Image to be displayed below drawings, e.g. a frame. Leave empty for no image.}
102+bg desklet =
103+#e+[0;1] Background transparency:
104+bg alpha = 1
105+#i+[0;256] Left offset:
106+#{in pixels. Use this to adjust the left position of drawings.}
107+left offset = 0
108+#i+[0;256] Top offset:
109+#{in pixels. Use this to adjust the top position of drawings.}
110+top offset = 0
111+#i+[0;256] Right offset:
112+#{in pixels. Use this to adjust the right position of drawings.}
113+right offset = 0
114+#i+[0;256] Bottom offset:
115+#{in pixels. Use this to adjust the bottom position of drawings.}
116+bottom offset = 0
117+#S+ Foreground image:
118+#{Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.}
119+fg desklet =
120+#e+[0;1] Foreground tansparency:
121+fg alpha = 1
122+
123+
124+#[gtk-preferences]
125+[Configuration]
126+
127+#F[Configuration]
128+frame_conf =
129+
130+#B Use the compact mode?
131+#{All desktops will be drawn on the main icon. Otherwise a sub-dock will contain all desktops.}
132+Vue Simple = true
133+
134+#b Preserve the ratio of the screen ?
135+preserve ratio = true
136+
137+#b Map wallpaper to icons?
138+Map Wallpaper = true
139+
140+#b Show desktop number on icons?
141+display numero desktop = true
142+
143+#B Draw windows on icons?
144+Draw Windows = true
145+
146+#b Draw hidden windows?
147+Draw hidden Windows = false
148+
149+#v
150+sep_conf =
151+
152+#l[Show windows' list;Show desktop;Expose all the desktops;Expose all the windows] Action on middle-click:
153+action on click = 0
154+
155+#U Workspace names :
156+desktop names =
157+
158+
159+#F[Display options]
160+frame_disp =
161+
162+#i+[0;8] Size of the inside lines :
163+inlinesize = 3
164+
165+#C+ Internal line colour:
166+#{r, g, b, a}
167+rgbinlinecolor = 0.0; 0.0; 0.5; 1.
168+
169+#i+[0;8] External line size:
170+linesize = 3
171+
172+#C+ External line colour:
173+#{r, g, b, a}
174+rgblinecolor = 0.0; 0.0; 0.5; 1.
175+
176+#C+ Window line colour:
177+#{r, g, b, a}
178+rgbwlinecolor = 0.0; 0.0; 0.5; 1.
179+
180+#v
181+sep_cur =
182+
183+#C+ Current desktop colour:
184+#{r, g, b, a}
185+rgbindcolor = 0.0; 0.0; 0.5; 0.5
186+
187+#l+[draw a frame;fill;fill others] How to draw the current desktop:
188+fill current = 1
189+
190+#v
191+sep_other =
192+
193+#S+ Icon to use in expanded mode if wallpaper is not mapped:
194+#{Leave empty to use the default one.}
195+default icon =
196+
197+
198+#n+ Sub-dock view name:
199+#{Leave empty to use default sub-dock view.}/
200+renderer =
201+
202+#b+ In expanded mode, render the desklet in 3D?
203+3D desklet = true
204
205=== added directory '.pc/01-switcher-force-compact-view.patch/switcher/src'
206=== added file '.pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c'
207--- .pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c 1970-01-01 00:00:00 +0000
208+++ .pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c 2011-10-08 22:23:24 +0000
209@@ -0,0 +1,78 @@
210+/**
211+* This file is a part of the Cairo-Dock project
212+*
213+* Copyright : (C) see the 'copyright' file.
214+* E-mail : see the 'copyright' file.
215+*
216+* This program is free software; you can redistribute it and/or
217+* modify it under the terms of the GNU General Public License
218+* as published by the Free Software Foundation; either version 3
219+* of the License, or (at your option) any later version.
220+*
221+* This program is distributed in the hope that it will be useful,
222+* but WITHOUT ANY WARRANTY; without even the implied warranty of
223+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
224+* GNU General Public License for more details.
225+* You should have received a copy of the GNU General Public License
226+* along with this program. If not, see <http://www.gnu.org/licenses/>.
227+*/
228+
229+#include <string.h>
230+
231+#include "applet-struct.h"
232+#include "applet-config.h"
233+#include "applet-load-icons.h"
234+
235+
236+CD_APPLET_GET_CONFIG_BEGIN
237+ //\_________________ On recupere toutes les valeurs de notre fichier de conf.
238+ myConfig.bCompactView = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Vue Simple", TRUE);
239+ myConfig.bPreserveScreenRatio = CD_CONFIG_GET_BOOLEAN ("Configuration", "preserve ratio");
240+ myConfig.bMapWallpaper = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Map Wallpaper", TRUE);
241+ myConfig.bDisplayNumDesk = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "display numero desktop", TRUE);
242+ myConfig.bDrawWindows = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Draw Windows", TRUE);
243+ myConfig.bDisplayHiddenWindows = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Draw hidden Windows", TRUE);
244+ myConfig.iActionOnMiddleClick = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "action on click", 0);
245+
246+ // couleur des lignes interieures
247+ myConfig.iInLineSize = CD_CONFIG_GET_INTEGER("Configuration", "inlinesize");
248+ double inlinecouleur[4] = {0., 0., 0.5, 1.};
249+ CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgbinlinecolor",myConfig.RGBInLineColors, inlinecouleur);
250+
251+ // couleur du bureau courant.
252+ double indcouleur[4] = {0., 0., 0.5, 1.};
253+ CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgbindcolor",myConfig.RGBIndColors, indcouleur);
254+ myConfig.iDrawCurrentDesktopMode = CD_CONFIG_GET_INTEGER ("Configuration", "fill current");
255+
256+ // couleur des lignes exterieures.
257+ myConfig.iLineSize = CD_CONFIG_GET_INTEGER("Configuration", "linesize");
258+ double linecouleur[4] = {0., 0., 0.5, 1.};
259+ CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgblinecolor",myConfig.RGBLineColors, linecouleur);
260+
261+ // couleur des traits des fenetres.
262+ double wlinecouleur[4] = {0., 0., 0.5, 1.};
263+ CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgbwlinecolor",myConfig.RGBWLineColors, wlinecouleur);
264+
265+ myConfig.cDefaultIcon = CD_CONFIG_GET_FILE_PATH ("Configuration", "default icon", "default.svg");
266+ myConfig.cRenderer = CD_CONFIG_GET_STRING ("Configuration", "renderer");
267+ myConfig.bDesklet3D = CD_CONFIG_GET_BOOLEAN ("Configuration", "3D desklet");
268+
269+ gsize iNbNamesSize;
270+ myConfig.cDesktopNames = CD_CONFIG_GET_STRING_LIST_WITH_DEFAULT ("Configuration", "desktop names", &iNbNamesSize, "Work;Game;Video;Chat");
271+ myConfig.iNbNames = (gint) iNbNamesSize;
272+CD_APPLET_GET_CONFIG_END
273+
274+
275+CD_APPLET_RESET_CONFIG_BEGIN
276+ g_free (myConfig.cRenderer);
277+ g_free (myConfig.cDefaultIcon);
278+ if (myConfig.cDesktopNames != NULL)
279+ g_strfreev (myConfig.cDesktopNames);
280+CD_APPLET_RESET_CONFIG_END
281+
282+
283+CD_APPLET_RESET_DATA_BEGIN
284+ CD_APPLET_DELETE_MY_ICONS_LIST;
285+ cairo_surface_destroy (myData.pDefaultMapSurface);
286+ cairo_surface_destroy (myData.pDesktopBgMapSurface);
287+CD_APPLET_RESET_DATA_END
288
289=== added file '.pc/applied-patches'
290--- .pc/applied-patches 1970-01-01 00:00:00 +0000
291+++ .pc/applied-patches 2011-10-08 22:23:24 +0000
292@@ -0,0 +1,1 @@
293+01-switcher-force-compact-view.patch
294
295=== modified file 'Animated-icons/src/applet-unfold.c'
296--- Animated-icons/src/applet-unfold.c 2011-04-20 20:46:51 +0000
297+++ Animated-icons/src/applet-unfold.c 2011-10-08 22:23:24 +0000
298@@ -29,7 +29,7 @@
299 {
300 g_return_if_fail (pIcon->pSubDock != NULL && pIcon->pIconBuffer != NULL);
301 int w, h;
302- cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pDock), &w, &h);
303+ cairo_dock_get_icon_extent (pIcon, &w, &h);
304 double f = 1. - pIcon->pSubDock->fFoldingFactor;
305 double fMaxScale = cairo_dock_get_max_scale (CAIRO_CONTAINER (pDock));
306 double z = pIcon->fScale / fMaxScale * pDock->container.fRatio;
307@@ -149,7 +149,7 @@
308 {
309 g_return_if_fail (pIcon->pSubDock != NULL);
310 int w, h;
311- cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pDock), &w, &h);
312+ cairo_dock_get_icon_extent (pIcon, &w, &h);
313 double f = 1. - pIcon->pSubDock->fFoldingFactor;
314 double fMaxScale = cairo_dock_get_max_scale (CAIRO_CONTAINER (pDock));
315 double z = pIcon->fScale / fMaxScale * pDock->container.fRatio;
316
317=== modified file 'Applets.stable' (properties changed: +x to -x)
318--- Applets.stable 2011-04-20 20:46:51 +0000
319+++ Applets.stable 2011-10-08 22:23:24 +0000
320@@ -23,7 +23,7 @@
321 terminal
322 Cairo-Penguin
323 showDesktop
324-compiz-icon
325+# compiz-icon # removed in v2.4.0
326 slider
327 Clipper
328 GMenu
329@@ -44,7 +44,7 @@
330 ###Last addition of v2.1.0 :
331 System-Monitor
332 dnd2share
333-Music-Player
334+musicPlayer
335 mail
336 ###Added in v2.1.3
337 RSSReader
338@@ -57,6 +57,12 @@
339 Remote-Control
340 Recent-Events
341 Status-Notifier
342+###Added in v2.4.0
343+Composite-Manager
344+Impulse
345 ###All other applets are considered to be either not enough functionnal, buggy/untested, or under heavy development.
346 #Scooby-Do
347 #Network-Monitor
348+#Disks
349+#Doncky
350+#KDE experimental
351
352=== modified file 'CMakeLists.txt'
353--- CMakeLists.txt 2011-08-09 19:51:45 +0000
354+++ CMakeLists.txt 2011-10-08 22:23:24 +0000
355@@ -10,9 +10,9 @@
356 ########### project ###############
357
358 project ("cairo-dock-plugins")
359-set (VERSION "2.4.0~0beta2")
360+set (VERSION "2.4.0~2")
361
362-add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall
363+add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall
364 if (NOT ${CMAKE_BUILD_TYPE})
365 add_definitions (-O3)
366 endif()
367@@ -130,7 +130,7 @@
368 set (MODULES_MISSING "${MODULES_MISSING} alsa")
369 else()
370 set (GETTEXT_ALSA_MIXER ${GETTEXT_PLUGINS})
371- set (VERSION_ALSA_MIXER "1.0.13")
372+ set (VERSION_ALSA_MIXER "1.1.1")
373 set (PACKAGE_ALSA_MIXER "cd-AlsaMixer")
374 set (with_alsa "yes")
375 set (alsa_mixerdatadir "${pluginsdatadir}/AlsaMixer")
376@@ -178,7 +178,7 @@
377 set (MODULES_MISSING "${MODULES_MISSING} libical")
378 endif()
379 set (GETTEXT_CLOCK ${GETTEXT_PLUGINS})
380-set (VERSION_CLOCK "2.1.3")
381+set (VERSION_CLOCK "2.1.4")
382 set (PACKAGE_CLOCK "cd-clock")
383 set (clockuserdirname "clock")
384 set (clockdatadir "${pluginsdatadir}/clock")
385@@ -186,7 +186,7 @@
386 add_subdirectory (clock)
387
388 ############# COMPOSITE_MANAGER #################
389-message (STATUS "> Coposite Manager:")
390+message (STATUS "> Composite Manager:")
391 set (GETTEXT_COMPOSITE_MANAGER ${GETTEXT_PLUGINS})
392 set (VERSION_COMPOSITE_MANAGER "1.0.0")
393 set (PACKAGE_COMPOSITE_MANAGER "cd-Composite-Manager")
394@@ -196,7 +196,7 @@
395
396 ############# DBUS #################
397 message (STATUS "> DBus:")
398-message (STATUS "* Python:")
399+message (STATUS " * Python:")
400 find_program (PYTHON_EXECUTABLE python)
401 EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print sys.version" OUTPUT_VARIABLE PYTHON_VERSION)
402 if ("${PYTHON_VERSION}" STREQUAL "")
403@@ -206,22 +206,22 @@
404 set (with_python "no")
405 else()
406 STRING (REGEX REPLACE "\n" "" PYTHON_VERSION ${PYTHON_VERSION})
407- message (STATUS "Python Version: ${PYTHON_VERSION}")
408+ message (STATUS " Python Version: ${PYTHON_VERSION}")
409 GET_FILENAME_COMPONENT(DEBIAN_VERSION /etc/debian_version ABSOLUTE)
410 if (EXISTS ${DEBIAN_VERSION})
411- message (STATUS " will use '--install-layout deb' with 'python setup.py install'")
412+ message (STATUS " will use '--install-layout deb' with 'python setup.py install'")
413 set (DEBIAN_INSTALL_LAYOUT "--install-layout deb")
414 endif()
415 set (PYTHON_FOUND "TRUE")
416 set (with_python "yes")
417 endif()
418
419-message (STATUS "* Ruby:")
420+message (STATUS " * Ruby:")
421 # find_package(Ruby) found libs of ruby-dev but we only need a directory where we can install ruby libs.
422 find_program (RUBY_EXECUTABLE ruby)
423 EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']"
424 OUTPUT_VARIABLE RUBY_LIB_DIR)
425-message (STATUS "RUBY_LIBRARY: ${RUBY_LIB_DIR}")
426+message (STATUS " Ruby library dir: ${RUBY_LIB_DIR}")
427 if ("${RUBY_LIB_DIR}" STREQUAL "" OR "${RUBY_LIB_DIR}" STREQUAL "nil")
428 message (STATUS "Could not find ruby libs, won't install Ruby interface.")
429 message (WARNING "This program is required to compile DBus applet with Ruby interface: ruby")
430@@ -231,12 +231,12 @@
431 string (REGEX REPLACE "lib/ruby/[0-9].[0-9]" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
432 string (REGEX REPLACE "${RUBY_LIB_DIR_INSTALL}" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
433 set (RUBY_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${RUBY_LIB_DIR_INSTALL}")
434- message (STATUS " will be installed in: ${RUBY_LIB_DIR}")
435+ message (STATUS " will be installed in: ${RUBY_LIB_DIR}")
436 set (RUBY_FOUND "TRUE")
437 set (with_ruby "yes")
438 endif()
439
440-message (STATUS "* Mono:")
441+message (STATUS " * Mono:")
442 #find_package (Mono)
443 find_program (GMCS_EXECUTABLE gmcs)
444 if ("${GMCS_EXECUTABLE}" STREQUAL "" OR NOT EXISTS ${GMCS_EXECUTABLE})
445@@ -255,13 +255,13 @@
446 endif()
447 endif()
448
449-message (STATUS "* Vala:")
450+message (STATUS " * Vala:")
451 # Valac is only riquired to convert vala files to C files.
452 # So we can directly use produced files (c, h, vapi) without using valac.
453 set (with_vala "yes")
454 set (with_valac "no")
455 find_program (VALAC_EXE valac)
456-message (STATUS "VALAC_EXE: ${VALAC_EXE}")
457+message (STATUS " Path to valac: ${VALAC_EXE}")
458
459 if ("${WITH_VALA}" STREQUAL "no")
460 set (with_vala "no")
461@@ -273,7 +273,7 @@
462 OUTPUT_VARIABLE "VALA_VERSION")
463 string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
464 string(STRIP ${VALA_VERSION} "VALA_VERSION")
465- message (STATUS "VALA_VERSION: ${VALA_VERSION}")
466+ message (STATUS " Vala version: ${VALA_VERSION}")
467
468 STRING (REGEX REPLACE "\\..*" "" VALA_MAJOR "${VALA_VERSION}")
469 # message (STATUS "VALA_MAJOR : ${VALA_MAJOR}")
470@@ -288,11 +288,11 @@
471
472 if (${VALA_MAJOR} GREATER 0 OR ${VALA_MINOR} GREATER 9) # vala >= 0.10
473 # AND (${VALA_MAJOR} LESS 1 AND ${VALA_MINOR} LESS 13)) # and <= 0.12
474- message (STATUS " Vala compiler OK (>= 0.10).")# and <= 0.12).")
475+ message (STATUS " Vala compiler OK (>= 0.10).")# and <= 0.12).")
476 set (VALAC_FOUND "TRUE")
477 set (with_valac "yes")
478 else()
479- message (STATUS "Vala compiler is too old (0.10 required) or too new (> 0.12), won't build Vala interface.")
480+ message (STATUS " Vala compiler is too old (0.10 required) or too new (> 0.12), won't build Vala interface.")
481 endif()
482 else()
483 message (STATUS "Could not find ValaC, won't build Vala interface with the version of your distribution.")
484@@ -471,22 +471,20 @@
485
486 ############# IMPULSE #################
487 set (with_impulse "no")
488-if ("${enable-impulse}" STREQUAL "yes")
489- message (STATUS "> Impulse:")
490- pkg_check_modules (IMPULSE_PACKAGES libpulse fftw3)
491- if ("${IMPULSE_PACKAGES_FOUND}" STREQUAL "")
492- message (STATUS "Could not find libpulse; Cairo-Dock won't be built with Impulse applet.")
493- message (WARNING "These modules are required to compile Impulse applet: libpulse fftw3")
494- set (MODULES_MISSING "${MODULES_MISSING} libpulse fftw3")
495- else()
496- set (GETTEXT_IMPULSE ${GETTEXT_PLUGINS})
497- set (VERSION_IMPULSE "0.0.3")
498- set (PACKAGE_IMPULSE "cd-Impulse")
499- set (with_impulse "yes")
500- set (impulsedatadir "${pluginsdatadir}/Impulse")
501- configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Impulse/data/Impulse.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Impulse/data/Impulse.conf)
502- add_subdirectory (Impulse)
503- endif()
504+message (STATUS "> Impulse:")
505+pkg_check_modules (IMPULSE_PACKAGES libpulse fftw3)
506+if ("${IMPULSE_PACKAGES_FOUND}" STREQUAL "")
507+ message (STATUS "Could not find libpulse; Cairo-Dock won't be built with Impulse applet.")
508+ message (WARNING "These modules are required to compile Impulse applet: libpulse fftw3")
509+ set (MODULES_MISSING "${MODULES_MISSING} libpulse fftw3")
510+else()
511+ set (GETTEXT_IMPULSE ${GETTEXT_PLUGINS})
512+ set (VERSION_IMPULSE "0.0.3")
513+ set (PACKAGE_IMPULSE "cd-Impulse")
514+ set (with_impulse "yes")
515+ set (impulsedatadir "${pluginsdatadir}/Impulse")
516+ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Impulse/data/Impulse.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Impulse/data/Impulse.conf)
517+ add_subdirectory (Impulse)
518 endif()
519
520 ############# INDICATOR-APPLET #################
521@@ -507,8 +505,10 @@
522 endif()
523 if ("${INDICATOR_04_FOUND}" STREQUAL "1")
524 pkg_check_modules (INDICATOR_APPLET indicator-0.4 libido-0.1)
525+ set (INDICATOR_APPLICATIONADDED_HAS_HINT 1) # now the ApplicationAdded signal (Status-Notifier) has a new parameter (hint) => https://code.launchpad.net/~ted/indicator-application/name-hints/+merge/67213
526 else()
527 pkg_check_modules (INDICATOR_APPLET indicator libido-0.1)
528+ set (INDICATOR_APPLICATIONADDED_HAS_HINT 0)
529 endif()
530
531 if ("${INDICATOR_APPLET_FOUND}" STREQUAL "1" AND "${DBUSMENU_FOUND}" STREQUAL "1" AND "${DBUSMENU_GTK_FOUND}" STREQUAL "1")
532@@ -601,7 +601,7 @@
533 AND KIO_INCLUDE_DIR
534 AND KIO_LIBRARY
535 AND KDE_INCLUDE_DIR)
536- message (STATUS "KDE: OK")
537+ message (STATUS " KDE: OK")
538 set (VERSION_KDE_INTEGRATION "0.0.3")
539 set (PACKAGE_KDE_INTEGRATION "cd_kde-integration")
540 set (with_kde_integration2 "yes")
541@@ -614,7 +614,7 @@
542 endif()
543 elseif (NOT "${enable-kde-integration}" STREQUAL "no")
544 pkg_check_modules (KDE_INTEGRATION gio-2.0)
545- message (STATUS "KDE_INTEGRATION_FOUND: ${KDE_INTEGRATION_FOUND}")
546+ message (STATUS " KDE_INTEGRATION_FOUND: ${KDE_INTEGRATION_FOUND}")
547 if (NOT KDE_INTEGRATION_FOUND)
548 message (STATUS "Could not find gio; Cairo-Dock won't be built with KDE support.")
549 message (STATUS "This module is required to compile KDE-Integration applet: gio-2.0")
550@@ -698,10 +698,10 @@
551 message (WARNING "This module is required to compile Mail applet: libetpan")
552 set (PROGRAMS_MISSING "${PROGRAMS_MISSING} libetpan-config")
553 else()
554- message (STATUS "libetpan found. Using the following options:")
555- message (STATUS " Include directories: ${MAIL_PACKAGE_INCLUDE_DIRS}")
556- message (STATUS " Link directories: ${MAIL_PACKAGE_LIBRARY_DIRS}")
557- message (STATUS " Link libraries: ${MAIL_PACKAGE_LIBRARIES}")
558+ message (STATUS " libetpan found. Using the following options:")
559+ message (STATUS " Include directories: ${MAIL_PACKAGE_INCLUDE_DIRS}")
560+ message (STATUS " Link directories: ${MAIL_PACKAGE_LIBRARY_DIRS}")
561+ message (STATUS " Link libraries: ${MAIL_PACKAGE_LIBRARIES}")
562 set (GETTEXT_MAIL ${GETTEXT_PLUGINS})
563 set (VERSION_MAIL "1.0.9")
564 set (PACKAGE_MAIL "cd-mail")
565@@ -751,7 +751,7 @@
566 endif()
567
568 if (NOT "${DISTRO_ID}" STREQUAL "")
569- message (STATUS "DISTRO_ID: ${DISTRO_ID}, DISTRO_RELEASE: ${DISTRO_RELEASE}")
570+ message (STATUS " DISTRO_ID: ${DISTRO_ID}, DISTRO_RELEASE: ${DISTRO_RELEASE}")
571 endif()
572
573 ############# INDICATOR_NAME #################
574@@ -759,19 +759,21 @@
575 set (INDICATOR_OLD_NAMES 0)
576 if ("${force_old_indicator_names}" STREQUAL "yes")
577 set (INDICATOR_OLD_NAMES 1)
578- message (STATUS "Indicators: use old Ayatana Dbus names (forced)")
579+ message (STATUS " Indicators: use old Ayatana Dbus names (forced)")
580 elseif ("${DISTRO_ID}" STREQUAL "Ubuntu")
581 STRING (REGEX REPLACE "\\..*" "" DISTRO_RELEASE_MAJOR ${DISTRO_RELEASE})
582 # message (STATUS "DISTRO_RELEASE_MAJOR: ${DISTRO_RELEASE_MAJOR}")
583 if (${DISTRO_RELEASE_MAJOR} LESS 11) # from 11.04, new names are used.
584 set (INDICATOR_OLD_NAMES 1)
585- message (STATUS "Indicators: use old Ayatana Dbus names")
586+ message (STATUS " Indicators: use old Ayatana Dbus names")
587 endif()
588 endif()
589
590 ############# MEMENU #################
591 set (with_me_menu "no")
592-if ("${with_indicator}" STREQUAL "yes")
593+if ("${INDICATOR_04_FOUND}" STREQUAL "1")
594+ message (STATUS "> MeMenu: this applet has been automatically merged with Messaging-Menu")
595+elseif ("${with_indicator}" STREQUAL "yes")
596 message (STATUS "> MeMenu:")
597 set (GETTEXT_MEMENU ${GETTEXT_PLUGINS})
598 set (VERSION_MEMENU "1.0.2")
599@@ -784,7 +786,7 @@
600
601 ############# MESSAGING_MENU #################
602 set (with_messaging_menu "no")
603-if ("${with_indicator}" STREQUAL "yes")
604+if ("${with_indicator}" STREQUAL "yes")
605 message (STATUS "> Messaging-Menu:")
606 set (GETTEXT_MESSAGING_MENU ${GETTEXT_PLUGINS})
607 set (VERSION_MESSAGING_MENU "1.0.2")
608@@ -807,7 +809,7 @@
609 ############# MUSICPLAYER #################
610 message (STATUS "> MusicPlayer:")
611 set (GETTEXT_MUSICPLAYER ${GETTEXT_PLUGINS})
612-set (VERSION_MUSICPLAYER "1.0.8")
613+set (VERSION_MUSICPLAYER "1.1.0")
614 set (PACKAGE_MUSICPLAYER "cd-musicPlayer")
615 set (musicplayerdatadir "${pluginsdatadir}/musicPlayer")
616 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/musicPlayer/data/musicPlayer.conf.in ${CMAKE_CURRENT_BINARY_DIR}/musicPlayer/data/musicPlayer.conf)
617@@ -816,7 +818,7 @@
618 ############# NETSPEED #################
619 message (STATUS "> NetSpeed:")
620 set (GETTEXT_NETSPEED ${GETTEXT_PLUGINS})
621-set (VERSION_NETSPEED "1.2.6")
622+set (VERSION_NETSPEED "1.2.7")
623 set (PACKAGE_NETSPEED "cd-netspeed")
624 set (netspeeddatadir "${pluginsdatadir}/netspeed")
625 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/netspeed/data/netspeed.conf.in ${CMAKE_CURRENT_BINARY_DIR}/netspeed/data/netspeed.conf)
626@@ -827,7 +829,7 @@
627 if ("${enable-network-monitor}" STREQUAL "yes")
628 message (STATUS "> Network Monitor:")
629 set (GETTEXT_NETWORK_MONITOR ${GETTEXT_PLUGINS})
630- set (VERSION_NETWORK_MONITOR "0.2.4")
631+ set (VERSION_NETWORK_MONITOR "0.2.5")
632 set (PACKAGE_NETWORK_MONITOR "cd-network-monitor")
633 set (with_network_monitor "yes")
634 set (network_monitordatadir "${pluginsdatadir}/Network-Monitor")
635@@ -838,7 +840,7 @@
636 ############# POWERMANAGER #################
637 message (STATUS "> PowerManager:")
638 set (GETTEXT_POWERMANAGER ${GETTEXT_PLUGINS})
639-set (VERSION_POWERMANAGER "1.3.5")
640+set (VERSION_POWERMANAGER "1.3.7")
641 set (PACKAGE_POWERMANAGER "cd-powermanager")
642 set (powermanagerdatadir "${pluginsdatadir}/powermanager")
643 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/powermanager/data/powermanager.conf.in ${CMAKE_CURRENT_BINARY_DIR}/powermanager/data/powermanager.conf)
644@@ -952,7 +954,7 @@
645 set (with_exif "no")
646 endif()
647 set (GETTEXT_SLIDER ${GETTEXT_PLUGINS})
648-set (VERSION_SLIDER "2.0.9")
649+set (VERSION_SLIDER "2.0.10")
650 set (PACKAGE_SLIDER "cd-slider")
651 set (sliderdatadir "${pluginsdatadir}/slider")
652 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/slider/data/slider.conf.in ${CMAKE_CURRENT_BINARY_DIR}/slider/data/slider.conf)
653@@ -975,6 +977,12 @@
654 # set (MODULES_MISSING "${MODULES_MISSING} dbusmenu-gtk(-0.4)") # it should already be in the list.
655 set (with_status_notifier "no")
656 else()
657+ if ("${force_indicator_applicationadded_have_hint}" STREQUAL "yes")
658+ set (INDICATOR_APPLICATIONADDED_HAS_HINT 1)
659+ elseif ("${force_indicator_applicationadded_have_hint}" STREQUAL "no")
660+ set (INDICATOR_APPLICATIONADDED_HAS_HINT 0)
661+ endif()
662+ message (STATUS " ApplicationAdded signal has 'Hint' = ${INDICATOR_APPLICATIONADDED_HAS_HINT}")
663 set (GETTEXT_STATUS_NOTIFIER ${GETTEXT_PLUGINS})
664 set (VERSION_STATUS_NOTIFIER "0.1.4")
665 set (PACKAGE_STATUS_NOTIFIER "cd-status-notifier")
666@@ -1004,7 +1012,7 @@
667 set (with_sensors "no")
668 endif()
669 set (GETTEXT_SYSTEM_MONITOR ${GETTEXT_PLUGINS})
670-set (VERSION_SYSTEM_MONITOR "1.0.7")
671+set (VERSION_SYSTEM_MONITOR "1.0.9")
672 set (PACKAGE_SYSTEM_MONITOR "cd-system-monitor")
673 set (system_monitordatadir "${pluginsdatadir}/System-monitor")
674 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/System-Monitor/data/System-Monitor.conf.in ${CMAKE_CURRENT_BINARY_DIR}/System-Monitor/data/System-Monitor.conf)
675@@ -1049,7 +1057,7 @@
676 ############# TOONS #################
677 message (STATUS "> Toons:")
678 set (GETTEXT_TOONS ${GETTEXT_PLUGINS})
679-set (VERSION_TOONS "1.0.9")
680+set (VERSION_TOONS "1.0.10")
681 set (PACKAGE_TOONS "cd-Toons")
682 set (toonsdatadir "${pluginsdatadir}/Toons")
683 set (toonsuserdirname "Toons")
684@@ -1089,7 +1097,7 @@
685 ############# WIFI #################
686 message (STATUS "> WiFi:")
687 set (GETTEXT_WIFI ${GETTEXT_PLUGINS})
688-set (VERSION_WIFI "1.2.7")
689+set (VERSION_WIFI "1.2.9")
690 set (PACKAGE_WIFI "cd-wifi")
691 set (wifidatadir "${pluginsdatadir}/wifi")
692 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/wifi/data/wifi.conf.in ${CMAKE_CURRENT_BINARY_DIR}/wifi/data/wifi.conf)
693@@ -1145,15 +1153,20 @@
694 message (STATUS "===============")
695 message ("")
696 message (STATUS "Stable:")
697+message (STATUS " Integration plug-ins:")
698+message (STATUS " - with Gnome support: ${with_gnome_integration}")
699+message (STATUS " - with KDE support: ${with_kde_integration}")
700+message (STATUS " - with XFCE support: ${with_xfce_integration}")
701+message (STATUS " Plug-ins:")
702 message (STATUS " - with Alsa-Mixer applet: ${with_alsa}")
703 message (STATUS " - with iCal support: ${with_ical}")
704 message (STATUS " - with GMenu applet: ${with_gmenu}")
705-message (STATUS " - with Gnome support: ${with_gnome_integration}")
706-message (STATUS " - with KDE support: ${with_kde_integration}")
707-message (STATUS " - with XFCE support: ${with_xfce_integration}")
708+message (STATUS " - with Impulse applet: ${with_impulse}")
709 message (STATUS " - with Keyboard-indicator applet: ${with_keyboard_indicator}")
710 message (STATUS " - with Mail applet: ${with_mail}")
711+if (NOT "${INDICATOR_04_FOUND}" STREQUAL "1")
712 message (STATUS " - with Me-Menu applet: ${with_me_menu}")
713+endif()
714 message (STATUS " - with Messaging-Menu: ${with_messaging_menu}")
715 message (STATUS " - with Screen Resolution support: ${with_xrandr}")
716 message (STATUS " - with Status-Notifier applet: ${with_status_notifier}")
717@@ -1171,7 +1184,6 @@
718 message (STATUS "Unstable:")
719 message (STATUS " - with Disks applet: ${with_disks}")
720 message (STATUS " - with Doncky applet: ${with_doncky}")
721-message (STATUS " - with Impulse applet: ${with_impulse}")
722 message (STATUS " - with KDE experimental support: ${with_kde_integration2}")
723 message (STATUS " - with Network-Monitor applet: ${with_network_monitor}")
724 message (STATUS " - with Scooby-Do applet: ${with_scooby_do}")
725
726=== modified file 'Cairo-Penguin/src/applet-animation.c'
727--- Cairo-Penguin/src/applet-animation.c 2011-04-20 20:46:51 +0000
728+++ Cairo-Penguin/src/applet-animation.c 2011-10-08 22:23:24 +0000
729@@ -89,7 +89,7 @@
730 {
731 g_return_if_fail (pAnimation->iTexture != 0);
732 int iIconWidth, iIconHeight;
733- cairo_dock_get_icon_extent (myIcon, myContainer, &iIconWidth, &iIconHeight);
734+ CD_APPLET_GET_MY_ICON_EXTENT (&iIconWidth, &iIconHeight);
735
736 _cairo_dock_enable_texture ();
737 _cairo_dock_set_blend_alpha ();
738@@ -198,7 +198,7 @@
739 CD_APPLET_START_DRAWING_MY_ICON_OR_RETURN ();
740
741 int iIconWidth, iIconHeight;
742- cairo_dock_get_icon_extent (myIcon, myContainer, &iIconWidth, &iIconHeight);
743+ CD_APPLET_GET_MY_ICON_EXTENT (&iIconWidth, &iIconHeight);
744
745 g_return_if_fail (pAnimation->iTexture != 0);
746 double f = (1 + myIconsParam.fAmplitude) / fScale;
747
748=== modified file 'Clipper/data/Clipper.conf.in'
749--- Clipper/data/Clipper.conf.in 2011-08-09 18:08:08 +0000
750+++ Clipper/data/Clipper.conf.in 2011-10-08 22:23:24 +0000
751@@ -16,7 +16,7 @@
752
753 #S+ Image filename:
754 #{Leave empty to use the default one.}
755-icon=accessories-text-editor.svg
756+icon=accessories-text-editor
757
758 #j+[0;128] Desired icon size for this applet
759 #{Set to 0 to use the default applet size}
760@@ -60,7 +60,7 @@
761 #b Is detached from the dock
762 initially detached=false
763 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
764-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
765+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
766 accessibility=0
767 #b Should be visible on all desktops?
768 sticky=true
769
770=== modified file 'Clipper/src/applet-clipboard.c'
771--- Clipper/src/applet-clipboard.c 2011-08-09 18:08:08 +0000
772+++ Clipper/src/applet-clipboard.c 2011-10-08 22:23:24 +0000
773@@ -25,6 +25,8 @@
774
775 const gchar *cEnvName[4] = {"other", "gnome", "kde", "xfce"}; // "other" allows to handle all the other DE (put your own actions into the corresponding file).
776
777+// TODO idea: cairo_dock_cut_string => g_strstrip + cut X first char, then add '...', then the X last char + removed '\n'
778+
779 static int _cd_clipper_compare_item (CDClipperItem *pItem1, CDClipperItem *pItem2)
780 {
781 if (pItem1->iType < pItem2->iType) // on insere en 1er les items de la primary.
782@@ -35,7 +37,7 @@
783 return 0;
784 }
785
786-static GList *_cd_clipper_get_last_item (CDClipperItemType iItemType)
787+GList *cd_clipper_get_last_item (CDClipperItemType iItemType)
788 {
789 CDClipperItem *pItem = NULL;
790 GList *pElement;
791@@ -136,10 +138,10 @@
792 myData.pItems = g_list_delete_link (myData.pItems, pElement);
793 myData.iNbItems[pItem->iType] --;
794
795- if (pItem->iType != iType && myData.iNbItems[iType] == myConfig.iNbItems[iType])
796+ if (pItem->iType != iType && myData.iNbItems[iType] >= myConfig.iNbItems[iType])
797 {
798 cd_debug ("Clipper : %s remplace le dernier de l'autre selection", text);
799- pElement = _cd_clipper_get_last_item (iType);
800+ pElement = cd_clipper_get_last_item (iType);
801 CD_APPLET_LEAVE_IF_FAIL (pElement != NULL);
802 cd_clipper_free_item (pElement->data);
803 myData.pItems = g_list_delete_link (myData.pItems, pElement);
804@@ -152,10 +154,10 @@
805 {
806 bExistingItem = FALSE;
807 cd_debug ("%d items / %d", myData.iNbItems[iType], myConfig.iNbItems[iType]);
808- if (myData.iNbItems[iType] == myConfig.iNbItems[iType])
809+ if (myData.iNbItems[iType] >= myConfig.iNbItems[iType])
810 {
811 cd_debug ("Clipper : %s remplace le dernier", text);
812- pElement = _cd_clipper_get_last_item (iType);
813+ pElement = cd_clipper_get_last_item (iType);
814 CD_APPLET_LEAVE_IF_FAIL (pElement != NULL);
815 cd_clipper_free_item (pElement->data);
816 myData.pItems = g_list_delete_link (myData.pItems, pElement);
817@@ -168,7 +170,7 @@
818 pItem = g_new0 (CDClipperItem, 1);
819 pItem->iType = iType;
820 pItem->cText = g_strdup (text);
821- pItem->cDisplayedText = cairo_dock_cut_string (text, 50);
822+ pItem->cDisplayedText = cairo_dock_cut_string (g_strstrip (g_strdup (text)), 50); // g_strstrip: Removes leading and trailing whitespace from a string
823 }
824 myData.pItems = g_list_insert_sorted (myData.pItems, pItem, (GCompareFunc)_cd_clipper_compare_item);
825 myData.iNbItems[pItem->iType] ++;
826@@ -613,16 +615,20 @@
827 void cd_clipper_load_items (const gchar *cItems)
828 {
829 CDClipperItem *pItem;
830+ int iClipperItemType = myConfig.bSeparateSelections ? CD_CLIPPER_CLIPBOARD : CD_CLIPPER_BOTH;
831 gchar **cItemList = g_strsplit (cItems, CD_ITEMS_DELIMITER, -1);
832 int i;
833 for (i = 0; cItemList[i] != NULL; i ++)
834 {
835+ // if we have reduced the number of items to display
836+ if (i == myConfig.iNbItems[iClipperItemType])
837+ break;
838 pItem = g_new0 (CDClipperItem, 1);
839- pItem->iType = CD_CLIPPER_CLIPBOARD;
840+ pItem->iType = iClipperItemType;
841 pItem->cText = cItemList[i];
842- pItem->cDisplayedText = cairo_dock_cut_string (pItem->cText, 50);
843+ pItem->cDisplayedText = cairo_dock_cut_string (g_strstrip (pItem->cText), 50); // g_strstrip: Removes leading and trailing whitespace from a string
844 myData.pItems = g_list_insert_sorted (myData.pItems, pItem, (GCompareFunc)_cd_clipper_compare_item);
845- myData.iNbItems[pItem->iType] ++;
846+ myData.iNbItems[iClipperItemType] ++;
847 }
848 g_free (cItemList);
849 }
850
851=== modified file 'Clipper/src/applet-clipboard.h'
852--- Clipper/src/applet-clipboard.h 2010-08-10 00:05:57 +0000
853+++ Clipper/src/applet-clipboard.h 2011-10-08 22:23:24 +0000
854@@ -25,6 +25,7 @@
855 #include <cairo-dock.h>
856 #include "applet-struct.h"
857
858+GList *cd_clipper_get_last_item (CDClipperItemType iItemType);
859
860 void _on_text_received (GtkClipboard *pClipBoard, const gchar *text, gpointer user_data); // temporairement declaree ici.
861
862
863=== modified file 'Clipper/src/applet-init.c'
864--- Clipper/src/applet-init.c 2010-09-07 02:38:17 +0000
865+++ Clipper/src/applet-init.c 2011-10-08 22:23:24 +0000
866@@ -166,5 +166,19 @@
867 g_free (myConfig.cRememberedItems);
868 myConfig.cRememberedItems = NULL;
869 }
870+ // if myConfig.iNbItems[X] has decreased...
871+ int i;
872+ for (i = 0; i < 4; i++)
873+ {
874+ while (myData.iNbItems[i] > myConfig.iNbItems[i])
875+ {
876+ GList *pElement = cd_clipper_get_last_item (i);
877+ if (pElement == NULL)
878+ continue;
879+ cd_clipper_free_item (pElement->data);
880+ myData.pItems = g_list_delete_link (myData.pItems, pElement);
881+ myData.iNbItems[i] --;
882+ }
883+ }
884 }
885 CD_APPLET_RELOAD_END
886
887=== modified file 'Composite-Manager/data/Composite-Manager.conf.in'
888--- Composite-Manager/data/Composite-Manager.conf.in 2011-08-09 18:08:08 +0000
889+++ Composite-Manager/data/Composite-Manager.conf.in 2011-10-08 22:23:24 +0000
890@@ -58,7 +58,7 @@
891 #b Is detached from the dock
892 initially detached=false
893 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
894-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
895+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
896 accessibility=0
897 #b Should be visible on all desktops?
898 sticky=true
899
900=== modified file 'Composite-Manager/src/applet-composite-manager.c'
901--- Composite-Manager/src/applet-composite-manager.c 2011-08-09 18:08:08 +0000
902+++ Composite-Manager/src/applet-composite-manager.c 2011-10-08 22:23:24 +0000
903@@ -171,7 +171,7 @@
904
905 static CDWM *_get_prefered_wmc (CDWMIndex iCurrentWm)
906 {
907- g_print ("%s (%s, %d)\n", __func__, myConfig.cWmCompositor, iCurrentWm);
908+ cd_debug ("%s (%s, %d)", __func__, myConfig.cWmCompositor, iCurrentWm);
909 CDWM *wm;
910 if (myConfig.cWmCompositor != NULL) // a composite WM is defined.
911 {
912@@ -218,7 +218,7 @@
913 for (i = 0; i < NB_COMPOSITE_WM; i ++)
914 {
915 wm = _get_wm_by_index (index[i]);
916- g_print (" %d) %s, %d\n", index[i], wm->cName, wm->bIsAvailable);
917+ cd_debug (" %d) %s, %d", index[i], wm->cName, wm->bIsAvailable);
918 if (wm->bIsAvailable)
919 return wm;
920 }
921@@ -227,7 +227,7 @@
922
923 static CDWM *_get_prefered_wmfb (CDWMIndex iCurrentWm)
924 {
925- g_print ("%s (%s, %d)\n", __func__, myConfig.cWmFallback, iCurrentWm);
926+ cd_debug ("%s (%s, %d)", __func__, myConfig.cWmFallback, iCurrentWm);
927 CDWM *wm;
928 if (myConfig.cWmFallback != NULL) // a fallback WM is defined.
929 {
930@@ -249,7 +249,7 @@
931 if (!myData.bIsComposited) // and it is a fallback => let's take it!
932 {
933 wm = _get_wm_by_index (iCurrentWm);
934- g_print ("current wm: %d, %d\n", iCurrentWm, wm->bIsAvailable);
935+ cd_debug ("current wm: %d, %d", iCurrentWm, wm->bIsAvailable);
936 if (wm->bIsAvailable) // just to be sure.
937 return wm;
938 }
939@@ -277,7 +277,7 @@
940 for (i = 0; i < NB_FALLBACK_WM; i ++)
941 {
942 wm = _get_wm_by_index (index[i]);
943- g_print (" %s (%d)\n", wm->cName, wm->bIsAvailable);
944+ cd_debug (" %s (%d)", wm->cName, wm->bIsAvailable);
945 if (wm->bIsAvailable)
946 return wm;
947 }
948@@ -294,7 +294,7 @@
949 CDWMIndex iCurrentWm = _check_current_wm (cPs);
950 myData.wmc = _get_prefered_wmc (iCurrentWm);
951 myData.wmfb = _get_prefered_wmfb (iCurrentWm);
952- g_print ("***** WM: %s / %s\n", myData.wmc?myData.wmc->cName:NULL, myData.wmfb?myData.wmfb->cName:NULL);
953+ cd_debug ("***** WM: %s / %s", myData.wmc?myData.wmc->cName:NULL, myData.wmfb?myData.wmfb->cName:NULL);
954 }
955 void cd_define_prefered_wms (void)
956 {
957@@ -369,7 +369,7 @@
958
959 void cd_draw_current_state (void)
960 {
961- g_print ("%s (%d)\n", __func__, myData.bIsComposited);
962+ cd_debug ("%s (%d)", __func__, myData.bIsComposited);
963 if (myData.bIsComposited)
964 CD_APPLET_SET_USER_IMAGE_ON_MY_ICON (myConfig.cIconCompositeON, "composite-on.png");
965 else
966
967=== modified file 'Dbus/demos/demo_bash/demo_bash.conf'
968--- Dbus/demos/demo_bash/demo_bash.conf 2011-04-20 20:46:51 +0000
969+++ Dbus/demos/demo_bash/demo_bash.conf 2011-10-08 22:23:24 +0000
970@@ -39,7 +39,7 @@
971 #b Is detached from the dock ?
972 initially detached=false
973 #l[Normal;Keep above;Keep below;On Widget Layer;Reserve space] Accessibility :
974-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
975+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
976 accessibility=0
977 #b Should be visible on all desktops ?
978 sticky=true
979
980=== modified file 'Dbus/demos/demo_mono/auto-load.conf'
981--- Dbus/demos/demo_mono/auto-load.conf 2010-08-10 00:05:57 +0000
982+++ Dbus/demos/demo_mono/auto-load.conf 2011-10-08 22:23:24 +0000
983@@ -10,4 +10,4 @@
984 category = 5
985
986 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
987-version = 0.0.2
988+version = 0.0.3
989
990=== modified file 'Dbus/demos/demo_mono/demo_mono.conf'
991--- Dbus/demos/demo_mono/demo_mono.conf 2011-04-20 20:46:51 +0000
992+++ Dbus/demos/demo_mono/demo_mono.conf 2011-10-08 22:23:24 +0000
993@@ -1,4 +1,4 @@
994-#!en;0.0.2
995+#!en;0.0.3
996
997 #[gtk-about]
998 [Icon]
999@@ -39,7 +39,7 @@
1000 #b Is detached from the dock ?
1001 initially detached=false
1002 #l[Normal;Keep above;Keep below;On Widget Layer;Reserve space] Accessibility :
1003-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
1004+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
1005 accessibility=0
1006 #b Should be visible on all desktops ?
1007 sticky=true
1008@@ -90,7 +90,7 @@
1009 #[gtk-preferences]
1010 [Configuration]
1011
1012-#h+[/usr/share/cairo-dock/gauges;gauges;gauges] Choose one of the available themes :/
1013+#h+[/usr/share/cairo-dock/gauges;gauges;gauges3] Choose one of the available themes :/
1014 theme = Turbo-night
1015
1016 #i[10;100] Max value :
1017
1018=== modified file 'Dbus/demos/demo_python/auto-load.conf'
1019--- Dbus/demos/demo_python/auto-load.conf 2011-04-20 20:46:51 +0000
1020+++ Dbus/demos/demo_python/auto-load.conf 2011-10-08 22:23:24 +0000
1021@@ -10,10 +10,10 @@
1022 category = 5
1023
1024 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
1025-version = 0.0.2
1026+version = 0.0.3
1027
1028 # Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used.
1029 icon =
1030
1031 # Whether the applet can be instanciated several times or not.
1032-multi-instance = true
1033\ No newline at end of file
1034+multi-instance = true
1035
1036=== modified file 'Dbus/demos/demo_python/demo_python.conf'
1037--- Dbus/demos/demo_python/demo_python.conf 2011-04-20 20:46:51 +0000
1038+++ Dbus/demos/demo_python/demo_python.conf 2011-10-08 22:23:24 +0000
1039@@ -1,4 +1,4 @@
1040-#!en;0.0.2
1041+#!en;0.0.3
1042
1043 #[gtk-about]
1044 [Icon]
1045@@ -39,7 +39,7 @@
1046 #b Is detached from the dock ?
1047 initially detached=false
1048 #l[Normal;Keep above;Keep below;On Widget Layer;Reserve space] Accessibility :
1049-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
1050+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
1051 accessibility=0
1052 #b Should be visible on all desktops ?
1053 sticky=true
1054@@ -90,7 +90,7 @@
1055 #[gtk-preferences]
1056 [Configuration]
1057
1058-#h+[/usr/share/cairo-dock/gauges;gauges;gauges] Choose one of the available themes :/
1059+#h+[/usr/share/cairo-dock/gauges;gauges;gauges3] Choose one of the available themes :/
1060 theme = Turbo-night
1061
1062 #i[10;100] Max value :
1063
1064=== modified file 'Dbus/demos/demo_ruby/auto-load.conf'
1065--- Dbus/demos/demo_ruby/auto-load.conf 2011-04-20 20:46:51 +0000
1066+++ Dbus/demos/demo_ruby/auto-load.conf 2011-10-08 22:23:24 +0000
1067@@ -10,7 +10,7 @@
1068 category = 5
1069
1070 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
1071-version = 0.0.1
1072+version = 0.0.2
1073
1074 # Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used.
1075 icon =
1076
1077=== modified file 'Dbus/demos/demo_ruby/demo_ruby.conf'
1078--- Dbus/demos/demo_ruby/demo_ruby.conf 2011-04-20 20:46:51 +0000
1079+++ Dbus/demos/demo_ruby/demo_ruby.conf 2011-10-08 22:23:24 +0000
1080@@ -1,4 +1,4 @@
1081-#!en;0.0.1
1082+#!en;0.0.2
1083
1084 #[gtk-about]
1085 [Icon]
1086@@ -39,7 +39,7 @@
1087 #b Is detached from the dock ?
1088 initially detached=false
1089 #l[Normal;Keep above;Keep below;On Widget Layer;Reserve space] Accessibility :
1090-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
1091+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
1092 accessibility=0
1093 #b Should be visible on all desktops ?
1094 sticky=true
1095@@ -90,7 +90,7 @@
1096 #[gtk-preferences]
1097 [Configuration]
1098
1099-#h+[/usr/share/cairo-dock/gauges;gauges;gauges] Choose one of the available themes :/
1100+#h+[/usr/share/cairo-dock/gauges;gauges;gauges3] Choose one of the available themes :/
1101 theme = Turbo-night
1102
1103 #i[10;100] Max value :
1104
1105=== modified file 'Dbus/demos/demo_vala/auto-load.conf'
1106--- Dbus/demos/demo_vala/auto-load.conf 2010-08-10 00:05:57 +0000
1107+++ Dbus/demos/demo_vala/auto-load.conf 2011-10-08 22:23:24 +0000
1108@@ -10,4 +10,4 @@
1109 category = 5
1110
1111 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
1112-version = 0.0.2
1113+version = 0.0.3
1114
1115=== modified file 'Dbus/demos/demo_vala/demo_vala.conf'
1116--- Dbus/demos/demo_vala/demo_vala.conf 2011-08-09 18:08:08 +0000
1117+++ Dbus/demos/demo_vala/demo_vala.conf 2011-10-08 22:23:24 +0000
1118@@ -1,4 +1,4 @@
1119-#!en;0.0.2
1120+#!en;0.0.3
1121
1122 #[gtk-about]
1123 [Icon]
1124@@ -39,7 +39,7 @@
1125 #b Is detached from the dock ?
1126 initially detached=false
1127 #l[Normal;Keep above;Keep below;On Widget Layer;Reserve space] Accessibility :
1128-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
1129+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
1130 accessibility=0
1131 #b Should be visible on all desktops ?
1132 sticky=true
1133@@ -90,7 +90,7 @@
1134 #[gtk-preferences]
1135 [Configuration]
1136
1137-#h+[/usr/share/cairo-dock/gauges;gauges;gauges] Choose one of the available themes :/
1138+#h+[/usr/share/cairo-dock/gauges;gauges;gauges3] Choose one of the available themes :/
1139 theme = Turbo-night
1140
1141 #i[10;100] Max value :
1142
1143=== modified file 'Dbus/interfaces/bash/CDBashApplet.sh'
1144--- Dbus/interfaces/bash/CDBashApplet.sh 2011-04-20 20:46:51 +0000
1145+++ Dbus/interfaces/bash/CDBashApplet.sh 2011-10-08 22:23:24 +0000
1146@@ -36,11 +36,15 @@
1147 LEFT=3
1148 DOCK=0
1149 DESKLET=1
1150-UPPER_LEFT=0
1151-LOWER_RIGHT=1
1152-LOWER_LEFT=2
1153-UPPER_RIGHT=3
1154-MIDDLE=4
1155+EMBLEM_TOP_LEFT=0
1156+EMBLEM_BOTTOM_RIGHT=1
1157+EMBLEM_BOTTOM_LEFT=2
1158+EMBLEM_TOP_RIGHT=3
1159+EMBLEM_MIDDLE=4
1160+EMBLEM_BOTTOM=5
1161+EMBLEM_TOP=6
1162+EMBLEM_RIGHT=7
1163+EMBLEM_LEFT=8
1164 MENU_ENTRY=0
1165 MENU_SUB_MENU=1
1166 MENU_SEPARATOR=2
1167
1168=== modified file 'Dbus/interfaces/mono/CDApplet.cs'
1169--- Dbus/interfaces/mono/CDApplet.cs 2011-04-20 20:46:51 +0000
1170+++ Dbus/interfaces/mono/CDApplet.cs 2011-10-08 22:23:24 +0000
1171@@ -56,11 +56,15 @@
1172 DESKLET
1173 }
1174 public enum EmblemPosition {
1175- UPPER_LEFT = 0,
1176- LOWER_RIGHT,
1177- LOWER_LEFT,
1178- UPPER_RIGHT,
1179- MIDDLE
1180+ EMBLEM_TOP_LEFT = 0,
1181+ EMBLEM_BOTTOM_RIGHT,
1182+ EMBLEM_BOTTOM_LEFT,
1183+ EMBLEM_TOP_RIGHT,
1184+ EMBLEM_MIDDLE,
1185+ EMBLEM_BOTTOM,
1186+ EMBLEM_TOP,
1187+ EMBLEM_RIGHT,
1188+ EMBLEM_LEFT
1189 }
1190 public enum MenuItemType {
1191 MENU_ENTRY = 0,
1192
1193=== modified file 'Dbus/interfaces/python/CDApplet.py'
1194--- Dbus/interfaces/python/CDApplet.py 2011-08-09 18:08:08 +0000
1195+++ Dbus/interfaces/python/CDApplet.py 2011-10-08 22:23:24 +0000
1196@@ -56,11 +56,15 @@
1197 DOCK = 0
1198 DESKLET = 1
1199 # emblem position
1200- UPPER_LEFT = 0
1201- LOWER_RIGHT = 1
1202- LOWER_LEFT = 2
1203- UPPER_RIGHT = 3
1204- MIDDLE = 4
1205+ EMBLEM_TOP_LEFT = 0
1206+ EMBLEM_BOTTOM_RIGHT = 1
1207+ EMBLEM_BOTTOM_LEFT = 2
1208+ EMBLEM_TOP_RIGHT = 3
1209+ EMBLEM_MIDDLE = 4
1210+ EMBLEM_BOTTOM = 5
1211+ EMBLEM_TOP = 6
1212+ EMBLEM_RIGHT = 7
1213+ EMBLEM_LEFT = 8
1214 # menu item types
1215 MENU_ENTRY = 0
1216 MENU_SUB_MENU = 1
1217
1218=== modified file 'Dbus/interfaces/python/CairoDock.py'
1219--- Dbus/interfaces/python/CairoDock.py 2011-08-09 18:08:08 +0000
1220+++ Dbus/interfaces/python/CairoDock.py 2011-10-08 22:23:24 +0000
1221@@ -42,11 +42,15 @@
1222 DOCK = "Dock"
1223 DESKLET = "Desklet"
1224 # emblem position
1225- UPPER_LEFT = 0
1226- LOWER_RIGHT = 1
1227- LOWER_LEFT = 2
1228- UPPER_RIGHT = 3
1229- MIDDLE = 4
1230+ EMBLEM_TOP_LEFT = 0
1231+ EMBLEM_BOTTOM_RIGHT = 1
1232+ EMBLEM_BOTTOM_LEFT = 2
1233+ EMBLEM_TOP_RIGHT = 3
1234+ EMBLEM_MIDDLE = 4
1235+ EMBLEM_BOTTOM = 5
1236+ EMBLEM_TOP = 6
1237+ EMBLEM_RIGHT = 7
1238+ EMBLEM_LEFT = 8
1239 # module category
1240 CATEGORY_BEHAVIOR = 0
1241 CATEGORY_THEME = 1
1242
1243=== modified file 'Dbus/interfaces/ruby/CDApplet.rb'
1244--- Dbus/interfaces/ruby/CDApplet.rb 2011-04-20 20:46:51 +0000
1245+++ Dbus/interfaces/ruby/CDApplet.rb 2011-10-08 22:23:24 +0000
1246@@ -35,11 +35,15 @@
1247 DOCK = 0
1248 DESKLET = 1
1249
1250- UPPER_LEFT = 0
1251- LOWER_RIGHT = 1
1252- LOWER_LEFT = 2
1253- UPPER_RIGHT = 3
1254- MIDDLE = 4
1255+ EMBLEM_TOP_LEFT = 0
1256+ EMBLEM_BOTTOM_RIGHT = 1
1257+ EMBLEM_BOTTOM_LEFT = 2
1258+ EMBLEM_TOP_RIGHT = 3
1259+ EMBLEM_MIDDLE = 4
1260+ EMBLEM_BOTTOM = 5
1261+ EMBLEM_TOP = 6
1262+ EMBLEM_RIGHT = 7
1263+ EMBLEM_LEFT = 8
1264
1265 MENU_ENTRY = 0
1266 MENU_SUB_MENU = 1
1267
1268=== modified file 'Dbus/interfaces/vala/CDApplet.vala'
1269--- Dbus/interfaces/vala/CDApplet.vala 2011-04-20 20:46:51 +0000
1270+++ Dbus/interfaces/vala/CDApplet.vala 2011-10-08 22:23:24 +0000
1271@@ -97,11 +97,15 @@
1272 DESKLET
1273 }
1274 public enum EmblemPosition {
1275- UPPER_LEFT = 0,
1276- LOWER_RIGHT,
1277- LOWER_LEFT,
1278- UPPER_RIGHT,
1279- MIDDLE
1280+ EMBLEM_TOP_LEFT = 0,
1281+ EMBLEM_BOTTOM_RIGHT,
1282+ EMBLEM_BOTTOM_LEFT,
1283+ EMBLEM_TOP_RIGHT,
1284+ EMBLEM_MIDDLE,
1285+ EMBLEM_BOTTOM,
1286+ EMBLEM_TOP,
1287+ EMBLEM_RIGHT,
1288+ EMBLEM_LEFT
1289 }
1290 public enum MenuItemType {
1291 MENU_ENTRY = 0,
1292@@ -254,10 +258,10 @@
1293 }
1294 private void _on_reload(bool bConfigHasChanged)
1295 {
1296- print (">>> our module is reloaded");
1297+ print (">>> our module is reloaded\n");
1298 if (bConfigHasChanged)
1299 {
1300- print (">>> and our config has changed");
1301+ print (">>> and our config has changed\n");
1302 this._get_config();
1303 this.reload();
1304 }
1305@@ -294,7 +298,7 @@
1306 }
1307 catch (IOError e)
1308 {
1309- GLib.error (">>> module '%s' can't be found on the bus, exit.\nError was: %s", this.cAppletName, e.message);
1310+ GLib.error (">>> module '%s' can't be found on the bus, exit.\nError was: %s\n", this.cAppletName, e.message);
1311 }
1312 try
1313 {
1314@@ -304,7 +308,7 @@
1315 }
1316 catch (IOError e)
1317 {
1318- GLib.error (">>> module '%s' can't be found on the bus, exit.\nError was: %s", this.cAppletName, e.message);
1319+ GLib.error (">>> module '%s' can't be found on the bus, exit.\nError was: %s\n", this.cAppletName, e.message);
1320 }
1321 this.icon.on_click.connect(on_click); // when the user left-clicks on our icon.
1322 this.icon.on_middle_click.connect(on_middle_click); // when the user middle-clicks on our icon.
1323
1324=== modified file 'Dbus/interfaces/vala/src/CDApplet.h'
1325--- Dbus/interfaces/vala/src/CDApplet.h 2011-04-20 20:46:51 +0000
1326+++ Dbus/interfaces/vala/src/CDApplet.h 2011-10-08 22:23:24 +0000
1327@@ -1,8 +1,8 @@
1328 /* CDApplet.h generated by valac 0.10.0, the Vala compiler, do not modify */
1329
1330
1331-#ifndef ___HOME_FAB_CD2_CAIRO_DOCK_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__
1332-#define ___HOME_FAB_CD2_CAIRO_DOCK_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__
1333+#ifndef ___HOME_FAB_CD2_4_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__
1334+#define ___HOME_FAB_CD2_4_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__
1335
1336 #include <glib.h>
1337 #include <glib-object.h>
1338@@ -138,11 +138,15 @@
1339 } CairoDockAppletCDAppletContainerType;
1340
1341 typedef enum {
1342- CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_LEFT = 0,
1343- CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_RIGHT,
1344- CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_LEFT,
1345- CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_RIGHT,
1346- CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_MIDDLE
1347+ CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_TOP_LEFT = 0,
1348+ CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_BOTTOM_RIGHT,
1349+ CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_BOTTOM_LEFT,
1350+ CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_TOP_RIGHT,
1351+ CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_MIDDLE,
1352+ CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_BOTTOM,
1353+ CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_TOP,
1354+ CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_RIGHT,
1355+ CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_LEFT
1356 } CairoDockAppletCDAppletEmblemPosition;
1357
1358 typedef enum {
1359
1360=== modified file 'Dbus/interfaces/vala/src/CDApplet.vapi'
1361--- Dbus/interfaces/vala/src/CDApplet.vapi 2011-04-20 20:46:51 +0000
1362+++ Dbus/interfaces/vala/src/CDApplet.vapi 2011-10-08 22:23:24 +0000
1363@@ -18,11 +18,15 @@
1364 }
1365 [CCode (cprefix = "CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_", cheader_filename = "CDApplet.h")]
1366 public enum EmblemPosition {
1367- UPPER_LEFT,
1368- LOWER_RIGHT,
1369- LOWER_LEFT,
1370- UPPER_RIGHT,
1371- MIDDLE
1372+ EMBLEM_TOP_LEFT,
1373+ EMBLEM_BOTTOM_RIGHT,
1374+ EMBLEM_BOTTOM_LEFT,
1375+ EMBLEM_TOP_RIGHT,
1376+ EMBLEM_MIDDLE,
1377+ EMBLEM_BOTTOM,
1378+ EMBLEM_TOP,
1379+ EMBLEM_RIGHT,
1380+ EMBLEM_LEFT
1381 }
1382 [CCode (cprefix = "CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_ID_", cheader_filename = "CDApplet.h")]
1383 public enum MenuItemId {
1384
1385=== modified file 'Dbus/src/applet-struct.h'
1386--- Dbus/src/applet-struct.h 2011-04-20 20:46:51 +0000
1387+++ Dbus/src/applet-struct.h 2011-10-08 22:23:24 +0000
1388@@ -105,7 +105,6 @@
1389 dbusMainObject *pMainObject;
1390 const gchar *cProgName;
1391 gchar *cBasePath;
1392- GList *pAppletList;
1393 GtkWidget *pModuleSubMenu;
1394 GtkWidget *pModuleMainMenu;
1395 dbusApplet *pCurrentMenuDbusApplet;
1396
1397=== modified file 'Dbus/src/interface-applet-methods.c'
1398--- Dbus/src/interface-applet-methods.c 2011-08-09 18:08:08 +0000
1399+++ Dbus/src/interface-applet-methods.c 2011-10-08 22:23:24 +0000
1400@@ -131,10 +131,18 @@
1401
1402 g_return_val_if_fail (pIcon->pIconBuffer != NULL, FALSE);
1403
1404- CairoEmblem *pEmblem = cairo_dock_make_emblem (cImage, pIcon, pContainer);
1405+ if (cImage == NULL || *cImage == '\0' || strcmp (cImage, "none") == 0)
1406+ {
1407+ cairo_dock_remove_overlay_at_position (pIcon, iPosition);
1408+ }
1409+ else
1410+ {
1411+ cairo_dock_add_overlay_from_image (pIcon, cImage, iPosition);
1412+ }
1413+ /**CairoEmblem *pEmblem = cairo_dock_make_emblem (cImage, pIcon);
1414 pEmblem->iPosition = iPosition;
1415 cairo_dock_draw_emblem_on_icon (pEmblem, pIcon, pContainer);
1416- cairo_dock_free_emblem (pEmblem);
1417+ cairo_dock_free_emblem (pEmblem);*/
1418
1419 cairo_dock_redraw_icon (pIcon, pContainer);
1420 return TRUE;
1421@@ -149,7 +157,7 @@
1422
1423 if (CAIRO_DOCK_IS_DOCK (pContainer) && cAnimation != NULL)
1424 {
1425- cairo_dock_request_icon_animation (pIcon, CAIRO_DOCK (pContainer), cAnimation, iNbRounds);
1426+ cairo_dock_request_icon_animation (pIcon, pContainer, cAnimation, iNbRounds);
1427 return TRUE;
1428 }
1429 return FALSE;
1430@@ -371,7 +379,7 @@
1431 }
1432 if (iNbCharsMax != 0)
1433 {
1434- gchar *cLabel = g_strdup_printf ("<b>%d</b>", cInitialText ? strlen (cInitialText) : 0);
1435+ gchar *cLabel = g_strdup_printf ("<b>%zd</b>", cInitialText ? strlen (cInitialText) : 0);
1436 GtkWidget *pLabel = gtk_label_new (cLabel);
1437 g_free (cLabel);
1438 gtk_label_set_use_markup (GTK_LABEL (pLabel), TRUE);
1439@@ -842,7 +850,9 @@
1440 memset (&attr, 0, sizeof (CairoGraphAttribute));
1441 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
1442 pRenderAttr->cModelName = "graph";
1443- pRenderAttr->iMemorySize = (pIcon->fWidth > 1 ? pIcon->fWidth : 32); // fWidht peut etre <= 1 en mode desklet au chargement.
1444+ int w, h;
1445+ cairo_dock_get_icon_extent (pIcon, &w, &h);
1446+ pRenderAttr->iMemorySize = (w > 1 ? w : 32);
1447 // Line;Plain;Bar;Circle;Plain Circle
1448 if (cTheme == NULL || strcmp (cTheme, "Line") == 0)
1449 attr.iType = CAIRO_DOCK_GRAPH_LINE;
1450@@ -854,7 +864,6 @@
1451 attr.iType = CAIRO_DOCK_GRAPH_CIRCLE;
1452 else if (strcmp (cTheme, "Plain Circle") == 0)
1453 attr.iType = CAIRO_DOCK_GRAPH_CIRCLE_PLAIN;
1454- attr.iRadius = 10;
1455 attr.bMixGraphs = FALSE;
1456 double *fHighColor = g_new (double, iNbValues*3);
1457 double *fLowColor = g_new (double, iNbValues*3);
1458@@ -1286,7 +1295,7 @@
1459 else if (strcmp (cProperty, "width") == 0)
1460 {
1461 int iWidth, iHeight;
1462- cairo_dock_get_icon_extent (pIcon, pContainer, &iWidth, &iHeight);
1463+ cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
1464 if (pInstance->pDock)
1465 {
1466 double a = cairo_dock_get_max_scale (pContainer);
1467@@ -1299,7 +1308,7 @@
1468 else if (strcmp (cProperty, "height") == 0)
1469 {
1470 int iWidth, iHeight;
1471- cairo_dock_get_icon_extent (pIcon, pContainer, &iWidth, &iHeight);
1472+ cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
1473 if (pInstance->pDock)
1474 {
1475 double a = cairo_dock_get_max_scale (pContainer);
1476@@ -1354,7 +1363,7 @@
1477 }
1478 CairoDockPositionType iScreenBorder = ((! pContainer->bIsHorizontal) << 1) | (! pContainer->bDirectionUp);
1479 int iWidth, iHeight;
1480- cairo_dock_get_icon_extent (pIcon, pContainer, &iWidth, &iHeight);
1481+ cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
1482 if (pInstance->pDock)
1483 {
1484 double a = cairo_dock_get_max_scale (pContainer);
1485
1486=== modified file 'Dbus/src/interface-applet-object.c'
1487--- Dbus/src/interface-applet-object.c 2011-04-20 20:46:51 +0000
1488+++ Dbus/src/interface-applet-object.c 2011-10-08 22:23:24 +0000
1489@@ -29,6 +29,7 @@
1490 #include "interface-applet-object.h"
1491
1492 static int s_iModuleId = 1;
1493+static GList *s_pAppletList = NULL;
1494
1495 static void cd_dbus_applet_dispose (GObject *object);
1496 static void cd_dbus_applet_finalize (GObject *object);
1497@@ -93,7 +94,7 @@
1498 {
1499 dbusApplet *pDbusApplet = NULL;
1500 GList *a;
1501- for (a = myData.pAppletList; a != NULL; a = a->next)
1502+ for (a = s_pAppletList; a != NULL; a = a->next)
1503 {
1504 pDbusApplet = a->data;
1505 if (pDbusApplet->pModuleInstance == pModuleInstance)
1506@@ -103,7 +104,7 @@
1507 }
1508
1509
1510-#define _applet_list_is_empty() (myData.pAppletList == NULL)
1511+#define _applet_list_is_empty() (s_pAppletList == NULL)
1512
1513 dbusApplet *cd_dbus_create_remote_applet_object (CairoDockModuleInstance *pModuleInstance)
1514 {
1515@@ -182,13 +183,13 @@
1516 myData.xActiveWindow = cairo_dock_get_current_active_window ();
1517 }
1518
1519- myData.pAppletList = g_list_prepend (myData.pAppletList, pDbusApplet);
1520+ s_pAppletList = g_list_prepend (s_pAppletList, pDbusApplet);
1521 return pDbusApplet;
1522 }
1523
1524 void cd_dbus_delete_remote_applet_object (dbusApplet *pDbusApplet)
1525 {
1526- myData.pAppletList = g_list_remove (myData.pAppletList, pDbusApplet);
1527+ s_pAppletList = g_list_remove (s_pAppletList, pDbusApplet);
1528
1529 if (_applet_list_is_empty ()) // si plus d'applet dbus, inutile de garder les notifications actives.
1530 {
1531
1532=== modified file 'Dbus/src/interface-applet-signals.c'
1533--- Dbus/src/interface-applet-signals.c 2011-08-09 18:08:08 +0000
1534+++ Dbus/src/interface-applet-signals.c 2011-10-08 22:23:24 +0000
1535@@ -258,7 +258,7 @@
1536 }
1537 }
1538
1539-#define CAIRO_DOCK_IS_EXTERNAL_APPLET(pIcon) (CAIRO_DOCK_IS_APPLET (pIcon) && pIcon->pModuleInstance->pModule->cSoFilePath == NULL)
1540+#define CAIRO_DOCK_IS_EXTERNAL_APPLET(pIcon) (CAIRO_DOCK_IS_APPLET (pIcon) && pIcon->pModuleInstance->pModule->cSoFilePath == NULL && pIcon->pModuleInstance->pModule->pInterface->stopModule == cd_dbus_emit_on_stop_module)
1541
1542 static inline Icon *_get_main_icon_from_clicked_icon (Icon *pIcon, CairoContainer *pContainer)
1543 {
1544
1545=== modified file 'Dbus/src/interface-main-methods.c'
1546--- Dbus/src/interface-main-methods.c 2011-08-09 18:08:08 +0000
1547+++ Dbus/src/interface-main-methods.c 2011-10-08 22:23:24 +0000
1548@@ -777,7 +777,7 @@
1549 g_value_set_boolean (v, pModule->pVisitCard->bMultiInstance);
1550 g_hash_table_insert (h, g_strdup ("is-multi-instance"), v);
1551
1552- g_print ("list instances ...\n");
1553+ cd_debug ("list instances ...");
1554 gchar **pInstances = g_new0 (gchar*, g_list_length (pModule->pInstancesList)+1);
1555 CairoDockModuleInstance *pInstance;
1556 int i = 0;
1557@@ -787,12 +787,12 @@
1558 pInstance = mi->data;
1559 pInstances[i++] = g_strdup (pInstance->cConfFilePath);
1560 }
1561- g_print ("write instances ...\n");
1562+ cd_debug ("write instances ...");
1563 v = g_new0 (GValue, 1);
1564 g_value_init (v, G_TYPE_STRV);
1565 g_value_set_boxed (v, pInstances);
1566 g_hash_table_insert (h, g_strdup ("instances"), v);
1567- g_print ("done.\n");
1568+ cd_debug ("done.");
1569 return TRUE; // continue
1570 }
1571 gboolean cd_dbus_main_get_module_properties (dbusMainObject *pDbusCallback, const gchar *cName, GPtrArray **pAttributes, GError **error)
1572@@ -1013,7 +1013,7 @@
1573 NULL,
1574 fOrder);
1575 pIcon->iTrueType = CAIRO_DOCK_ICON_TYPE_CONTAINER;
1576- pIcon->iSubdockViewType = iSubdockViewType;
1577+ cairo_dock_set_subdock_content_renderer (pIcon, iSubdockViewType);
1578 pIcon->pSubDock = cairo_dock_create_subdock_from_scratch (NULL, pIcon->cName, pParentDock); // NULL <=> default sub-docks view.
1579 }
1580 else if (strcmp (cType, "Separator") == 0)
1581@@ -1281,14 +1281,22 @@
1582 if (pContainer == NULL)
1583 continue;
1584
1585- cairo_t *pIconContext = cairo_create (pIcon->pIconBuffer);
1586-
1587- CairoEmblem *pEmblem = cairo_dock_make_emblem (cImage, pIcon, pContainer);
1588+ if (cImage == NULL || *cImage == '\0' || strcmp (cImage, "none") == 0)
1589+ {
1590+ cairo_dock_remove_overlay_at_position (pIcon, iPosition);
1591+ }
1592+ else
1593+ {
1594+ if (iPosition < 0) // [-N, -1]
1595+ cairo_dock_print_overlay_on_icon (pIcon, pContainer, cImage, - iPosition - 1);
1596+ else // [0, N-1]
1597+ cairo_dock_add_overlay_from_image (pIcon, cImage, iPosition);
1598+ }
1599+ /**CairoEmblem *pEmblem = cairo_dock_make_emblem (cImage, pIcon);
1600 pEmblem->iPosition = iPosition;
1601 cairo_dock_draw_emblem_on_icon (pEmblem, pIcon, pContainer);
1602- cairo_dock_free_emblem (pEmblem);
1603+ cairo_dock_free_emblem (pEmblem);*/
1604
1605- cairo_destroy (pIconContext);
1606 cairo_dock_redraw_icon (pIcon, pContainer);
1607 }
1608
1609@@ -1314,7 +1322,7 @@
1610 pContainer = cairo_dock_search_container_from_icon (pIcon);
1611 if (! CAIRO_DOCK_IS_DOCK (pContainer))
1612 continue;
1613- cairo_dock_request_icon_animation (pIcon, CAIRO_DOCK (pContainer), cAnimation, iNbRounds);
1614+ cairo_dock_request_icon_animation (pIcon, pContainer, cAnimation, iNbRounds);
1615 }
1616
1617 g_list_free (pList);
1618
1619=== modified file 'Disks/data/Disks.conf.in'
1620--- Disks/data/Disks.conf.in 2011-08-09 18:08:08 +0000
1621+++ Disks/data/Disks.conf.in 2011-10-08 22:23:24 +0000
1622@@ -42,7 +42,7 @@
1623 size = 96;96
1624
1625 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
1626-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
1627+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
1628 accessibility=0
1629
1630 #b Should be visible on all desktops?
1631@@ -116,9 +116,12 @@
1632 #X[Gauge;gtk-dialog-info]
1633 frame_gauge=
1634
1635-#h+[@gaugesdir@;gauges;gauges] Choose one of the available themes:/
1636+#h+[@gaugesdir@;gauges;gauges3] Choose one of the available themes:/
1637 theme = Turbo-night-fuel
1638
1639+#l+[No;With dock orientation;Yes] Rotate applet theme :
1640+rotate theme = No
1641+
1642
1643 #X[Graph;gtk-dialog-info]
1644 frame_graph=
1645
1646=== modified file 'Disks/src/applet-config.c'
1647--- Disks/src/applet-config.c 2011-08-09 18:08:08 +0000
1648+++ Disks/src/applet-config.c 2011-10-08 22:23:24 +0000
1649@@ -35,6 +35,7 @@
1650
1651 ///\_________________ Gauge
1652 myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
1653+ myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
1654
1655 ///\_________________ Graph
1656 myConfig.iGraphType = CD_CONFIG_GET_INTEGER ("Configuration", "graphic type");
1657
1658=== modified file 'Disks/src/applet-disks.c'
1659--- Disks/src/applet-disks.c 2011-08-09 18:08:08 +0000
1660+++ Disks/src/applet-disks.c 2011-10-08 22:23:24 +0000
1661@@ -331,6 +331,7 @@
1662 g_list_free_full (myData.lParts, g_free);
1663 #else
1664 g_list_foreach (myData.lParts, (GFunc) _reset_parts_list, NULL);
1665+ g_list_free (myData.lParts);
1666 #endif
1667 myData.lParts = NULL;
1668 }
1669
1670=== modified file 'Disks/src/applet-init.c'
1671--- Disks/src/applet-init.c 2011-08-09 18:08:08 +0000
1672+++ Disks/src/applet-init.c 2011-10-08 22:23:24 +0000
1673@@ -67,6 +67,7 @@
1674 memset (&attr, 0, sizeof (CairoGaugeAttribute));
1675 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
1676 pRenderAttr->cModelName = "gauge";
1677+ pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
1678 attr.cThemePath = myConfig.cGThemePath;
1679 }
1680 else if (myConfig.iDisplayType == CD_DISKS_GRAPH)
1681@@ -75,7 +76,7 @@
1682 memset (&attr, 0, sizeof (CairoGraphAttribute));
1683 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
1684 pRenderAttr->cModelName = "graph";
1685- pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidht peut etre <= 1 en mode desklet au chargement.
1686+ pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidth peut etre <= 1 en mode desklet au chargement.
1687 attr.iType = myConfig.iGraphType;
1688 attr.iRadius = 10;
1689 attr.bMixGraphs = myConfig.bMixGraph;
1690@@ -202,7 +203,10 @@
1691 }
1692 if (myConfig.iInfoDisplay != CAIRO_DOCK_INFO_ON_LABEL)
1693 {
1694- CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
1695+ if (myConfig.defaultTitle) // has another default name
1696+ CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
1697+ else
1698+ CD_APPLET_SET_NAME_FOR_MY_ICON (myApplet->pModule->pVisitCard->cTitle);
1699 }
1700
1701 cairo_dock_relaunch_task_immediately (myData.pPeriodicTask, myConfig.iCheckInterval);
1702
1703=== modified file 'Disks/src/applet-struct.h'
1704--- Disks/src/applet-struct.h 2011-08-09 18:08:08 +0000
1705+++ Disks/src/applet-struct.h 2011-10-08 22:23:24 +0000
1706@@ -47,6 +47,7 @@
1707 struct _AppletConfig {
1708 gchar *defaultTitle;
1709 gchar *cGThemePath;
1710+ RendererRotateTheme iRotateTheme;
1711 gchar *cWatermarkImagePath; // delete ?
1712 gdouble fAlpha;
1713
1714
1715=== modified file 'Doncky/data/Doncky.conf.in'
1716--- Doncky/data/Doncky.conf.in 2011-08-09 18:08:08 +0000
1717+++ Doncky/data/Doncky.conf.in 2011-10-08 22:23:24 +0000
1718@@ -54,7 +54,7 @@
1719 #b Is detached from the dock
1720 initially detached=true
1721 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
1722-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
1723+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
1724 accessibility=0
1725 #b Should be visible on all desktops?
1726 sticky=true
1727
1728=== modified file 'Folders/data/CMakeLists.txt'
1729--- Folders/data/CMakeLists.txt 2010-08-10 00:05:57 +0000
1730+++ Folders/data/CMakeLists.txt 2011-10-08 22:23:24 +0000
1731@@ -5,6 +5,6 @@
1732
1733 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Folders.conf
1734 preview.jpg
1735- icon.svg
1736+ icon.png
1737 DESTINATION ${foldersdatadir})
1738
1739
1740=== modified file 'Folders/data/Folders.conf.in'
1741--- Folders/data/Folders.conf.in 2011-08-09 18:08:08 +0000
1742+++ Folders/data/Folders.conf.in 2011-10-08 22:23:24 +0000
1743@@ -66,7 +66,7 @@
1744 #b Is detached from the dock
1745 initially detached=false
1746 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
1747-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
1748+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
1749 accessibility=0
1750 #b Should be visible on all desktops?
1751 sticky=true
1752
1753=== modified file 'Folders/data/icon.png' (properties changed: +x to -x)
1754Binary files Folders/data/icon.png 2010-08-10 00:05:57 +0000 and Folders/data/icon.png 2011-10-08 22:23:24 +0000 differ
1755=== removed file 'Folders/data/icon.svg'
1756--- Folders/data/icon.svg 2010-08-10 00:05:57 +0000
1757+++ Folders/data/icon.svg 1970-01-01 00:00:00 +0000
1758@@ -1,127 +0,0 @@
1759-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1760-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
1761-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
1762-<!-- Created with Inkscape (http://www.inkscape.org/) --><svg height="128.00000pt" id="svg1" inkscape:version="0.39cvs" sodipodi:docbase="/home/andy/Desktop/etiquette-icons-0.4/scalable/filesystems" sodipodi:docname="gnome-fs-home.svg" sodipodi:version="0.32" width="128.00000pt" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink">
1763- <metadata>
1764- <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
1765- <cc:Work rdf:about="">
1766- <dc:title>Etiquette Icons</dc:title>
1767- <dc:description></dc:description>
1768- <dc:subject>
1769- <rdf:Bag>
1770- <rdf:li>hash</rdf:li>
1771- <rdf:li></rdf:li>
1772- <rdf:li>filesystem</rdf:li>
1773- <rdf:li>computer</rdf:li>
1774- <rdf:li>icons</rdf:li>
1775- <rdf:li>folder</rdf:li>
1776- </rdf:Bag>
1777- </dc:subject>
1778- <dc:publisher>
1779- <cc:Agent rdf:about="http://www.openclipart.org">
1780- <dc:title>Andy Fitzsimon</dc:title>
1781- </cc:Agent>
1782- </dc:publisher>
1783- <dc:creator>
1784- <cc:Agent>
1785- <dc:title>Andy Fitzsimon</dc:title>
1786- </cc:Agent>
1787- </dc:creator>
1788- <dc:rights>
1789- <cc:Agent>
1790- <dc:title>Andy Fitzsimon</dc:title>
1791- </cc:Agent>
1792- </dc:rights>
1793- <dc:date></dc:date>
1794- <dc:format>image/svg+xml</dc:format>
1795- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
1796- <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
1797- <dc:language>en</dc:language>
1798- </cc:Work>
1799- <cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
1800- <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
1801- <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
1802- <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
1803- </cc:License>
1804- </rdf:RDF>
1805- </metadata>
1806- <defs id="defs3">
1807- <linearGradient id="linearGradient2102">
1808- <stop id="stop2103" offset="0.0000000" style="stop-color:#bab5ab;stop-opacity:1.0000000;"/>
1809- <stop id="stop2104" offset="1.0000000" style="stop-color:#eae8e3;stop-opacity:1.0000000;"/>
1810- </linearGradient>
1811- <linearGradient id="linearGradient1520">
1812- <stop id="stop1522" offset="0.0000000" style="stop-color:#7590ae;stop-opacity:1.0000000;"/>
1813- <stop id="stop1523" offset="1.0000000" style="stop-color:#314e6c;stop-opacity:1.0000000;"/>
1814- </linearGradient>
1815- <linearGradient id="linearGradient1806">
1816- <stop id="stop1807" offset="0.0000000" style="stop-color:#000000;stop-opacity:0.40677965;"/>
1817- <stop id="stop3276" offset="0.64777780" style="stop-color:#000000;stop-opacity:0.073446326;"/>
1818- <stop id="stop1808" offset="1.0000000" style="stop-color:#000000;stop-opacity:0.0000000;"/>
1819- </linearGradient>
1820- <linearGradient id="linearGradient1517">
1821- <stop id="stop1518" offset="0.0000000" style="stop-color:#ffffff;stop-opacity:0.0000000;"/>
1822- <stop id="stop1519" offset="1.0000000" style="stop-color:#ffffff;stop-opacity:1.0000000;"/>
1823- </linearGradient>
1824- <linearGradient id="linearGradient1504">
1825- <stop id="stop1505" offset="0.0000000" style="stop-color:#a3a3a3;stop-opacity:1.0000000;"/>
1826- <stop id="stop1506" offset="1.0000000" style="stop-color:#ffffff;stop-opacity:1.0000000;"/>
1827- </linearGradient>
1828- <linearGradient id="linearGradient1792">
1829- <stop id="stop1793" offset="0.0000000" style="stop-color:#000000;stop-opacity:0.084745765;"/>
1830- <stop id="stop1795" offset="0.63222224" style="stop-color:#000000;stop-opacity:0.38418078;"/>
1831- <stop id="stop1794" offset="1.0000000" style="stop-color:#000000;stop-opacity:0.0000000;"/>
1832- </linearGradient>
1833- <linearGradient id="linearGradient1511">
1834- <stop id="stop1512" offset="0.0000000" style="stop-color:#4b6983;stop-opacity:1.0000000;"/>
1835- <stop id="stop1513" offset="1.0000000" style="stop-color:#9db8d2;stop-opacity:1.0000000;"/>
1836- </linearGradient>
1837- <linearGradient id="linearGradient1501">
1838- <stop id="stop1502" offset="0.0000000" style="stop-color:#ffffff;stop-opacity:1.0000000;"/>
1839- <stop id="stop1504" offset="1.0000000" style="stop-color:#ffffff;stop-opacity:0.0000000;"/>
1840- </linearGradient>
1841- <linearGradient id="linearGradient1499" x1="0.85826772" x2="0.062992126" xlink:href="#linearGradient1501" y1="0.14062500" y2="0.54687500"/>
1842- <linearGradient id="linearGradient1492">
1843- <stop id="stop1493" offset="0.0000000" style="stop-color:#c0c0c0;stop-opacity:1.0000000;"/>
1844- <stop id="stop1496" offset="0.34923077" style="stop-color:#f1f1f1;stop-opacity:1.0000000;"/>
1845- <stop id="stop1494" offset="1.0000000" style="stop-color:#f0f0f0;stop-opacity:1.0000000;"/>
1846- </linearGradient>
1847- <linearGradient id="linearGradient1495" x1="0.88034189" x2="0.085470088" xlink:href="#linearGradient1492" y1="0.21093750" y2="1.1796875"/>
1848- <linearGradient id="linearGradient1506" x1="0.68278474" x2="0.68278474" xlink:href="#linearGradient2102" y1="0.18663210" y2="1.0092229"/>
1849- <radialGradient cx="0.49032259" cy="0.50649351" fx="0.50977784" fy="0.15800871" id="radialGradient1505" r="0.46014288" xlink:href="#linearGradient1806"/>
1850- <radialGradient cx="0.49032259" cy="0.50649351" fx="0.49027237" fy="0.095238097" id="radialGradient1502" r="0.46014288" xlink:href="#linearGradient1806"/>
1851- <linearGradient id="linearGradient1518">
1852- <stop id="stop1520" offset="0.0000000" style="stop-color:#000000;stop-opacity:1.0000000;"/>
1853- <stop id="stop1521" offset="1.0000000" style="stop-color:#ebebeb;stop-opacity:1.0000000;"/>
1854- </linearGradient>
1855- <linearGradient gradientTransform="scale(1.385990,0.721506)" gradientUnits="userSpaceOnUse" id="linearGradient1507" x1="68.708969" x2="68.708969" xlink:href="#linearGradient1511" y1="111.90047" y2="191.01146"/>
1856- <linearGradient id="linearGradient1510" x1="0.55371535" x2="0.48209488" xlink:href="#linearGradient1806" y1="0.27680120" y2="1.4089690"/>
1857- <linearGradient id="linearGradient1514" x1="0.49707603" x2="0.49707603" xlink:href="#linearGradient1520" y1="0.053910151" y2="0.40625000"/>
1858- <radialGradient id="radialGradient1515" xlink:href="#linearGradient1511"/>
1859- <linearGradient id="linearGradient1516" x1="0.51567942" x2="0.53310102" xlink:href="#linearGradient1517" y1="0.76666665" y2="-0.10000000"/>
1860- <linearGradient id="linearGradient1521" xlink:href="#linearGradient1792"/>
1861- <radialGradient cx="0.50522649" cy="0.54545456" fx="0.50871080" fy="0.26136363" id="radialGradient1950" r="0.38421080" xlink:href="#linearGradient1792"/>
1862- <linearGradient id="linearGradient1522" xlink:href="#linearGradient1518"/>
1863- <linearGradient id="linearGradient1599" xlink:href="#linearGradient1792"/>
1864- <linearGradient id="linearGradient2352" x1="0.50522649" x2="0.50522649" xlink:href="#linearGradient1792" y1="1.8974513" y2="0.32051283"/>
1865- <linearGradient id="linearGradient1497" xlink:href="#linearGradient1492"/>
1866- </defs>
1867- <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" gridspacingx="2.5000000mm" gridspacingy="2.5000000mm" id="base" inkscape:cx="156.35533" inkscape:cy="126.76260" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="501" inkscape:window-width="599" inkscape:window-x="265" inkscape:window-y="122" inkscape:zoom="1.2011993" pagecolor="#ffffff" showgrid="false" snaptogrid="false"/>
1868- <g id="g1621" style="fill:#ffffff;fill-opacity:0.20430107;" transform="matrix(1.056550,0.000000,0.000000,1.056550,-132.2439,88.48814)">
1869- <path d="M 158.06250,-77.656250 C 150.33842,-77.636797 145.44083,-69.199281 146.50263,-62.129272 C 146.31518,-52.347100 146.19816,-42.563767 146.03125,-32.781250 C 138.77736,-30.499103 134.85098,-22.678344 135.57329,-15.403545 C 136.11802,-3.9029094 138.14866,7.4720113 139.48318,18.898801 C 140.44347,23.963266 140.47980,29.388446 142.56319,34.132790 C 145.86543,39.628238 152.90598,40.529305 158.71739,39.905842 C 191.41553,40.062947 224.11447,40.054030 256.81250,39.875000 C 263.43388,36.980208 264.71813,29.043726 265.34933,22.646580 C 267.37683,9.1198459 269.91467,-4.3342879 271.45758,-17.930690 C 272.16212,-25.113770 265.70267,-29.565231 262.06495,-33.893679 C 261.15574,-40.218455 262.05399,-46.652921 261.36659,-53.015204 C 261.21848,-57.975877 260.14178,-64.521742 254.20179,-65.459786 C 248.53755,-66.553586 242.71560,-65.584010 236.98918,-66.020283 C 228.39904,-66.107275 219.80889,-66.194261 211.21875,-66.281250 C 205.29983,-69.099380 203.03646,-77.639836 195.72328,-77.801518 C 183.17051,-77.714934 170.61219,-78.111226 158.06250,-77.656250 z " id="path1559" style="fill-rule:evenodd;stroke-width:1.2500000;stroke-opacity:0.33962265;fill:#ffffff;fill-opacity:0.20430107;"/>
1870- <path d="M 159.18750,-80.218750 C 150.48428,-80.838790 144.00999,-72.453178 144.11020,-64.254369 C 143.11939,-55.185354 144.07536,-45.992549 143.13363,-36.949168 C 138.04231,-29.926366 131.27934,-22.686941 133.07476,-12.723316 C 134.58995,2.5737368 136.91553,17.787633 138.90625,33.031250 C 142.42615,40.907408 151.49988,43.202015 159.36983,42.121944 C 192.40096,42.492716 225.43715,42.739921 258.46875,42.281250 C 268.88857,35.112424 267.93871,21.299242 270.00049,10.231906 C 271.27288,0.13302302 273.18321,-9.9475589 274.00945,-20.064209 C 273.34232,-28.182409 263.86174,-32.418893 264.47218,-40.850023 C 263.32975,-48.961625 265.74021,-59.212401 259.49201,-65.446312 C 251.23151,-70.897196 240.86542,-68.061580 231.59153,-68.904519 C 224.70096,-69.921717 216.33317,-67.112713 210.48638,-70.821698 C 205.17991,-76.745140 198.04305,-81.781910 189.67793,-80.269272 C 179.51446,-80.252431 169.35098,-80.235590 159.18750,-80.218750 z " id="path1573" style="fill-rule:evenodd;stroke-width:1.2500000;stroke-opacity:0.33962265;fill:#ffffff;fill-opacity:0.20430107;"/>
1871- <path d="M 156.93750,-83.562500 C 148.47071,-82.628394 142.18560,-74.798771 141.31127,-66.614619 C 139.07719,-56.752443 141.26926,-46.463541 138.85705,-36.626083 C 134.93015,-31.182966 129.58151,-25.850344 130.46544,-18.524671 C 129.41574,-1.3542399 133.74672,15.485198 135.37623,32.475224 C 137.36469,40.898949 146.69001,45.462856 154.80951,45.128239 C 189.72134,45.756729 224.65378,45.974423 259.56595,45.137760 C 266.07960,42.104129 268.38738,34.444245 270.55919,28.161738 C 273.09625,17.158816 273.74056,5.8327491 275.69048,-5.2771292 C 276.35213,-10.552361 277.59576,-15.859126 277.51471,-21.164194 C 275.70845,-28.558585 268.28594,-33.767452 268.63587,-41.841151 C 267.68176,-49.393992 266.59069,-56.934002 265.12500,-64.406250 C 259.46495,-71.651339 249.49887,-72.170690 241.05096,-72.017609 C 232.16938,-72.365906 223.28782,-72.714204 214.40625,-73.062500 C 207.47201,-78.235969 199.93554,-84.650382 190.64723,-83.525120 C 179.41274,-83.790111 168.17272,-83.774900 156.93750,-83.562500 z " id="path1598" style="fill-rule:evenodd;stroke-width:1.2500000;stroke-opacity:0.33962265;fill:#ffffff;fill-opacity:0.20430107;"/>
1872- <path d="M 159.46272,-75.628403 C 153.85497,-76.048570 148.97039,-71.364778 148.62954,-65.851779 C 148.25942,-55.724937 148.56005,-45.569167 148.46272,-35.430609 C 148.46272,-33.631955 148.46272,-31.833305 148.46272,-30.034653 C 143.53163,-30.746685 139.41403,-26.674828 138.27616,-22.143527 C 136.47571,-16.039411 138.47800,-9.7664554 138.93438,-3.6075384 C 140.32356,7.5515122 141.60903,18.725959 143.06334,29.875343 C 144.13526,34.611006 148.72294,38.398739 153.65729,37.652848 C 187.87052,37.614680 222.09048,37.729192 256.29952,37.595574 C 261.11343,35.982903 261.89033,30.225661 262.56719,25.827146 C 264.81056,11.935128 267.21895,-1.9342997 269.35756,-15.840659 C 269.90093,-21.665120 266.95201,-29.247111 260.42397,-30.011895 C 258.08379,-29.526034 259.62007,-32.828725 259.18146,-34.208072 C 259.10812,-41.961371 259.33115,-49.729480 259.06442,-57.473146 C 258.71232,-61.170556 255.30273,-64.138338 251.57460,-63.472152 C 238.06086,-63.495388 224.54474,-63.425673 211.03249,-63.507025 C 204.05055,-64.543769 203.56239,-74.556784 196.58046,-75.593530 C 184.20985,-75.674630 171.83483,-75.605353 159.46272,-75.628403 z " id="path963" style="fill-rule:evenodd;stroke-width:1.2500000;stroke-opacity:0.33962265;fill:#ffffff;fill-opacity:0.20430107;"/>
1873- </g>
1874- <path d="M 27.173984,98.211833 L 27.173984,26.986457 C 27.173984,19.788368 30.722756,14.591369 38.179233,14.591369 L 74.626759,14.591369 C 82.083245,14.591369 82.987870,26.749499 90.444357,26.749499 L 131.96554,26.749499 C 135.33208,26.749499 137.89713,30.231840 137.89713,34.233174 L 137.89713,98.211833 L 27.173984,98.211833 z " id="path1502" sodipodi:nodetypes="cczzzzzcc" style="fill:url(#linearGradient1514);fill-rule:evenodd;stroke:#565248;stroke-width:1.2500000;stroke-opacity:0.33962265;"/>
1875- <path d="M 82.055313 175.83524 A 56.143108 56.143108 0 1 0 -30.230904,175.83524 A 56.143108 56.143108 0 1 0 82.055313 175.83524 z" id="path1809" sodipodi:cx="25.912205" sodipodi:cy="175.83524" sodipodi:rx="56.143108" sodipodi:ry="56.143108" sodipodi:type="arc" style="fill:url(#radialGradient1505);fill-opacity:1;fill-rule:evenodd;stroke-width:1.0000000pt;" transform="matrix(1.442331,0.000000,0.000000,0.353388,43.56779,62.11168)"/>
1876- <g id="g1527" style="fill-opacity:0.037735824;" transform="matrix(0.926940,0.000000,0.000000,1.039779,-57.30231,-49.08006)">
1877- <path d="M 77.776110,171.71342 L 83.600639,155.83612 C 84.135181,154.37897 88.524659,152.72237 92.914636,152.72237 L 207.01118,152.72237 C 210.89125,152.72237 213.36492,154.55589 213.99669,155.83612 L 221.83189,171.71342 C 223.23784,174.56248 218.51026,177.42373 211.59415,177.42373 L 88.013849,177.42373 C 81.097741,177.42373 76.724895,174.57895 77.776110,171.71342 z " id="path2363" sodipodi:nodetypes="czzzzzzzz" style="fill-rule:evenodd;stroke-width:1.2259742;stroke-opacity:0.28272250;"/>
1878- <path d="M 81.210337,170.03356 L 86.757335,155.99569 C 87.266408,154.70737 91.446733,153.24269 95.627534,153.24269 L 204.28755,153.24269 C 207.98274,153.24269 210.33854,154.86378 210.94020,155.99569 L 218.40207,170.03356 C 219.74103,172.55255 215.23871,175.08232 208.65215,175.08232 L 90.960262,175.08232 C 84.373697,175.08232 80.209211,172.56711 81.210337,170.03356 z " id="path1525" sodipodi:nodetypes="czzzzzzzz" style="fill-rule:evenodd;stroke-width:1.2259742;stroke-opacity:0.28272250;"/>
1879- <path d="M 88.078791,168.67401 L 93.070728,156.64279 C 93.528861,155.53862 97.290882,154.28331 101.05333,154.28331 L 198.84028,154.28331 C 202.16571,154.28331 204.28577,155.67268 204.82723,156.64279 L 211.54243,168.67401 C 212.74740,170.83292 208.69561,173.00107 202.76813,173.00107 L 96.853089,173.00107 C 90.925609,173.00107 87.177842,170.84540 88.078791,168.67401 z " id="path1526" sodipodi:nodetypes="czzzzzzzz" style="fill-rule:evenodd;stroke-width:1.2259742;stroke-opacity:0.28272250;"/>
1880- </g>
1881- <path d="M 117.78716,36.773767 L 117.78716,75.722650 L 117.78716,95.197088 L 117.78716,114.67154 L 100.01510,114.67154 L 82.243034,114.67154 L 64.470973,114.67154 L 46.698909,114.67154 L 46.698909,95.197088 L 46.698909,75.722650 L 46.775671,36.773767 L 82.243034,36.773767 L 117.78716,36.773767 z " id="rect900" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient1495);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.22607063;stroke-opacity:0.36477986;"/>
1882- <path d="M 301.30655,174.90867 L 299.27069,628.90434 L 743.08709,628.90434 L 743.34157,516.67783 C 733.41677,520.49506 633.15091,378.49417 506.92790,384.60173 C 380.59029,390.71484 413.27857,193.23136 301.30655,174.90867 z " id="path1500" sodipodi:nodetypes="cccczc" style="fill:url(#linearGradient1499);fill-opacity:1;fill-rule:evenodd;stroke-width:1.0000000pt;" transform="matrix(0.157267,0.000000,0.000000,0.157267,-0.685311,17.09000)"/>
1883- <path d="M 16.340118,75.850997 L 21.660243,119.35397 C 22.148493,123.34642 26.157842,127.88541 30.167647,127.88541 L 134.38341,127.88541 C 137.92746,127.88541 140.18692,122.86168 140.76397,119.35397 L 147.92063,75.850997 C 149.20483,68.044749 144.88666,60.205100 138.56949,60.205100 L 25.691267,60.205100 C 19.374096,60.205100 15.379940,67.999588 16.340118,75.850997 z " id="path1501" sodipodi:nodetypes="czzzzzzzz" style="fill:url(#linearGradient1507);fill-rule:evenodd;stroke:url(#linearGradient1521);stroke-width:1.2519596;stroke-opacity:0.33962265;"/>
1884- <path d="M 17.363760,74.771310 C 17.144790,75.718777 21.236974,66.419549 28.174951,66.419549 L 134.15847,66.419549 C 142.69349,66.419549 145.42542,75.718777 145.64440,74.771310 C 145.86338,73.823852 150.22438,60.734754 134.33482,60.734754 L 28.673341,60.734754 C 15.227487,60.734754 17.582722,73.823852 17.363760,74.771310 z " id="path1503" sodipodi:nodetypes="czzzzzz" style="fill:url(#linearGradient1516);fill-rule:evenodd;stroke-width:0.90415878pt;"/>
1885-</svg>
1886
1887=== modified file 'Folders/src/CMakeLists.txt'
1888--- Folders/src/CMakeLists.txt 2010-08-10 00:05:57 +0000
1889+++ Folders/src/CMakeLists.txt 2011-10-08 22:23:24 +0000
1890@@ -19,7 +19,7 @@
1891 add_definitions (-DMY_APPLET_VERSION="${VERSION_FOLDERS}")
1892 add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_FOLDERS}")
1893 add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
1894-add_definitions (-DMY_APPLET_ICON_FILE="icon.svg")
1895+add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
1896 add_definitions (-DCD_APPLET_MULTI_INSTANCE="1")
1897 ### uncomment the following line to allow extended OpenGL drawing.
1898 #add_definitions (-DGL_GLEXT_PROTOTYPES="1")
1899
1900=== modified file 'Folders/src/applet-config.c'
1901--- Folders/src/applet-config.c 2011-08-09 18:08:08 +0000
1902+++ Folders/src/applet-config.c 2011-10-08 22:23:24 +0000
1903@@ -28,9 +28,9 @@
1904 //\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload.
1905 CD_APPLET_GET_CONFIG_BEGIN
1906 myConfig.cDefaultTitle = CD_CONFIG_GET_STRING ("Icon", "name");
1907- ///myConfig.cImageFile = CD_CONFIG_GET_STRING ("Icon", "image file");
1908+ myConfig.cImageFile = CD_CONFIG_GET_STRING ("Icon", "image file");
1909 myConfig.cDirPath = CD_CONFIG_GET_STRING ("Configuration", "dir path");
1910- if (myConfig.cDirPath)
1911+ if (myConfig.cDirPath) // transform the pah into an URI.
1912 {
1913 if (*myConfig.cDirPath == '~')
1914 {
1915@@ -47,7 +47,6 @@
1916 }
1917 myConfig.bShowFiles = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "show files", TRUE);
1918 myConfig.cRenderer = CD_CONFIG_GET_STRING ("Configuration", "renderer");
1919- //myConfig.iNbIcons = CD_CONFIG_GET_INTEGER ("Configuration", "nb icons");
1920 myConfig.iSortType = CD_CONFIG_GET_INTEGER ("Configuration", "sort type");
1921 myConfig.bFoldersFirst = CD_CONFIG_GET_BOOLEAN ("Configuration", "folders first");
1922 myConfig.bShowHiddenFiles = CD_CONFIG_GET_BOOLEAN ("Configuration", "show hidden");
1923@@ -60,7 +59,7 @@
1924
1925 //\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end.
1926 CD_APPLET_RESET_CONFIG_BEGIN
1927- ///g_free (myConfig.cImageFile);
1928+ g_free (myConfig.cImageFile);
1929 g_free (myConfig.cDefaultTitle);
1930
1931 if (myConfig.cDirPath)
1932
1933=== modified file 'Folders/src/applet-init.c'
1934--- Folders/src/applet-init.c 2011-08-09 18:08:08 +0000
1935+++ Folders/src/applet-init.c 2011-10-08 22:23:24 +0000
1936@@ -80,24 +80,42 @@
1937
1938 //\___________ Here is where you initiate your applet. myConfig is already set at this point, and also myIcon, myContainer, myDock, myDesklet (and myDrawContext if you're in dock mode). The macro CD_APPLET_MY_CONF_FILE and CD_APPLET_MY_KEY_FILE can give you access to the applet's conf-file and its corresponding key-file (also available during reload). If you're in desklet mode, myDrawContext is still NULL, and myIcon's buffers has not been filled, because you may not need them then (idem when reloading).
1939 CD_APPLET_INIT_BEGIN
1940-
1941- //\_______________ On definit le dessin de l'icone principale.
1942- _set_icon_label (myApplet);
1943-
1944- myIcon->iSubdockViewType = myConfig.iSubdockViewType;
1945- if (myDock && myConfig.iSubdockViewType == 0)
1946- CD_APPLET_SET_DEFAULT_IMAGE_ON_MY_ICON_IF_NONE;
1947- ///CD_APPLET_SET_USER_IMAGE_ON_MY_ICON (myConfig.cImageFile, MY_APPLET_ICON_FILE);
1948-
1949- //\_______________ On lance la tache recuperation des fichiers.
1950- _set_comparaison_func (myApplet);
1951- if (myConfig.bShowFiles)
1952+
1953+ if (myConfig.cDirPath == NULL)
1954 {
1955- cd_folders_start (myApplet);
1956+ CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
1957+ cairo_dock_show_temporary_dialog_with_icon (D_("Open the configuration of the applet to choose a folder to import."),
1958+ myIcon, myContainer,
1959+ 8000.,
1960+ myConfig.iSubdockViewType == 0 ? "same icon" : MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE);
1961 }
1962- else if (myDesklet) // comme on ne charge pas les icones, on met un renderer "simple" sur notre desklet.
1963+ else
1964 {
1965- CD_APPLET_SET_DESKLET_RENDERER ("Simple");
1966+ //\_______________ On lance la tache recuperation des fichiers.
1967+ _set_comparaison_func (myApplet);
1968+ if (myConfig.bShowFiles)
1969+ {
1970+ cd_folders_start (myApplet);
1971+ }
1972+
1973+ //\_______________ set the icon rendering
1974+ if (myDock) // dock mode: set the image or the sub-dock renderer
1975+ {
1976+ cairo_dock_set_subdock_content_renderer (myIcon, myConfig.iSubdockViewType);
1977+ if (myConfig.iSubdockViewType == 0)
1978+ CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
1979+ }
1980+ else // desklet mode: set the image if we don't show the files.
1981+ {
1982+ if (! myConfig.bShowFiles)
1983+ {
1984+ CD_APPLET_SET_DESKLET_RENDERER ("Simple");
1985+ CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
1986+ }
1987+ }
1988+
1989+ //\_______________ set the label
1990+ _set_icon_label (myApplet);
1991 }
1992
1993 //\_______________ On enregistre nos notifications.
1994@@ -125,29 +143,47 @@
1995 {
1996 //\_______________ On detruit les icones des fichiers.
1997 cd_folders_free_all_data (myApplet);
1998-
1999- //\_______________ On met a jour l'icone principale.
2000- _set_icon_label (myApplet);
2001-
2002- myIcon->iSubdockViewType = myConfig.iSubdockViewType;
2003- if (myDock && myConfig.iSubdockViewType == 0)
2004- CD_APPLET_SET_DEFAULT_IMAGE_ON_MY_ICON_IF_NONE;
2005- ///CD_APPLET_SET_USER_IMAGE_ON_MY_ICON (myConfig.cImageFile, MY_APPLET_ICON_FILE);
2006-
2007- //\_______________ On charge les icones dans un sous-dock.
2008- _set_comparaison_func (myApplet);
2009- if (myConfig.bShowFiles)
2010- {
2011- cd_folders_start (myApplet);
2012- }
2013- else if (myDock && myIcon->pSubDock) // on veut un comportement de type lanceur, donc on ne veut pas d'un sous-dock vide.
2014- {
2015- cairo_dock_destroy_dock (myIcon->pSubDock, myIcon->cName);
2016- myIcon->pSubDock = NULL;
2017- }
2018- else if (myDesklet)
2019- {
2020- CD_APPLET_SET_DESKLET_RENDERER ("Simple");
2021+
2022+ if (myConfig.cDirPath == NULL)
2023+ {
2024+ CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
2025+ cairo_dock_show_temporary_dialog_with_icon (D_("Open the configuration of the applet to choose a folder to import."),
2026+ myIcon, myContainer,
2027+ 8000.,
2028+ myConfig.iSubdockViewType == 0 ? "same icon" : MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE);
2029+ }
2030+ else
2031+ {
2032+ //\_______________ On charge les icones dans un sous-dock.
2033+ _set_comparaison_func (myApplet);
2034+ if (myConfig.bShowFiles)
2035+ {
2036+ cd_folders_start (myApplet);
2037+ }
2038+ else if (myDock && myIcon->pSubDock) // dans ce cas on veut un comportement de type lanceur, donc on ne veut pas d'un sous-dock vide.
2039+ {
2040+ cairo_dock_destroy_dock (myIcon->pSubDock, myIcon->cName);
2041+ myIcon->pSubDock = NULL;
2042+ }
2043+
2044+ //\_______________ set the icon rendering
2045+ if (myDock) // dock mode: set the image or the sub-dock renderer
2046+ {
2047+ cairo_dock_set_subdock_content_renderer (myIcon, myConfig.iSubdockViewType);
2048+ if (myConfig.iSubdockViewType == 0)
2049+ CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
2050+ }
2051+ else // desklet mode: set the image if we don't show the files.
2052+ {
2053+ if (! myConfig.bShowFiles)
2054+ {
2055+ CD_APPLET_SET_DESKLET_RENDERER ("Simple");
2056+ CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
2057+ }
2058+ }
2059+
2060+ //\_______________ set the label
2061+ _set_icon_label (myApplet);
2062 }
2063 }
2064 CD_APPLET_RELOAD_END
2065
2066=== modified file 'Folders/src/applet-notifications.c'
2067--- Folders/src/applet-notifications.c 2011-08-09 18:08:08 +0000
2068+++ Folders/src/applet-notifications.c 2011-10-08 22:23:24 +0000
2069@@ -132,11 +132,11 @@
2070
2071 pLabel = gtk_label_new (NULL);
2072 gtk_label_set_use_markup (GTK_LABEL (pLabel), TRUE);
2073- g_string_printf (sInfo, "<u>Size</u> : %lld bytes", iSize);
2074+ g_string_printf (sInfo, "<u>Size</u> : %"G_GUINT64_FORMAT" bytes", iSize);
2075 if (iSize > 1024*1024)
2076- g_string_append_printf (sInfo, " (%.1f Mo)", 1. * iSize / 1024 / 1024);
2077+ g_string_append_printf (sInfo, " (%.1f MB)", 1. * iSize / 1024 / 1024);
2078 else if (iSize > 1024)
2079- g_string_append_printf (sInfo, " (%.1f Ko)", 1. * iSize / 1024);
2080+ g_string_append_printf (sInfo, " (%.1f KB)", 1. * iSize / 1024);
2081 gtk_label_set_markup (GTK_LABEL (pLabel), sInfo->str);
2082 gtk_container_add (GTK_CONTAINER (pVBox), pLabel);
2083
2084@@ -428,11 +428,19 @@
2085 CD_APPLET_ON_BUILD_MENU_END
2086
2087
2088-static void _on_answer_import (int iClickedButton, GtkWidget *pInteractiveWidget, const gchar *cReceivedData, CairoDialog *pDialog)
2089+typedef struct {
2090+ gchar *cReceivedData;
2091+ double fOrder;
2092+} CDDropData;
2093+
2094+static void _on_answer_import (int iClickedButton, GtkWidget *pInteractiveWidget, CDDropData *data, CairoDialog *pDialog)
2095 {
2096 cd_debug ("%s (%d)", __func__, iClickedButton);
2097+ const gchar *cReceivedData = data->cReceivedData;
2098+ double fOrder = data->fOrder;
2099 gboolean bImportFiles = (iClickedButton == 0 || iClickedButton == -1); // ok or Enter.
2100
2101+ // add a new conf file for the "Folders" module, with proper values.
2102 CairoDockModule *pModule = cairo_dock_find_module_from_name ("Folders");
2103 g_return_if_fail (pModule != NULL);
2104
2105@@ -440,29 +448,37 @@
2106 cairo_dock_update_conf_file (cConfFilePath,
2107 G_TYPE_STRING, "Configuration", "dir path", cReceivedData,
2108 G_TYPE_BOOLEAN, "Configuration", "show files", bImportFiles,
2109+ G_TYPE_DOUBLE, "Icon", "order", fOrder,
2110 G_TYPE_INVALID);
2111-
2112+
2113+ // instanciate the module from this conf file.
2114 CairoDockModuleInstance *pNewInstance = cairo_dock_instanciate_module (pModule, cConfFilePath); // prend le 'cConfFilePath'.
2115 if (pNewInstance != NULL && pNewInstance->pDock)
2116 {
2117 cairo_dock_update_dock_size (pNewInstance->pDock);
2118 }
2119-
2120+
2121+ // show a success message on the new icon.
2122 if (pNewInstance != NULL)
2123 cairo_dock_show_temporary_dialog_with_icon (D_("The folder has been imported."),
2124 pNewInstance->pIcon, pNewInstance->pContainer,
2125 5000,
2126 MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE); // not "same icon" because the icon may not be loaded yet (eg. stack or emblem icon).
2127-
2128+
2129+ // if the module has just been activated for the first time, write it down so that it is loaded on the next startup.
2130 if (pModule->pInstancesList && pModule->pInstancesList->next == NULL) // module nouvellement active.
2131 {
2132 cairo_dock_write_active_modules ();
2133 }
2134 }
2135+static void _free_dialog_data (CDDropData *data)
2136+{
2137+ g_free (data->cReceivedData);
2138+ g_free (data);
2139+}
2140 gboolean cd_folders_on_drop_data (gpointer data, const gchar *cReceivedData, Icon *icon, double fOrder, CairoContainer *pContainer)
2141 {
2142 //g_print ("Folders received '%s'\n", cReceivedData);
2143-
2144 if (icon != NULL || fOrder == CAIRO_DOCK_LAST_ORDER) // drop on an icon or outside of icons.
2145 return CAIRO_DOCK_LET_PASS_NOTIFICATION;
2146
2147@@ -474,22 +490,42 @@
2148
2149 if (g_file_test (cPath, G_FILE_TEST_IS_DIR)) // it's a folder, let's add a new instance of the applet that will handle it.
2150 {
2151- //g_print (" ajout d'un repertoire...\n");
2152- if (icon == NULL)
2153+ // search the closest icon to the drop point (we want to place the dialog on it).
2154+ GList *pIconsList = NULL, *ic;
2155+ if (CAIRO_DOCK_IS_DOCK (pContainer))
2156+ pIconsList = CAIRO_DOCK (pContainer)->icons;
2157+ else if (CAIRO_DOCK_IS_DESKLET (pContainer))
2158+ pIconsList = CAIRO_DESKLET (pContainer)->icons;
2159+ Icon *pIcon = NULL;
2160+ for (ic = pIconsList; ic != NULL; ic = ic->next)
2161+ {
2162+ icon = ic->data;
2163+ if (icon->fOrder > fOrder)
2164+ {
2165+ pIcon = icon;
2166+ break;
2167+ }
2168+ }
2169+ if (pIcon == NULL)
2170 {
2171 if (CAIRO_DOCK_IS_DOCK (pContainer))
2172- icon = cairo_dock_get_dialogless_icon_full (CAIRO_DOCK (pContainer));
2173+ pIcon = cairo_dock_get_dialogless_icon_full (CAIRO_DOCK (pContainer));
2174 else
2175- icon = cairo_dock_get_dialogless_icon ();
2176+ pIcon = cairo_dock_get_dialogless_icon ();
2177 }
2178+
2179+ // ask the user whether (s)he wants to import the folder's content.
2180+ CDDropData *data = g_new0 (CDDropData, 1);
2181+ data->cReceivedData = g_strdup (cReceivedData);
2182+ data->fOrder = fOrder;
2183 cairo_dock_show_dialog_full (D_("Do you want to import the content of the folder too?"),
2184- icon, pContainer,
2185+ pIcon, pContainer,
2186 0,
2187 MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE,
2188 NULL,
2189 (CairoDockActionOnAnswerFunc) _on_answer_import,
2190- g_strdup (cReceivedData),
2191- (GFreeFunc)g_free);
2192+ data,
2193+ (GFreeFunc)_free_dialog_data);
2194
2195 return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
2196 }
2197
2198=== modified file 'Folders/src/applet-struct.h'
2199--- Folders/src/applet-struct.h 2011-08-09 18:08:08 +0000
2200+++ Folders/src/applet-struct.h 2011-10-08 22:23:24 +0000
2201@@ -25,7 +25,7 @@
2202
2203 //\___________ structure containing the applet's configuration parameters.
2204 struct _AppletConfig {
2205- ///gchar *cImageFile;
2206+ gchar *cImageFile;
2207 gchar *cDefaultTitle;
2208 gchar *cDirPath;
2209 gboolean bShowFiles;
2210
2211=== modified file 'GMenu/data/GMenu.conf.in'
2212--- GMenu/data/GMenu.conf.in 2011-08-09 18:08:08 +0000
2213+++ GMenu/data/GMenu.conf.in 2011-10-08 22:23:24 +0000
2214@@ -59,7 +59,7 @@
2215 #b Is detached from the dock
2216 initially detached=false
2217 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
2218-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
2219+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
2220 accessibility=0
2221 #b Should be visible on all desktops?
2222 sticky=true
2223
2224=== modified file 'Impulse/data/Impulse.conf.in'
2225--- Impulse/data/Impulse.conf.in 2011-08-09 18:08:08 +0000
2226+++ Impulse/data/Impulse.conf.in 2011-10-08 22:23:24 +0000
2227@@ -58,7 +58,7 @@
2228 #b Is detached from the dock
2229 initially detached=false
2230 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
2231-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
2232+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
2233 accessibility=0
2234 #b Should be visible on all desktops?
2235 sticky=true
2236
2237=== modified file 'Impulse/src/Impulse.c'
2238--- Impulse/src/Impulse.c 2011-08-09 18:08:08 +0000
2239+++ Impulse/src/Impulse.c 2011-10-08 22:23:24 +0000
2240@@ -180,14 +180,14 @@
2241
2242 switch (pa_context_get_state (context))
2243 {
2244+ case PA_CONTEXT_TERMINATED:
2245+ case PA_CONTEXT_FAILED:
2246+ return IM_FAILED;
2247 case PA_CONTEXT_CONNECTING:
2248 case PA_CONTEXT_AUTHORIZING:
2249 case PA_CONTEXT_SETTING_NAME:
2250+ default: // default seems to be ok...
2251 return IM_SUCCESS;
2252- case PA_CONTEXT_TERMINATED:
2253- case PA_CONTEXT_FAILED:
2254- default:
2255- return IM_FAILED;
2256 }
2257 }
2258
2259
2260=== modified file 'Impulse/src/applet-config.c'
2261--- Impulse/src/applet-config.c 2011-08-09 18:08:08 +0000
2262+++ Impulse/src/applet-config.c 2011-10-08 22:23:24 +0000
2263@@ -27,6 +27,8 @@
2264 //\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload.
2265 CD_APPLET_GET_CONFIG_BEGIN
2266 myConfig.cIconAnimation = CD_CONFIG_GET_STRING ("Configuration", "animation");
2267+ if (myConfig.cIconAnimation == NULL)
2268+ myConfig.cIconAnimation = g_strdup ("default");
2269 myConfig.fMinValueToAnim = CD_CONFIG_GET_DOUBLE_WITH_DEFAULT ("Configuration", "sensitivity", 0.25) / 3; // PER 3
2270 myConfig.iNbAnimations = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "nb animations", 1);
2271 myConfig.iLoopTime = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "refresh", 250);
2272
2273=== modified file 'Impulse/src/applet-impulse.c'
2274--- Impulse/src/applet-impulse.c 2011-08-09 18:08:08 +0000
2275+++ Impulse/src/applet-impulse.c 2011-10-08 22:23:24 +0000
2276@@ -132,7 +132,7 @@
2277 {
2278 //cd_debug ("Impulse: animation on this icon=%s", pIcon->cName);
2279 cairo_dock_request_icon_animation (pIcon,
2280- myData.pSharedMemory->pDock,
2281+ CAIRO_CONTAINER (myData.pSharedMemory->pDock),
2282 myData.pSharedMemory->cIconAnimation,
2283 myData.pSharedMemory->iNbAnimations);
2284 bHasNotBeenAnimated = FALSE;
2285
2286=== modified file 'Indicator-applet/indicator-applet.c'
2287--- Indicator-applet/indicator-applet.c 2011-04-20 20:46:51 +0000
2288+++ Indicator-applet/indicator-applet.c 2011-10-08 22:23:24 +0000
2289@@ -33,7 +33,7 @@
2290 {
2291 if (pIndicator->pMenu == NULL)
2292 {
2293- pIndicator->pMenu = dbusmenu_gtkmenu_new (pIndicator->cBusName, pIndicator->cMenuObject);
2294+ pIndicator->pMenu = dbusmenu_gtkmenu_new ((gchar*)pIndicator->cBusName, (gchar*)pIndicator->cMenuObject); // the cast is unorthodox, but the function definition is clumsy (it should require 2 const gchar*, since it actually duplicates the strings).
2295 if (pIndicator->pMenu != NULL)
2296 {
2297 DbusmenuGtkClient * client = dbusmenu_gtkmenu_get_client (pIndicator->pMenu);
2298@@ -111,8 +111,8 @@
2299 pIndicator->cServiceInterface = cServiceInterface;
2300 pIndicator->cMenuObject = cMenuObject;
2301
2302- pIndicator->service = indicator_service_manager_new_version (cBusName, INDICATOR_APPLET_DBUS_VERSION);
2303- g_signal_connect (G_OBJECT(pIndicator->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), pIndicator); // on sera appele une fois la connexion etablie.
2304+ pIndicator->service = indicator_service_manager_new_version ((gchar*)cBusName, INDICATOR_APPLET_DBUS_VERSION);
2305+ g_signal_connect (G_OBJECT(pIndicator->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), pIndicator); // on sera appele une fois la connexion etablie. // pour le cast, cf plus haut.
2306
2307 return pIndicator;
2308 }
2309@@ -168,7 +168,12 @@
2310 }
2311
2312 cd_debug ("set %s", cIconPathFallback ? cIconPathFallback : cIconName);
2313- CD_APPLET_SET_IMAGE_ON_MY_ICON (cIconPathFallback ? cIconPathFallback : cIconName);
2314+ //CD_APPLET_SET_IMAGE_ON_MY_ICON (cIconPathFallback ? cIconPathFallback : cIconName);
2315+ cairo_dock_set_image_on_icon_with_default (myDrawContext,
2316+ cIconPathFallback ? cIconPathFallback : cIconName,
2317+ myIcon,
2318+ myContainer,
2319+ myApplet->pModule->pVisitCard->cIconFilePath);
2320
2321 g_free (tmp_icon_name);
2322 g_free (cIconPath);
2323
2324=== modified file 'MeMenu/data/MeMenu.conf.in'
2325--- MeMenu/data/MeMenu.conf.in 2011-08-09 18:08:08 +0000
2326+++ MeMenu/data/MeMenu.conf.in 2011-10-08 22:23:24 +0000
2327@@ -56,7 +56,7 @@
2328 #b Is detached from the dock
2329 initially detached=false
2330 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
2331-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
2332+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
2333 accessibility=0
2334 #b Should be visible on all desktops?
2335 sticky=true
2336
2337=== modified file 'Messaging-Menu/data/Messaging-Menu.conf.in'
2338--- Messaging-Menu/data/Messaging-Menu.conf.in 2011-08-09 18:08:08 +0000
2339+++ Messaging-Menu/data/Messaging-Menu.conf.in 2011-10-08 22:23:24 +0000
2340@@ -57,7 +57,7 @@
2341 #b Is detached from the dock
2342 initially detached=false
2343 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
2344-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
2345+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
2346 accessibility=0
2347 #b Should be visible on all desktops?
2348 sticky=true
2349
2350=== modified file 'Messaging-Menu/src/applet-config.c'
2351--- Messaging-Menu/src/applet-config.c 2010-08-10 00:05:57 +0000
2352+++ Messaging-Menu/src/applet-config.c 2011-10-08 22:23:24 +0000
2353@@ -33,13 +33,10 @@
2354
2355 //\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end.
2356 CD_APPLET_RESET_CONFIG_BEGIN
2357- g_free (myConfig.cAnimationName);
2358
2359 CD_APPLET_RESET_CONFIG_END
2360
2361-
2362 //\_________________ Here you have to free all ressources allocated for myData. This one will be reseted to 0 at the end of this function. This function is called when your applet is stopped, in the very end.
2363 CD_APPLET_RESET_DATA_BEGIN
2364
2365-
2366 CD_APPLET_RESET_DATA_END
2367
2368=== modified file 'Messaging-Menu/src/applet-menu.c'
2369--- Messaging-Menu/src/applet-menu.c 2011-08-09 18:08:08 +0000
2370+++ Messaging-Menu/src/applet-menu.c 2011-10-08 22:23:24 +0000
2371@@ -41,12 +41,20 @@
2372
2373 /* Sets the icon when it changes. */
2374 static void
2375+#if (INDICATOR_OLD_NAMES == 0)
2376+application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data)
2377+#else
2378 application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data)
2379+#endif
2380 {
2381 if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_ICON)) {
2382 /* Set the main icon */
2383 if (GTK_IS_IMAGE(user_data)) {
2384+#if (INDICATOR_OLD_NAMES == 0)
2385+ gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_variant_get_string(value, NULL), GTK_ICON_SIZE_MENU);
2386+#else
2387 gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_value_get_string(value), GTK_ICON_SIZE_MENU);
2388+#endif
2389 }
2390 }
2391
2392@@ -55,12 +63,20 @@
2393
2394 /* Sets the label when it changes. */
2395 static void
2396+#if (INDICATOR_OLD_NAMES == 0)
2397+application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data)
2398+#else
2399 application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data)
2400+#endif
2401 {
2402 if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_NAME)) {
2403 /* Set the main label */
2404 if (GTK_IS_LABEL(user_data)) {
2405+#if (INDICATOR_OLD_NAMES == 0)
2406+ gtk_label_set_text(GTK_LABEL(user_data), g_variant_get_string(value, NULL));
2407+#else
2408 gtk_label_set_text(GTK_LABEL(user_data), g_value_get_string(value));
2409+#endif
2410 }
2411 }
2412
2413@@ -191,18 +207,24 @@
2414 static gboolean
2415 new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
2416 {
2417- g_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
2418+ gchar *cName = g_strdup (dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
2419+
2420+ cd_debug ("%s (\"%s\")", __func__, cName);
2421+
2422+#if (INDICATOR_OLD_NAMES == 0)
2423+ if (newitem == NULL || !dbusmenu_menuitem_property_get_bool(newitem, DBUSMENU_MENUITEM_PROP_VISIBLE))
2424+ {
2425+ cd_debug ("Not visible: %s", cName);
2426+ g_free (cName);
2427+ return TRUE;
2428+ }
2429+#endif
2430
2431 GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
2432 #if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
2433 gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE);
2434 #endif
2435
2436- gint padding = 4;
2437- gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
2438-
2439- GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
2440-
2441 /* Set the minimum size, we always want it to take space */
2442 gint width, height;
2443 gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
2444@@ -220,14 +242,12 @@
2445 gtk_widget_show(icon);
2446
2447 /* Application name in a label */
2448- GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
2449+ GtkWidget * label = gtk_label_new(cName);
2450 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
2451- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding);
2452 gtk_widget_show(label);
2453
2454 /* Insert the hbox */
2455- gtk_container_add(GTK_CONTAINER(gmi), hbox);
2456- gtk_widget_show(hbox);
2457+ gtk_container_add(GTK_CONTAINER(gmi), label);
2458
2459 /* Attach some of the standard GTK stuff */
2460 dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
2461@@ -254,14 +274,32 @@
2462 /* Whenever we have a property change on a DbusmenuMenuitem
2463 we need to be responsive to that. */
2464 static void
2465+#if (INDICATOR_OLD_NAMES == 0)
2466+indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, indicator_item_t * mi_data)
2467+#else
2468 indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data)
2469+#endif
2470 {
2471+#if (INDICATOR_OLD_NAMES == 0)
2472+ cd_debug ("%s (\"%s\": %s)", __func__, prop, g_variant_get_string(value, NULL));
2473+#else
2474+ cd_debug ("%s (\"%s\": %s)", __func__, prop, g_value_get_string(value));
2475+#endif
2476+
2477 if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) {
2478 /* Set the main label */
2479+#if (INDICATOR_OLD_NAMES == 0)
2480+ gtk_label_set_text(GTK_LABEL(mi_data->label), g_variant_get_string(value, NULL));
2481+#else
2482 gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value));
2483+#endif
2484 } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) {
2485 /* Set the right label */
2486+#if (INDICATOR_OLD_NAMES == 0)
2487+ gtk_label_set_text(GTK_LABEL(mi_data->right), g_variant_get_string(value, NULL));
2488+#else
2489 gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value));
2490+#endif
2491 } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) {
2492 /* We don't use the value here, which is probably less efficient,
2493 but it's easier to use the easy function. And since th value
2494@@ -275,22 +313,20 @@
2495 gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
2496 if (gdk_pixbuf_get_width(pixbuf) > width ||
2497 gdk_pixbuf_get_height(pixbuf) > height) {
2498- g_debug("Resizing icon from %dx%d to %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
2499+ cd_debug("Resizing icon from %dx%d to %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
2500 resized_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
2501 width,
2502 height,
2503 GDK_INTERP_BILINEAR);
2504+ g_object_unref(pixbuf);
2505 } else {
2506- g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
2507+ cd_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
2508 resized_pixbuf = pixbuf;
2509 }
2510
2511 gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
2512
2513- /* The other pixbuf should be free'd by the dbusmenu. */
2514- if (resized_pixbuf != pixbuf) {
2515- g_object_unref(resized_pixbuf);
2516- }
2517+ g_object_unref(resized_pixbuf);
2518
2519 gtk_widget_show(mi_data->icon);
2520 } else {
2521@@ -312,6 +348,16 @@
2522 g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
2523 /* Note: not checking parent, it's reasonable for it to be NULL */
2524
2525+ cd_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
2526+
2527+#if (INDICATOR_OLD_NAMES == 0)
2528+ if (newitem == NULL || !dbusmenu_menuitem_property_get_bool(newitem, DBUSMENU_MENUITEM_PROP_VISIBLE))
2529+ {
2530+ cd_debug ("Not visible: %s", dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
2531+ return TRUE;
2532+ }
2533+#endif
2534+
2535 indicator_item_t * mi_data = g_new0(indicator_item_t, 1);
2536
2537 GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
2538@@ -337,22 +383,20 @@
2539 GdkPixbuf * resized_pixbuf;
2540 if (gdk_pixbuf_get_width(pixbuf) > width ||
2541 gdk_pixbuf_get_height(pixbuf) > height) {
2542- g_debug("Resizing icon from %dx%d to %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
2543+ cd_debug("Resizing icon from %dx%d to %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
2544 resized_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
2545 width,
2546 height,
2547 GDK_INTERP_BILINEAR);
2548+ g_object_unref(pixbuf);
2549 } else {
2550- g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
2551+ cd_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
2552 resized_pixbuf = pixbuf;
2553 }
2554
2555 gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
2556
2557- /* The other pixbuf should be free'd by the dbusmenu. */
2558- if (resized_pixbuf != pixbuf) {
2559- g_object_unref(resized_pixbuf);
2560- }
2561+ g_object_unref(resized_pixbuf);
2562 }
2563 gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
2564 gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding);
2565@@ -398,6 +442,6 @@
2566 {
2567 indicator_right_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
2568
2569- dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), INDICATOR_MENUITEM_TYPE, new_indicator_item);
2570- dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), APPLICATION_MENUITEM_TYPE, new_application_item);
2571+ dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), INDICATOR_MENUITEM_TYPE, (DbusmenuClientTypeHandler) new_indicator_item);
2572+ dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), APPLICATION_MENUITEM_TYPE, (DbusmenuClientTypeHandler) new_application_item);
2573 }
2574
2575=== modified file 'Messaging-Menu/src/applet-messaging.c'
2576--- Messaging-Menu/src/applet-messaging.c 2011-04-20 20:46:51 +0000
2577+++ Messaging-Menu/src/applet-messaging.c 2011-10-08 22:23:24 +0000
2578@@ -57,7 +57,7 @@
2579 static void
2580 icon_changed_cb (DBusGProxy * proxy, gboolean hidden, CairoDockModuleInstance *myApplet)
2581 {
2582- //g_print ("%s (hidden : %d)\n", __func__, hidden);
2583+ cd_debug ("%s (hidden : %d)", __func__, hidden);
2584 if (hidden)
2585 {
2586 myIcon->fAlpha = .5;
2587@@ -74,7 +74,7 @@
2588 attention_cb (DBusGProxy * proxy, gboolean dot, GError * error, CairoDockModuleInstance *myApplet)
2589 {
2590 if (error != NULL) {
2591- g_warning("Unable to get attention status: %s", error->message);
2592+ cd_warning ("Unable to get attention status: %s", error->message);
2593 g_error_free(error);
2594 return;
2595 }
2596@@ -87,7 +87,7 @@
2597 icon_cb (DBusGProxy * proxy, gboolean hidden, GError * error, CairoDockModuleInstance *myApplet)
2598 {
2599 if (error != NULL) {
2600- g_warning("Unable to get icon visibility: %s", error->message);
2601+ cd_warning ("Unable to get icon visibility: %s", error->message);
2602 g_error_free(error);
2603 return;
2604 }
2605
2606=== added file 'Messaging-Menu/src/make-dbus-headers.sh'
2607--- Messaging-Menu/src/make-dbus-headers.sh 1970-01-01 00:00:00 +0000
2608+++ Messaging-Menu/src/make-dbus-headers.sh 2011-10-08 22:23:24 +0000
2609@@ -0,0 +1,2 @@
2610+#!/bin/sh
2611+dbus-binding-tool --prefix=_ --mode=glib-client --output=messages-service-client.h messages-service.xml
2612
2613=== removed file 'Messaging-Menu/src/make-dbus-heaers.sh'
2614--- Messaging-Menu/src/make-dbus-heaers.sh 2010-08-10 00:05:57 +0000
2615+++ Messaging-Menu/src/make-dbus-heaers.sh 1970-01-01 00:00:00 +0000
2616@@ -1,2 +0,0 @@
2617-#!/bin/sh
2618-dbus-binding-tool --prefix=_ --mode=glib-client --output=messages-service-client.h messages-service.xml
2619
2620=== modified file 'Messaging-Menu/src/messages-service.xml'
2621--- Messaging-Menu/src/messages-service.xml 2010-08-10 00:05:57 +0000
2622+++ Messaging-Menu/src/messages-service.xml 2011-10-08 22:23:24 +0000
2623@@ -1,17 +1,15 @@
2624 <?xml version="1.0" encoding="UTF-8"?>
2625 <node name="/">
2626- <interface name="org.ayatana.indicator.messages.service">
2627+ <interface name="com.canonical.indicator.messages.service">
2628
2629 <!-- Methods -->
2630- <method name="Watch">
2631- <annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
2632- </method>
2633 <method name="AttentionRequested">
2634 <arg type="b" name="dot" direction="out" />
2635 </method>
2636 <method name="IconShown">
2637 <arg type="b" name="hidden" direction="out" />
2638 </method>
2639+ <method name="ClearAttention" />
2640
2641 <!-- Signals -->
2642 <signal name="AttentionChanged">
2643
2644=== modified file 'Network-Monitor/data/Network-Monitor.conf.in'
2645--- Network-Monitor/data/Network-Monitor.conf.in 2011-08-09 18:08:08 +0000
2646+++ Network-Monitor/data/Network-Monitor.conf.in 2011-10-08 22:23:24 +0000
2647@@ -21,9 +21,12 @@
2648 #{Set to 0 to use the default applet size}
2649 icon size = 0;0
2650
2651-#b Always display the icon, even when the dock is hidden?
2652+#B Always display the icon, even when the dock is hidden?
2653 always visi = false
2654
2655+#C+ Background color to add in this case
2656+bg color = .8;.8;.8;.5
2657+
2658 order=
2659
2660 #F[Applet's Handbook]
2661@@ -60,7 +63,7 @@
2662 #b+ Is detached from the dock
2663 initially detached=false
2664 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
2665-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
2666+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
2667 accessibility=0
2668 #b Should be visible on all desktops?
2669 sticky=true
2670@@ -147,7 +150,7 @@
2671 #X[Gauge;gtk-dialog-info]
2672 frame_gauge=
2673
2674-#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
2675+#h+[@gaugesdir@;gauges;gauges3;wifi] Choose one of the available themes:/
2676 theme = turbo-night-fuel
2677
2678 #X[Graph;gtk-dialog-info]
2679@@ -186,7 +189,7 @@
2680 #X[Gauge;gtk-dialog-info]
2681 frame_gauge=
2682
2683-#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
2684+#h+[@gaugesdir@;gauges;gauges3;wifi] Choose one of the available themes:/
2685 theme = turbo-night-fuel
2686
2687
2688
2689=== modified file 'Network-Monitor/src/applet-connections.c'
2690--- Network-Monitor/src/applet-connections.c 2010-08-10 00:05:57 +0000
2691+++ Network-Monitor/src/applet-connections.c 2011-10-08 22:23:24 +0000
2692@@ -92,7 +92,7 @@
2693 cd_debug ("%d devices\n", paDevices->len);
2694 DBusGProxy *dbus_proxy_Device, *dbus_proxy_Device_prop;
2695 gchar *cDevice;
2696- int i;
2697+ uint i;
2698 for (i = 0; i < paDevices->len; i++)
2699 {
2700 // on recupere le device.
2701@@ -217,7 +217,7 @@
2702
2703 //\_____________ On en choisit une.
2704 gchar *cConnection;
2705- int i;
2706+ uint i;
2707 for (i = 0; i < paConnections->len; i++)
2708 {
2709 cConnection = (gchar *)g_ptr_array_index(paConnections, i);
2710@@ -257,8 +257,8 @@
2711 DBusGProxy *dbus_proxy_ActiveAccessPoint_prop = NULL;
2712 GError *erreur = NULL;
2713
2714- gint j,k;
2715- GValue value = { 0 };
2716+ uint j,k;
2717+ GValue value = G_VALUE_INIT;
2718 GPtrArray *paActiveConnections = NULL;
2719 GPtrArray *paDevices = NULL;
2720 gchar *cActiveConnection, *cDevice, *cAccessPointPath, *cConnection;
2721@@ -267,7 +267,7 @@
2722 //\_____________ On recupere la liste des connexions actives (ce sont les configs tout-en-un de NM qui sont actuellement utilisees).
2723 paActiveConnections = (GPtrArray*) cairo_dock_dbus_get_property_as_boxed (myData.dbus_proxy_NM_prop, "org.freedesktop.NetworkManager", "ActiveConnections");
2724 cd_debug ("%d connections\n", paActiveConnections->len);
2725- for (j=0; j<paActiveConnections->len; j++)
2726+ for (j=0; j < paActiveConnections->len; j++)
2727 {
2728 cActiveConnection = (gchar *)g_ptr_array_index(paActiveConnections,j);
2729 cd_debug ("Network-Monitor : Active Connection path : %s\n", cActiveConnection);
2730@@ -328,7 +328,7 @@
2731 {
2732 GPtrArray *paDevices = g_value_get_boxed (v);
2733 cd_debug (" %d devices\n", paDevices->len);
2734- for (k=0; k<paDevices->len; k++)
2735+ for (k=0; k < paDevices->len; k++)
2736 {
2737 // on recupere le device.
2738 cDevice = (gchar *)g_ptr_array_index(paDevices,k);
2739@@ -595,7 +595,7 @@
2740 {
2741 GByteArray *a = g_value_get_boxed (v);
2742 myData.cESSID = g_new0 (gchar, a->len+1);
2743- for (int i = 0; i < a->len; i ++)
2744+ for (uint i = 0; i < a->len; i ++)
2745 {
2746 myData.cESSID[i] = a->data[i];
2747 }
2748
2749=== modified file 'Network-Monitor/src/applet-draw.c'
2750--- Network-Monitor/src/applet-draw.c 2011-04-20 20:46:51 +0000
2751+++ Network-Monitor/src/applet-draw.c 2011-10-08 22:23:24 +0000
2752@@ -34,7 +34,10 @@
2753 if (myData.iPreviousQuality != myData.iQuality)
2754 {
2755 myData.iPreviousQuality = myData.iQuality;
2756- CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
2757+ if (myConfig.defaultTitle) // has another default name
2758+ CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
2759+ else
2760+ CD_APPLET_SET_NAME_FOR_MY_ICON (myApplet->pModule->pVisitCard->cTitle);
2761 CD_APPLET_SET_QUICK_INFO_ON_MY_ICON ("N/A");
2762 cd_NetworkMonitor_draw_icon_with_effect (WIFI_QUALITY_NO_SIGNAL);
2763
2764
2765=== modified file 'Network-Monitor/src/applet-menu.c'
2766--- Network-Monitor/src/applet-menu.c 2010-08-10 00:05:57 +0000
2767+++ Network-Monitor/src/applet-menu.c 2011-10-08 22:23:24 +0000
2768@@ -32,7 +32,7 @@
2769 gchar *cConnection;
2770 GHashTable *pSettings, *pSubSettings;
2771 GValue *v;
2772- int i;
2773+ uint i;
2774 for (i = 0; i < paConnections->len; i++)
2775 {
2776 cConnection = (gchar *)g_ptr_array_index(paConnections, i);
2777@@ -119,7 +119,7 @@
2778 GList *pConnList = NULL;
2779 //\_____________ On cherche une connection qui ait le meme type (wifi ou filaire), et soit le meme SSID, soit la meme interface.
2780 gchar *cConnection;
2781- int i;
2782+ uint i;
2783 for (i = 0; i < paConnections->len; i++)
2784 {
2785 cConnection = (gchar *)g_ptr_array_index(paConnections, i);
2786@@ -141,22 +141,26 @@
2787 GHashTable *pSettings = g_hash_table_new_full (g_str_hash,
2788 g_str_equal,
2789 g_free,
2790- g_hash_table_destroy);
2791-
2792- GHashTable *pSubSettings = g_hash_table_new_full (g_str_hash,
2793- g_str_equal,
2794- g_free,
2795- g_free);
2796- g_hash_table_insert (pSettings, "connection", pSubSettings);
2797- g_hash_table_insert (pSubSettings, "type", g_strdup ("802-11-wireless"));
2798- g_hash_table_insert (pSettings, "id", g_strdup_printf ("CD - %s", pItemData->cSsid));
2799-
2800- pSubSettings = g_hash_table_new_full (g_str_hash,
2801- g_str_equal,
2802- g_free,
2803- g_free);
2804- g_hash_table_insert (pSubSettings, "ssid", g_strdup (pItemData->cSsid));
2805- g_hash_table_insert (pSubSettings, "mode", g_strdup ("infrastructure"));
2806+ (GDestroyNotify) g_hash_table_destroy); // a table of tables.
2807+ GHashTable *pSubSettings;
2808+
2809+ // connection: type, id, uuid
2810+ pSubSettings = g_hash_table_new_full (g_str_hash,
2811+ g_str_equal,
2812+ g_free,
2813+ g_free);
2814+ g_hash_table_insert (pSettings, g_strdup ("connection"), pSubSettings);
2815+ g_hash_table_insert (pSubSettings, g_strdup ("type"), g_strdup ("802-11-wireless"));
2816+ g_hash_table_insert (pSubSettings, g_strdup ("id"), g_strdup_printf ("CD - %s", pItemData->cSsid));
2817+
2818+ // 802-11-wireless: ssid, mode, seen-bssids
2819+ pSubSettings = g_hash_table_new_full (g_str_hash,
2820+ g_str_equal,
2821+ g_free,
2822+ g_free);
2823+ g_hash_table_insert (pSettings, g_strdup ("802-11-wireless"), pSubSettings);
2824+ g_hash_table_insert (pSubSettings, g_strdup ("ssid"), g_strdup (pItemData->cSsid));
2825+ g_hash_table_insert (pSubSettings, g_strdup ("mode"), g_strdup ("infrastructure"));
2826
2827 // AddConnection
2828 DBusGProxy *dbus_proxy_Settings = cairo_dock_create_new_system_proxy (
2829@@ -191,7 +195,7 @@
2830
2831 //ActivateConnection ( s: service_name, o: connection, o: device, o: specific_object )o
2832 GError *erreur = NULL;
2833- GValue active_connection_path = {0};
2834+ GValue active_connection_path = G_VALUE_INIT;
2835 g_value_init (&active_connection_path, DBUS_TYPE_G_OBJECT_PATH);
2836
2837 gchar *cNewActiveConnectionPath = NULL;
2838@@ -233,7 +237,7 @@
2839 DBusGProxy *dbus_proxy_ConnectionSettings;
2840 GError *erreur = NULL;
2841 GHashTable *pSettingsTable;
2842- int i;
2843+ uint i;
2844 for (i = 0; i < paConnections->len; i++)
2845 {
2846 cConnection = (gchar *)g_ptr_array_index(paConnections, i);
2847@@ -281,13 +285,13 @@
2848 gchar *cAccessPointPath;
2849 GHashTable *hProperties;
2850 GValue *v;
2851- guint iPercent;
2852- gchar *cSsid;
2853+ gint iPercent;
2854+ gchar *cSsid = NULL;
2855 const gchar *cHwAddress;
2856 int iMode, iWirelessCapabilities;
2857 CDMenuItemData *pItemData;
2858 GtkWidget *pHBox;
2859- int i, j;
2860+ uint i, j;
2861 for (i = 0; i < paDevices->len; i++)
2862 {
2863 // on recupere le device.
2864@@ -387,7 +391,7 @@
2865 v = (GValue *)g_hash_table_lookup (hProperties, "Strength");
2866 if (v != NULL && G_VALUE_HOLDS_UCHAR (v))
2867 {
2868- iPercent = (gint) g_value_get_uchar (v);
2869+ iPercent = g_value_get_uchar (v);
2870 }
2871
2872 v = (GValue *)g_hash_table_lookup (hProperties, "Ssid");
2873@@ -398,7 +402,7 @@
2874 }
2875
2876 // on empeche les doublons.
2877- pItemData = g_hash_table_lookup (pSsidTable, cSsid);
2878+ pItemData = (cSsid ? g_hash_table_lookup (pSsidTable, cSsid) : NULL);
2879 if (pItemData != NULL)
2880 {
2881 if (pItemData->iPercent > iPercent)
2882@@ -437,7 +441,7 @@
2883
2884 cd_debug ("%d) %s : %s (%s, %d%%)\n", j, cSsid, cAccessPointPath, cHwAddress, iPercent);
2885
2886- gchar *cImage = NULL;
2887+ const gchar *cImage = NULL;
2888 if (iPercent > 80)
2889 cImage = MY_APPLET_SHARE_DATA_DIR"/link-5.svg";
2890 else if (iPercent > 60)
2891@@ -480,7 +484,7 @@
2892 int n = GPOINTER_TO_INT (pConnList->data);
2893 pItemData->cConnection = g_strdup (g_ptr_array_index (paConnections, n));
2894 }
2895- cairo_dock_add_in_menu_with_stock_and_data (cSsid, cImage, _on_select_access_point, pMenu, pItemData);
2896+ cairo_dock_add_in_menu_with_stock_and_data (cSsid, cImage, (GFunc) _on_select_access_point, pMenu, pItemData);
2897 }
2898 else
2899 {
2900@@ -505,7 +509,7 @@
2901 pItemData->cDevice = g_strdup (cDevice);
2902 pItemData->cAccessPoint = g_strdup (cAccessPointPath);
2903
2904- cairo_dock_add_in_menu_with_stock_and_data (cID, NULL, _on_select_access_point, pSubMenu, GINT_TO_POINTER (n));
2905+ cairo_dock_add_in_menu_with_stock_and_data (cID, NULL, (GFunc) _on_select_access_point, pSubMenu, GINT_TO_POINTER (n));
2906 }
2907 }
2908 }
2909
2910=== modified file 'Network-Monitor/src/applet-notifications.c'
2911--- Network-Monitor/src/applet-notifications.c 2011-04-20 20:46:51 +0000
2912+++ Network-Monitor/src/applet-notifications.c 2011-10-08 22:23:24 +0000
2913@@ -73,7 +73,6 @@
2914 return;
2915 }
2916
2917- gchar *cCommand = NULL;
2918 /*if (g_iDesktopEnv == CAIRO_DOCK_GNOME || g_iDesktopEnv == CAIRO_DOCK_XFCE) {
2919 int iMajor, iMinor, iMicro;
2920 cairo_dock_get_gnome_version (&iMajor, &iMinor, &iMicro);
2921@@ -91,9 +90,7 @@
2922 else if (g_iDesktopEnv == CAIRO_DOCK_KDE) { //Ajouter les lignes de KDE
2923 //cCommand =
2924 }*/
2925- cCommand = "nm-connection-editor"; // network-admin n'est plus present depuis Intrepid, et nm-connection-editor marche aussi sous KDE.
2926-
2927- cairo_dock_launch_command (cCommand);
2928+ cairo_dock_launch_command ("nm-connection-editor"); // network-admin n'est plus present depuis Intrepid, et nm-connection-editor marche aussi sous KDE.
2929 }
2930 CD_APPLET_ON_BUILD_MENU_BEGIN
2931 GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
2932
2933=== modified file 'Network-Monitor/src/applet-wifi.c'
2934--- Network-Monitor/src/applet-wifi.c 2010-08-10 00:05:57 +0000
2935+++ Network-Monitor/src/applet-wifi.c 2011-10-08 22:23:24 +0000
2936@@ -122,7 +122,7 @@
2937 gchar **cInfopipesList = g_strsplit (cResult, "\n", -1);
2938 g_free (cResult);
2939 gchar *cOneInfopipe, *str, *str2;
2940- int i, iMaxValue;
2941+ int i, iMaxValue = 0;
2942 for (i = 0; cInfopipesList[i] != NULL; i ++)
2943 {
2944 cOneInfopipe = cInfopipesList[i];
2945@@ -163,10 +163,9 @@
2946 {
2947 _pick_string ("Access Point", myData.wifi._cAccessPoint);
2948 }
2949-
2950- if (myData.wifi._iQuality == -1) // Link Quality=54/100 Signal level=-76 dBm Noise level=-78 dBm OU Link Quality:5 Signal level:219 Noise level:177
2951+
2952+ if (myData.wifi._iQuality == (uint)-1) // Link Quality=54/100 Signal level=-76 dBm Noise level=-78 dBm OU Link Quality:5 Signal level:219 Noise level:177
2953 {
2954- iMaxValue = 0;
2955 _pick_value ("Link Quality", myData.wifi._iQuality, iMaxValue);
2956 if (iMaxValue != 0) // vieille version, qualite indiquee en %
2957 {
2958
2959=== modified file 'RSSreader/data/RSSreader.conf.in'
2960--- RSSreader/data/RSSreader.conf.in 2011-08-09 18:08:08 +0000
2961+++ RSSreader/data/RSSreader.conf.in 2011-10-08 22:23:24 +0000
2962@@ -60,7 +60,7 @@
2963 #b Is detached from the dock
2964 initially detached=true
2965 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
2966-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
2967+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
2968 accessibility=0
2969 #b Should be visible on all desktops?
2970 sticky=true
2971
2972=== modified file 'Recent-Events/data/Recent-Events.conf.in'
2973--- Recent-Events/data/Recent-Events.conf.in 2011-08-09 18:08:08 +0000
2974+++ Recent-Events/data/Recent-Events.conf.in 2011-10-08 22:23:24 +0000
2975@@ -60,7 +60,7 @@
2976 #b Is detached from the dock
2977 initially detached=false
2978 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
2979-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
2980+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
2981 accessibility=0
2982 #b Should be visible on all desktops?
2983 sticky=true
2984
2985=== modified file 'Recent-Events/src/applet-dialog.c'
2986--- Recent-Events/src/applet-dialog.c 2011-08-09 18:08:08 +0000
2987+++ Recent-Events/src/applet-dialog.c 2011-10-08 22:23:24 +0000
2988@@ -81,13 +81,13 @@
2989 gint64 iTimeStamp;
2990 const gchar *cEventURI;
2991 guint id;
2992- gchar *cName = NULL, *cURI = NULL, *cIconName = NULL, *cPath = NULL;
2993+ gchar *cName = NULL, *cURI = NULL, *cIconName = NULL, *cIconPath, *cPath = NULL;
2994 double fOrder;
2995 int iVolumeID;
2996 gboolean bIsDirectory;
2997 GdkPixbuf *pixbuf;
2998 GtkTreeIter iter;
2999- GHashTable *pHashTable = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
3000+ GHashTable *pHashTable = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL); // used to prevent doubles
3001
3002 //\_____________ parse all the events.
3003 while (zeitgeist_result_set_has_next (pEvents))
3004@@ -121,11 +121,13 @@
3005 else
3006 {
3007 cairo_dock_fm_get_file_info (cEventURI, &cName, &cURI, &cIconName, &bIsDirectory, &iVolumeID, &fOrder, CAIRO_DOCK_FM_SORT_BY_DATE);
3008- g_free (cName);
3009- g_free (cURI);
3010 }
3011 if (cIconName != NULL)
3012- pixbuf = gdk_pixbuf_new_from_file_at_size (cIconName, 32, 32, NULL);
3013+ {
3014+ cIconPath = cairo_dock_search_icon_s_path (cIconName);
3015+ pixbuf = gdk_pixbuf_new_from_file_at_size (cIconPath, 32, 32, NULL);
3016+ g_free (cIconPath);
3017+ }
3018 else
3019 pixbuf = NULL;
3020
3021@@ -166,7 +168,13 @@
3022 CD_MODEL_ICON, pixbuf,
3023 CD_MODEL_DATE, iTimeStamp,
3024 CD_MODEL_ID, id, -1);
3025+
3026 g_free (cIconName);
3027+ cIconName = NULL;
3028+ g_free (cName);
3029+ cName = NULL;
3030+ g_free (cURI);
3031+ cURI = NULL;
3032 if (pixbuf)
3033 g_object_unref (pixbuf);
3034 g_free (cPath);
3035@@ -467,11 +475,11 @@
3036 // establish the connection to Zeitgesit.
3037 if (myData.pLog == NULL) // first search.
3038 {
3039- g_print ("first search\n");
3040+ cd_debug ("first search");
3041 myData.pLog = zeitgeist_log_new (); // may launch the Zeitgeist daemon if it's not yet running.
3042 if (! zeitgeist_log_is_connected (myData.pLog)) // the connection may not be immediate (even if the daemon is already running), in this case come back in 1s.
3043 {
3044- g_print ("come back in 1s...\n");
3045+ cd_debug ("come back in 1s...");
3046 g_timeout_add_seconds (1, _show_dialog_delayed, NULL);
3047 return;
3048 }
3049
3050=== modified file 'Recent-Events/src/applet-notifications.c'
3051--- Recent-Events/src/applet-notifications.c 2011-04-20 20:46:51 +0000
3052+++ Recent-Events/src/applet-notifications.c 2011-10-08 22:23:24 +0000
3053@@ -101,7 +101,7 @@
3054 gint i,n;
3055 GtkWidget *pMenuItem = NULL, *pSubMenu = NULL;
3056 const gchar *cEventURI;
3057- gchar *cName = NULL, *cURI = NULL, *cIconName = NULL;
3058+ gchar *cName = NULL, *cURI = NULL, *cIconName = NULL, *cIconPath;
3059 gchar *cCommand;
3060 double fOrder;
3061 int iVolumeID;
3062@@ -119,16 +119,21 @@
3063 cd_debug (" + %s", cEventURI);
3064
3065 cairo_dock_fm_get_file_info (cEventURI, &cName, &cURI, &cIconName, &bIsDirectory, &iVolumeID, &fOrder, 0);
3066- //g_free (cName);
3067- //g_free (cURI);
3068
3069 gchar *cPath = g_filename_from_uri (cEventURI, NULL, NULL); // some programs dont support URI, so we feed them with path.
3070 cCommand = g_strdup_printf ("%s \"%s\"", pIcon->cCommand, cPath);
3071 g_free (cPath);
3072 s_pEventList = g_list_prepend (s_pEventList, cCommand);
3073
3074- CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (zeitgeist_subject_get_text (subject), cIconName, _open_file, pSubMenu, cCommand);
3075- //g_free (cIconName);
3076+ cIconPath = cairo_dock_search_icon_s_path (cIconName);
3077+ CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (zeitgeist_subject_get_text (subject), cIconPath, _open_file, pSubMenu, cCommand);
3078+ g_free (cIconPath);
3079+ g_free (cIconName);
3080+ cIconName = NULL;
3081+ g_free (cName);
3082+ cName = NULL;
3083+ g_free (cURI);
3084+ cURI = NULL;
3085 }
3086 }
3087 if (pSubMenu)
3088
3089=== modified file 'Recent-Events/src/applet-search.c'
3090--- Recent-Events/src/applet-search.c 2011-08-09 18:08:08 +0000
3091+++ Recent-Events/src/applet-search.c 2011-10-08 22:23:24 +0000
3092@@ -417,7 +417,6 @@
3093 if (iNbDays > 0)
3094 {
3095 // find events IDs of less than 'iNbDays' days
3096- GArray *event_ids;
3097 time_t t = (time_t) time (NULL);
3098 gint64 now = t * 1e3; // msec
3099 ZeitgeistTimeRange *time_range = zeitgeist_time_range_new (now - iNbDays*24*3600*1e3, now);
3100
3101=== modified file 'Remote-Control/src/applet-icon-finder.c'
3102--- Remote-Control/src/applet-icon-finder.c 2011-04-20 20:46:51 +0000
3103+++ Remote-Control/src/applet-icon-finder.c 2011-10-08 22:23:24 +0000
3104@@ -215,7 +215,7 @@
3105 }
3106 myData.iMouseX = x;
3107 myData.iMouseY = y;
3108- cairo_dock_request_icon_animation (pIcon, pDock, myConfig.cIconAnimation, 1e6); // interrompt l'animation de "mouse over".
3109+ cairo_dock_request_icon_animation (pIcon, CAIRO_CONTAINER (pDock), myConfig.cIconAnimation, 1e6); // interrompt l'animation de "mouse over".
3110 cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
3111 //if (myAccessibility.bShowSubDockOnClick)
3112 // cairo_dock_show_subdock (pIcon, pDock, FALSE);
3113
3114=== modified file 'Scooby-Do/src/applet-draw.c'
3115--- Scooby-Do/src/applet-draw.c 2011-04-20 20:46:51 +0000
3116+++ Scooby-Do/src/applet-draw.c 2011-10-08 22:23:24 +0000
3117@@ -45,7 +45,7 @@
3118 if (pIcon->pIconBuffer == NULL && pIcon->iIconTexture == 0) // icone pas encore chargee.
3119 continue;
3120 pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
3121- cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
3122+ cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
3123 if (iHeight != 0)
3124 {
3125 fZoom = (double) g_pMainDock->container.iHeight/2 / iHeight;
3126@@ -71,7 +71,7 @@
3127 if (pIcon->pIconBuffer == NULL && pIcon->iIconTexture == 0) // icone pas encore chargee.
3128 continue;
3129 pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
3130- cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
3131+ cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
3132 if (iHeight != 0)
3133 {
3134 fZoom = (double) g_pMainDock->container.iHeight/2 / iHeight;
3135@@ -161,7 +161,7 @@
3136 if (pIcon->pIconBuffer == NULL) // icone pas encore chargee.
3137 continue;
3138 pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
3139- cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
3140+ cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
3141 fZoom = fIconScale * pMainDock->container.iHeight/2 / iHeight * (myData.pCurrentMatchingElement == ic ? 1. : 1.);
3142 cairo_save (pCairoContext);
3143
3144@@ -346,7 +346,7 @@
3145 if (pIcon->iIconTexture == 0) // icone pas encore chargee.
3146 continue;
3147 pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
3148- cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
3149+ cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
3150 fZoom = (double) pMainDock->container.iHeight/2 / iHeight * (myData.pCurrentMatchingElement == ic ? 1. : 1.);
3151 glPushMatrix ();
3152
3153
3154=== modified file 'Scooby-Do/src/applet-icon-finder.c'
3155--- Scooby-Do/src/applet-icon-finder.c 2010-09-18 14:20:27 +0000
3156+++ Scooby-Do/src/applet-icon-finder.c 2011-10-08 22:23:24 +0000
3157@@ -159,7 +159,7 @@
3158 myData.iPreviousMatchingOffset = myData.iCurrentMatchingOffset; // on part du point courant.
3159 CairoDock *pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
3160 int iWidth, iHeight;
3161- cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
3162+ cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
3163 if (iHeight != 0)
3164 {
3165 double fZoom = (double) g_pMainDock->container.iHeight/2 / iHeight;
3166
3167=== modified file 'Status-Notifier/data/Status-Notifier.conf.in'
3168--- Status-Notifier/data/Status-Notifier.conf.in 2011-08-09 18:08:08 +0000
3169+++ Status-Notifier/data/Status-Notifier.conf.in 2011-10-08 22:23:24 +0000
3170@@ -60,7 +60,7 @@
3171 #b Is detached from the dock
3172 initially detached=false
3173 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
3174-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
3175+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
3176 accessibility=0
3177 #b Should be visible on all desktops?
3178 sticky=true
3179
3180=== modified file 'Status-Notifier/src/CMakeLists.txt'
3181--- Status-Notifier/src/CMakeLists.txt 2011-08-09 18:08:08 +0000
3182+++ Status-Notifier/src/CMakeLists.txt 2011-10-08 22:23:24 +0000
3183@@ -25,6 +25,7 @@
3184 add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
3185 add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
3186 add_definitions (-DINDICATOR_OLD_NAMES=${INDICATOR_OLD_NAMES})
3187+add_definitions (-DINDICATOR_APPLICATIONADDED_HAS_HINT=${INDICATOR_APPLICATIONADDED_HAS_HINT})
3188 add_definitions (-DCD_PLUGINS_DIR="${pluginsdir}")
3189
3190 include_directories (
3191
3192=== modified file 'Status-Notifier/src/applet-host-ias.c'
3193--- Status-Notifier/src/applet-host-ias.c 2011-08-09 18:08:08 +0000
3194+++ Status-Notifier/src/applet-host-ias.c 2011-10-08 22:23:24 +0000
3195@@ -94,7 +94,12 @@
3196 data2);
3197 }
3198 #else // Natty
3199-static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING (GClosure *closure,
3200+#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3201+static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING (
3202+#else
3203+static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING (
3204+#endif
3205+ GClosure *closure,
3206 GValue *return_value G_GNUC_UNUSED,
3207 guint n_param_values,
3208 const GValue *param_values,
3209@@ -102,7 +107,11 @@
3210 gpointer marshal_data)
3211 {
3212 //cd_debug ("=== %s ()\n", __func__);
3213+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3214+ typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING) (
3215+ #else
3216 typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING) (
3217+ #endif
3218 gpointer data1,
3219 gchar *arg_1,
3220 gint arg_2,
3221@@ -112,11 +121,23 @@
3222 gchar *arg_6,
3223 gchar *arg_7,
3224 gchar *arg_8,
3225+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3226+ gchar *arg_9,
3227+ #endif
3228 gpointer data2);
3229+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3230+ register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING callback;
3231+ #else
3232 register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING callback;
3233+ #endif
3234 register GCClosure *cc = (GCClosure*) closure;
3235 register gpointer data1, data2;
3236- g_return_if_fail (n_param_values == 9); // return_value est NULL ici, car la callback ne renvoit rien.
3237+ // return_value est NULL ici, car la callback ne renvoit rien.
3238+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3239+ g_return_if_fail (n_param_values == 10);
3240+ #else
3241+ g_return_if_fail (n_param_values == 9);
3242+ #endif
3243
3244 if (G_CCLOSURE_SWAP_DATA (closure))
3245 {
3246@@ -128,7 +149,12 @@
3247 data1 = g_value_peek_pointer (param_values + 0);
3248 data2 = closure->data;
3249 }
3250- callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
3251+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3252+ callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING)
3253+ #else
3254+ callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING)
3255+ #endif
3256+ (marshal_data ? marshal_data : cc->callback);
3257
3258 callback (data1,
3259 (char*) g_value_get_string (param_values + 1),
3260@@ -139,6 +165,9 @@
3261 (char*) g_value_get_string (param_values + 6),
3262 (char*) g_value_get_string (param_values + 7),
3263 (char*) g_value_get_string (param_values + 8),
3264+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3265+ (char*) g_value_get_string (param_values + 9),
3266+ #endif
3267 data2);
3268 }
3269 #endif
3270@@ -150,6 +179,9 @@
3271 static void on_new_application (DBusGProxy *proxy_watcher, const gchar *cIconName, gint iPosition, const gchar *cAdress, const gchar *cObjectPath, const gchar *cIconThemePath, const gchar *cLabel, const gchar *cLabelGuide,
3272 #if (INDICATOR_OLD_NAMES == 0) // Natty
3273 const gchar *cAccessbleDesc, // WTF is this new param ??
3274+#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3275+const gchar *cHint,
3276+#endif
3277 #endif
3278 CairoDockModuleInstance *myApplet)
3279 {
3280@@ -157,6 +189,9 @@
3281 cd_debug ("=== %s (%s, %s, %s, %s, %d)", __func__, cAdress, cObjectPath, cIconName, cIconThemePath, iPosition);
3282 #if (INDICATOR_OLD_NAMES == 0) // Natty
3283 cd_debug (" %s", cAccessbleDesc);
3284+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3285+ cd_debug (" %s", cHint);
3286+ #endif
3287 #endif
3288
3289 // position +1 for items placed after this one.
3290@@ -275,7 +310,7 @@
3291 if (v && G_VALUE_HOLDS_BOXED (v))
3292 cObjectPath = (gchar*)g_value_get_boxed (v);
3293
3294- /*g_print ("=== cObjectPath : %s\n", cObjectPath);
3295+ /*cd_debug ("=== cObjectPath : %s", cObjectPath);
3296 if (cObjectPath != NULL && strncmp (cObjectPath, CD_INDICATOR_APPLICATION_ITEM_OBJ, strlen (CD_INDICATOR_APPLICATION_ITEM_OBJ)) == 0)
3297 {
3298 gchar *str = strrchr (cObjectPath, '/'); // I think this is because this path is actually the menu path, and fortunately it's just under the item object's path.
3299@@ -353,14 +388,19 @@
3300 dbus_g_object_register_marshaller(_cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING,
3301 G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
3302 #else // Natty
3303- dbus_g_object_register_marshaller(_cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING,
3304+ dbus_g_object_register_marshaller(
3305+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3306+ _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING,
3307+ #else
3308+ _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING,
3309+ #endif
3310 G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING,
3311- #if (INDICATOR_OLD_NAMES != 0) // Maverick
3312- G_TYPE_STRING, // dbusobject
3313- #else // Natty
3314 DBUS_TYPE_G_OBJECT_PATH, // dbusobject
3315+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
3316+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3317+ G_TYPE_STRING,
3318 #endif
3319- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
3320+ G_TYPE_INVALID);
3321 #endif
3322 dbus_g_proxy_add_signal(myData.pProxyIndicatorApplicationService, "ApplicationAdded",
3323 G_TYPE_STRING, // iconname
3324@@ -376,6 +416,9 @@
3325 G_TYPE_STRING, // labelguide
3326 #if (INDICATOR_OLD_NAMES == 0) // Natty
3327 G_TYPE_STRING, // accessibledesc
3328+ #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
3329+ G_TYPE_STRING, // hint => only with indicator-0.4 (Oneiric)
3330+ #endif
3331 #endif
3332 G_TYPE_INVALID);
3333 dbus_g_proxy_connect_signal(myData.pProxyIndicatorApplicationService, "ApplicationAdded",
3334@@ -429,7 +472,7 @@
3335 }
3336 CD_APPLET_LEAVE ();
3337 }
3338-static void _on_ias_owner_changed (gboolean bOwned, gpointer data)
3339+static void _on_ias_owner_changed (const gchar *cName, gboolean bOwned, gpointer data)
3340 {
3341 CD_APPLET_ENTER;
3342 cd_debug ("=== Indicator Applications Service is on the bus (%d)", bOwned);
3343@@ -475,7 +518,7 @@
3344 // if present, set up proxy, else try to start the service.
3345 if (bPresent)
3346 {
3347- _on_ias_owner_changed (TRUE, NULL);
3348+ _on_ias_owner_changed (CD_INDICATOR_APPLICATION_ADDR, TRUE, NULL);
3349 }
3350 else // not present, maybe the service is not started => try starting it.
3351 {
3352@@ -519,5 +562,5 @@
3353 }
3354
3355 cairo_dock_stop_watching_dbus_name_owner (CD_INDICATOR_APPLICATION_ADDR,
3356- (CairoDockOnAppliPresentOnDbus) _on_detect_ias);
3357+ (CairoDockDbusNameOwnerChangedFunc) _on_ias_owner_changed);
3358 }
3359
3360=== modified file 'Status-Notifier/src/applet-host-kde.c'
3361--- Status-Notifier/src/applet-host-kde.c 2011-08-09 18:08:08 +0000
3362+++ Status-Notifier/src/applet-host-kde.c 2011-10-08 22:23:24 +0000
3363@@ -220,7 +220,7 @@
3364 }
3365 CD_APPLET_LEAVE ();
3366 }
3367-static void _on_watcher_owner_changed (gboolean bOwned, gpointer data)
3368+static void _on_watcher_owner_changed (const gchar *cName, gboolean bOwned, gpointer data)
3369 {
3370 cd_debug ("=== Watcher is on the bus (%d)", bOwned);
3371 CD_APPLET_ENTER;
3372@@ -283,7 +283,7 @@
3373 // if present, set up proxy.
3374 if (bPresent)
3375 {
3376- _on_watcher_owner_changed (TRUE, NULL);
3377+ _on_watcher_owner_changed (CD_STATUS_NOTIFIER_WATCHER_ADDR, TRUE, NULL);
3378 }
3379 else if (myConfig.bCompactMode) // in compact mode, draw a 'failed' image to not have an empty icon.
3380 {
3381@@ -321,5 +321,5 @@
3382 s_pDetectWatcherCall = NULL;
3383 }
3384 cairo_dock_stop_watching_dbus_name_owner (CD_STATUS_NOTIFIER_WATCHER_ADDR,
3385- (CairoDockOnAppliPresentOnDbus) _on_detect_watcher);
3386+ (CairoDockDbusNameOwnerChangedFunc) _on_watcher_owner_changed);
3387 }
3388
3389=== modified file 'Status-Notifier/src/applet-item.c'
3390--- Status-Notifier/src/applet-item.c 2011-08-09 18:08:08 +0000
3391+++ Status-Notifier/src/applet-item.c 2011-10-08 22:23:24 +0000
3392@@ -269,7 +269,7 @@
3393
3394 if (pItem->cOverlayIconName != NULL)
3395 {
3396- CairoEmblem *pEmblem = cairo_dock_make_emblem (pItem->cOverlayIconName, pIcon, CAIRO_CONTAINER (myIcon->pSubDock));
3397+ CairoEmblem *pEmblem = cairo_dock_make_emblem (pItem->cOverlayIconName, pIcon);
3398 cairo_dock_set_emblem_position (pEmblem, CAIRO_DOCK_EMBLEM_MIDDLE);
3399 cairo_dock_draw_emblem_on_icon (pEmblem, pIcon, CAIRO_CONTAINER (myIcon->pSubDock));
3400 cairo_dock_free_emblem (pEmblem);
3401
3402=== modified file 'System-Monitor/data/System-Monitor.conf.in'
3403--- System-Monitor/data/System-Monitor.conf.in 2011-08-09 18:08:08 +0000
3404+++ System-Monitor/data/System-Monitor.conf.in 2011-10-08 22:23:24 +0000
3405@@ -20,9 +20,12 @@
3406 #{Set to 0 to use the default applet size}
3407 icon size = 0;0
3408
3409-#b Always display the icon, even when the dock is hidden?
3410+#B Always display the icon, even when the dock is hidden?
3411 always visi = false
3412
3413+#C+ Background color to add in this case
3414+bg color = .8;.8;.8;.5
3415+
3416 order=
3417
3418 #F[Applet's Handbook]
3419@@ -59,7 +62,7 @@
3420 #b Is detached from the dock
3421 initially detached=false
3422 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
3423-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
3424+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
3425 accessibility=0
3426 #b Should be visible on all desktops?
3427 sticky=true
3428@@ -111,9 +114,11 @@
3429 #X[Gauge;gtk-dialog-info]
3430 frame_gauge=
3431
3432-#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
3433+#h+[@gaugesdir@;gauges;gauges3;system] Choose one of the available themes:/
3434 theme = Turbo-night-fuel
3435
3436+#l+[No;With dock orientation;Yes] Rotate applet theme :
3437+rotate theme = No
3438
3439 #X[Graph;gtk-dialog-info]
3440 frame_graph=
3441
3442=== modified file 'System-Monitor/src/applet-config.c'
3443--- System-Monitor/src/applet-config.c 2011-04-20 20:46:51 +0000
3444+++ System-Monitor/src/applet-config.c 2011-10-08 22:23:24 +0000
3445@@ -45,6 +45,7 @@
3446 myConfig.iDisplayType = CD_CONFIG_GET_INTEGER ("Configuration", "renderer");
3447
3448 myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
3449+ myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
3450
3451 myConfig.iGraphType = CD_CONFIG_GET_INTEGER ("Configuration", "graphic type");
3452 myConfig.bMixGraph = CD_CONFIG_GET_BOOLEAN ("Configuration", "mix graph");
3453
3454=== modified file 'System-Monitor/src/applet-init.c'
3455--- System-Monitor/src/applet-init.c 2011-04-20 20:46:51 +0000
3456+++ System-Monitor/src/applet-init.c 2011-10-08 22:23:24 +0000
3457@@ -66,7 +66,8 @@
3458 memset (&attr, 0, sizeof (CairoGaugeAttribute));
3459 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
3460 pRenderAttr->cModelName = "gauge";
3461- attr.cThemePath = myConfig.cGThemePath;
3462+ pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
3463+ attr.cThemePath = myConfig.cGThemePath;
3464 }
3465 else if (myConfig.iDisplayType == CD_SYSMONITOR_GRAPH)
3466 {
3467@@ -74,10 +75,10 @@
3468 memset (&attr, 0, sizeof (CairoGraphAttribute));
3469 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
3470 pRenderAttr->cModelName = "graph";
3471- pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidht peut etre <= 1 en mode desklet au chargement.
3472- //g_print ("pRenderAttr->iMemorySize : %d\n", pRenderAttr->iMemorySize);
3473+ int w, h;
3474+ CD_APPLET_GET_MY_ICON_EXTENT (&w, &h);
3475+ pRenderAttr->iMemorySize = (w > 1 ? w : 32); // fWidth peut etre <= 1 en mode desklet au chargement.
3476 attr.iType = myConfig.iGraphType;
3477- attr.iRadius = 10;
3478 attr.bMixGraphs = myConfig.bMixGraph;
3479 double fHighColor[CD_SYSMONITOR_NB_MAX_VALUES*3];
3480 double fLowColor[CD_SYSMONITOR_NB_MAX_VALUES*3];
3481@@ -193,7 +194,10 @@
3482 CD_APPLET_SET_QUICK_INFO_ON_MY_ICON (NULL);
3483 if (myConfig.iInfoDisplay != CAIRO_DOCK_INFO_ON_LABEL)
3484 {
3485- CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
3486+ if (myConfig.defaultTitle) // has another default name
3487+ CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
3488+ else
3489+ CD_APPLET_SET_NAME_FOR_MY_ICON (myApplet->pModule->pVisitCard->cTitle);
3490 }
3491
3492 myData.bAcquisitionOK = TRUE;
3493
3494=== modified file 'System-Monitor/src/applet-monitor.c'
3495--- System-Monitor/src/applet-monitor.c 2011-08-09 18:08:08 +0000
3496+++ System-Monitor/src/applet-monitor.c 2011-10-08 22:23:24 +0000
3497@@ -78,7 +78,12 @@
3498 cd_warning ("One or more datas couldn't be retrieved");
3499 CD_APPLET_SET_QUICK_INFO_ON_MY_ICON ("N/A"); // plus discret qu'une bulle de dialogue.
3500 if (myConfig.iInfoDisplay == CAIRO_DOCK_INFO_ON_LABEL)
3501- CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
3502+ {
3503+ if (myConfig.defaultTitle) // has another default name
3504+ CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
3505+ else
3506+ CD_APPLET_SET_NAME_FOR_MY_ICON (myApplet->pModule->pVisitCard->cTitle);
3507+ }
3508 memset (s_fValues, 0, sizeof (s_fValues));
3509 CD_APPLET_RENDER_NEW_DATA_ON_MY_ICON (s_fValues);
3510 }
3511
3512=== modified file 'System-Monitor/src/applet-sensors.c'
3513--- System-Monitor/src/applet-sensors.c 2011-04-20 20:46:51 +0000
3514+++ System-Monitor/src/applet-sensors.c 2011-10-08 22:23:24 +0000
3515@@ -214,7 +214,7 @@
3516 break;
3517 val = get_value (chip, sf); // rpm
3518 if (val == 0)
3519- return;
3520+ break;
3521
3522 // alarm
3523 sf = sensors_get_subfeature (chip, feature,
3524@@ -383,7 +383,7 @@
3525 break;
3526 val = get_value (chip, sf); // rpm
3527 if (val == 0)
3528- return;
3529+ break;
3530
3531 // alarm
3532 sf = sensors_get_subfeature (chip, feature,
3533
3534=== modified file 'System-Monitor/src/applet-struct.h'
3535--- System-Monitor/src/applet-struct.h 2011-04-20 20:46:51 +0000
3536+++ System-Monitor/src/applet-struct.h 2011-10-08 22:23:24 +0000
3537@@ -80,6 +80,7 @@
3538 gint iAlertLimit;
3539 gboolean bAlert;
3540 gboolean bAlertSound;
3541+ RendererRotateTheme iRotateTheme;
3542 } ;
3543
3544 typedef struct {
3545
3546=== modified file 'Toons/data/Toons.conf.in'
3547--- Toons/data/Toons.conf.in 2011-08-09 18:08:08 +0000
3548+++ Toons/data/Toons.conf.in 2011-10-08 22:23:24 +0000
3549@@ -20,9 +20,12 @@
3550 #{Set to 0 to use the default applet size}
3551 icon size = 0;0
3552
3553-#b Always display the icon, even when the dock is hidden?
3554+#B Always display the icon, even when the dock is hidden?
3555 always visi = false
3556
3557+#C+ Background color to add in this case
3558+bg color = .8;.8;.8;.5
3559+
3560 order=
3561
3562 #F[Applet's Handbook]
3563@@ -60,7 +63,7 @@
3564 #b Is detached from the dock
3565 initially detached=false
3566 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
3567-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
3568+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
3569 accessibility=0
3570 #b Should be visible on all desktops?
3571 sticky=true
3572
3573=== modified file 'Xgamma/data/Xgamma.conf.in'
3574--- Xgamma/data/Xgamma.conf.in 2011-08-09 18:08:08 +0000
3575+++ Xgamma/data/Xgamma.conf.in 2011-10-08 22:23:24 +0000
3576@@ -60,7 +60,7 @@
3577 #b Is detached from the dock
3578 initially detached=false
3579 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
3580-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
3581+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
3582 accessibility=0
3583 #b Should be visible on all desktops?
3584 sticky=true
3585
3586=== modified file 'alsaMixer/data/AlsaMixer.conf.in'
3587--- alsaMixer/data/AlsaMixer.conf.in 2011-08-09 18:08:08 +0000
3588+++ alsaMixer/data/AlsaMixer.conf.in 2011-10-08 22:23:24 +0000
3589@@ -59,7 +59,7 @@
3590 #b Is detached from the dock
3591 initially detached=false
3592 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
3593-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
3594+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
3595 accessibility=0
3596 #b Should be visible on all desktops?
3597 sticky=true
3598@@ -140,17 +140,29 @@
3599 #l[No;On label;On icon] Display volume :
3600 display volume = 1
3601
3602-#l+[None;Zoom;Transparency;Draw Bar] Effect to apply to the icon when adjusting volume:
3603+#v
3604+sep_disp_vol =
3605+
3606+#Y+[None;0;0;Zoom;1;2;Transparency;1;2;Draw Bar;1;2;Gauge;3;2] Effect to apply to the icon when adjusting volume:
3607 effect = 3
3608
3609 #S+ Default icon:
3610 #{Leave empty to use the default one.}
3611 default icon =
3612
3613+#S+ Mute icon:
3614+#{Leave empty to use the default one.}
3615+mute icon =
3616+
3617+#h+[@gaugesdir@;gauges;gauges3;sound] Choose one of the available themes:/
3618+theme = Turbo-night-fuel
3619+
3620+#l+[No;With dock orientation;Yes] Rotate applet theme :
3621+rotate theme = No
3622+
3623+#v
3624+sep_disp =
3625+
3626 #S+ Broken icon:
3627 #{Leave empty to use the default one.}
3628 broken icon =
3629-
3630-#S+ Mute icon:
3631-#{Leave empty to use the default one.}
3632-mute icon =
3633
3634=== modified file 'alsaMixer/src/applet-config.c'
3635--- alsaMixer/src/applet-config.c 2011-04-20 20:46:51 +0000
3636+++ alsaMixer/src/applet-config.c 2011-10-08 22:23:24 +0000
3637@@ -60,6 +60,12 @@
3638
3639 myConfig.iVolumeEffect = CD_CONFIG_GET_INTEGER ("Configuration", "effect");
3640
3641+ if (myConfig.iVolumeEffect == VOLUME_EFFECT_GAUGE)
3642+ {
3643+ myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
3644+ myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
3645+ }
3646+
3647 myConfig.cDefaultIcon = CD_CONFIG_GET_STRING ("Configuration", "default icon");
3648 myConfig.cBrokenIcon = CD_CONFIG_GET_STRING ("Configuration", "broken icon");
3649 myConfig.cMuteIcon = CD_CONFIG_GET_STRING ("Configuration", "mute icon");
3650@@ -77,6 +83,7 @@
3651 g_free (myConfig.cDefaultIcon);
3652 g_free (myConfig.cBrokenIcon);
3653 g_free (myConfig.cMuteIcon);
3654+ g_free (myConfig.cGThemePath);
3655 CD_APPLET_RESET_CONFIG_END
3656
3657
3658@@ -88,7 +95,8 @@
3659 }
3660 mixer_stop ();
3661 cairo_surface_destroy (myData.pSurface);
3662- cairo_surface_destroy (myData.pMuteSurface);
3663+ if (myData.pMuteSurface)
3664+ cairo_surface_destroy (myData.pMuteSurface);
3665 cairo_dock_dialog_unreference (myData.pDialog);
3666 g_free (myData.cErrorMessage);
3667 g_free (myData.mixer_card_name);
3668
3669=== modified file 'alsaMixer/src/applet-draw.c'
3670--- alsaMixer/src/applet-draw.c 2010-02-14 00:51:22 +0000
3671+++ alsaMixer/src/applet-draw.c 2011-10-08 22:23:24 +0000
3672@@ -26,6 +26,8 @@
3673 #include "applet-mixer.h"
3674 #include "applet-draw.h"
3675
3676+static void _load_mute_surface (void);
3677+
3678
3679 int mixer_element_update_with_event (snd_mixer_elem_t *elem, unsigned int mask)
3680 {
3681@@ -62,7 +64,21 @@
3682 break;
3683 }
3684
3685- cairo_surface_t *pSurface = (myData.bIsMute ? myData.pMuteSurface : myData.pSurface);
3686+
3687+ cairo_surface_t *pSurface = NULL;
3688+ if (myConfig.iVolumeEffect != VOLUME_EFFECT_GAUGE)
3689+ {
3690+ if (myData.bIsMute)
3691+ {
3692+ if (myData.pMuteSurface == NULL)
3693+ _load_mute_surface ();
3694+ pSurface = myData.pMuteSurface;
3695+ }
3696+ else
3697+ {
3698+ pSurface = myData.pSurface;
3699+ }
3700+ }
3701
3702 switch (myConfig.iVolumeEffect)
3703 {
3704@@ -86,6 +102,18 @@
3705 bNeedRedraw = FALSE;
3706 break;
3707
3708+ case VOLUME_EFFECT_GAUGE :
3709+ {
3710+ double fPercent;
3711+ if (myData.bIsMute)
3712+ fPercent = CAIRO_DATA_RENDERER_UNDEF_VALUE;
3713+ else
3714+ fPercent = (double) myData.iCurrentVolume / 100.;
3715+ CD_APPLET_RENDER_NEW_DATA_ON_MY_ICON (&fPercent);
3716+ bNeedRedraw = FALSE;
3717+ }
3718+ break;
3719+
3720 default :
3721 break;
3722 }
3723@@ -99,7 +127,6 @@
3724 }
3725
3726 CD_APPLET_LEAVE(0);
3727- //return 0;
3728 }
3729
3730
3731@@ -119,3 +146,56 @@
3732 {
3733 CD_APPLET_SET_SURFACE_ON_MY_ICON_WITH_BAR (pSurface, myData.iCurrentVolume * .01);
3734 }
3735+
3736+
3737+void mixer_load_surfaces (void)
3738+{
3739+ if (myData.pSurface != NULL)
3740+ {
3741+ cairo_surface_destroy (myData.pSurface);
3742+ myData.pSurface = NULL;
3743+ }
3744+
3745+ if (myConfig.cDefaultIcon != NULL)
3746+ {
3747+ gchar *cImagePath = cairo_dock_search_icon_s_path (myConfig.cDefaultIcon);
3748+ if (cImagePath == NULL)
3749+ cImagePath = cairo_dock_search_image_s_path (myConfig.cDefaultIcon);
3750+ if (cImagePath != NULL)
3751+ {
3752+ myData.pSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (cImagePath);
3753+ g_free (cImagePath);
3754+ }
3755+ }
3756+
3757+ if (myData.pSurface == NULL)
3758+ {
3759+ myData.pSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (MY_APPLET_SHARE_DATA_DIR"/default.svg");
3760+ }
3761+
3762+ if (myData.pMuteSurface != NULL)
3763+ {
3764+ cairo_surface_destroy (myData.pMuteSurface);
3765+ myData.pMuteSurface = NULL;
3766+ } // don't load the mute surface now, as we often won't even need it in the session. we'll load it on demand.
3767+}
3768+
3769+static void _load_mute_surface (void)
3770+{
3771+ if (myConfig.cMuteIcon != NULL)
3772+ {
3773+ gchar *cImagePath = cairo_dock_search_icon_s_path (myConfig.cMuteIcon);
3774+ if (cImagePath == NULL)
3775+ cImagePath = cairo_dock_search_image_s_path (myConfig.cMuteIcon);
3776+ if (cImagePath != NULL)
3777+ {
3778+ myData.pMuteSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (cImagePath);
3779+ g_free (cImagePath);
3780+ }
3781+ }
3782+
3783+ if (myData.pMuteSurface == NULL)
3784+ {
3785+ myData.pMuteSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (MY_APPLET_SHARE_DATA_DIR"/mute.svg");
3786+ }
3787+}
3788
3789=== modified file 'alsaMixer/src/applet-draw.h'
3790--- alsaMixer/src/applet-draw.h 2009-08-26 21:07:39 +0000
3791+++ alsaMixer/src/applet-draw.h 2011-10-08 22:23:24 +0000
3792@@ -17,7 +17,6 @@
3793 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3794 */
3795
3796-
3797 #ifndef __APPLET_DRAW__
3798 #define __APPLET_DRAW__
3799
3800@@ -33,5 +32,7 @@
3801
3802 void mixer_draw_bar (cairo_surface_t *pSurface);
3803
3804+void mixer_load_surfaces (void);
3805+
3806
3807 #endif
3808
3809=== modified file 'alsaMixer/src/applet-init.c'
3810--- alsaMixer/src/applet-init.c 2011-08-09 18:08:08 +0000
3811+++ alsaMixer/src/applet-init.c 2011-10-08 22:23:24 +0000
3812@@ -45,47 +45,11 @@
3813 CD_APPLET_DEFINE_END
3814
3815
3816-static void _load_surfaces (void)
3817-{
3818- GString *sImagePath = g_string_new ("");
3819-
3820- if (myData.pSurface != NULL)
3821- cairo_surface_destroy (myData.pSurface);
3822- if (myConfig.cDefaultIcon != NULL)
3823- {
3824- gchar *cUserImagePath = cairo_dock_generate_file_path (myConfig.cDefaultIcon);
3825- myData.pSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (cUserImagePath);
3826- g_free (cUserImagePath);
3827- }
3828- else
3829- {
3830- g_string_printf (sImagePath, "%s/default.svg", MY_APPLET_SHARE_DATA_DIR);
3831- myData.pSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (sImagePath->str);
3832- }
3833-
3834- if (myData.pMuteSurface != NULL)
3835- cairo_surface_destroy (myData.pMuteSurface);
3836- if (myConfig.cMuteIcon != NULL)
3837- {
3838- gchar *cUserImagePath = cairo_dock_generate_file_path (myConfig.cMuteIcon);
3839- myData.pMuteSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (cUserImagePath);
3840- g_free (cUserImagePath);
3841- }
3842- else
3843- {
3844- g_string_printf (sImagePath, "%s/mute.svg", MY_APPLET_SHARE_DATA_DIR);
3845- myData.pMuteSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (sImagePath->str);
3846- }
3847-
3848- g_string_free (sImagePath, TRUE);
3849-}
3850-
3851-
3852 static gboolean _cd_mixer_on_enter (GtkWidget* pWidget,
3853 GdkEventCrossing* pEvent,
3854 gpointer data)
3855 {
3856- if (myDesklet && myDesklet->container.iHeight > 64)
3857+ if (myData.pScale && myDesklet && myDesklet->container.iHeight > 64)
3858 {
3859 gtk_widget_show (myData.pScale);
3860 }
3861@@ -94,7 +58,7 @@
3862 GdkEventCrossing* pEvent,
3863 gpointer data)
3864 {
3865- if (myDesklet && myDesklet->container.iHeight > 64)
3866+ if (myData.pScale && myDesklet && myDesklet->container.iHeight > 64)
3867 {
3868 if (! myDesklet->container.bInside)
3869 gtk_widget_hide (myData.pScale);
3870@@ -102,6 +66,7 @@
3871 }
3872
3873 CD_APPLET_INIT_BEGIN
3874+ // scale widget visibility in desklet
3875 if (myDesklet)
3876 {
3877 int iScaleWidth = (myDesklet->container.iHeight > 64 ? 15 : 0);
3878@@ -121,8 +86,25 @@
3879 }
3880 }
3881
3882- _load_surfaces ();
3883+ // data renderer
3884+ if (myConfig.iVolumeEffect == VOLUME_EFFECT_GAUGE)
3885+ {
3886+ CairoDataRendererAttribute *pRenderAttr = NULL; // les attributs du data-renderer global.
3887+ CairoGaugeAttribute attr; // les attributs de la jauge.
3888+ memset (&attr, 0, sizeof (CairoGaugeAttribute));
3889+ pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
3890+ pRenderAttr->cModelName = "gauge";
3891+ pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
3892+ attr.cThemePath = myConfig.cGThemePath;
3893+
3894+ CD_APPLET_ADD_DATA_RENDERER_ON_MY_ICON (pRenderAttr);
3895+ }
3896+ else
3897+ {
3898+ mixer_load_surfaces ();
3899+ }
3900
3901+ // listen to the sound card
3902 mixer_init (myConfig.card_id);
3903
3904 mixer_get_controlled_element ();
3905@@ -157,12 +139,14 @@
3906 myData.iSidCheckVolume = g_timeout_add (1000, (GSourceFunc) mixer_check_events, (gpointer) NULL);
3907 }
3908
3909+ // mouse events
3910 CD_APPLET_REGISTER_FOR_CLICK_EVENT;
3911 CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT;
3912 CD_APPLET_REGISTER_FOR_BUILD_MENU_EVENT;
3913 CD_APPLET_REGISTER_FOR_SCROLL_EVENT;
3914 CD_APPLET_REGISTER_FOR_DOUBLE_CLICK_EVENT;
3915-
3916+
3917+ // keyboard events
3918 cd_keybinder_bind (myConfig.cShortcut, (CDBindkeyHandler) mixer_on_keybinding_pull, (gpointer)NULL);
3919 CD_APPLET_INIT_END
3920
3921@@ -186,7 +170,8 @@
3922
3923 CD_APPLET_RELOAD_BEGIN
3924 //\_______________ On recharge les donnees qui ont pu changer.
3925- _load_surfaces ();
3926+ if (myConfig.iVolumeEffect != VOLUME_EFFECT_GAUGE)
3927+ mixer_load_surfaces ();
3928
3929 //\_______________ On recharge le mixer si necessaire.
3930 if (CD_APPLET_MY_CONFIG_CHANGED)
3931@@ -224,6 +209,22 @@
3932 }
3933 else
3934 {
3935+ if (myConfig.iVolumeEffect == VOLUME_EFFECT_GAUGE)
3936+ {
3937+ CairoDataRendererAttribute *pRenderAttr = NULL; // les attributs du data-renderer global.
3938+ CairoGaugeAttribute attr; // les attributs de la jauge.
3939+ memset (&attr, 0, sizeof (CairoGaugeAttribute));
3940+ pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
3941+ pRenderAttr->cModelName = "gauge";
3942+ pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
3943+ attr.cThemePath = myConfig.cGThemePath;
3944+
3945+ if (cairo_dock_get_icon_data_renderer (myIcon))
3946+ CD_APPLET_RELOAD_MY_DATA_RENDERER (pRenderAttr);
3947+ else
3948+ CD_APPLET_ADD_DATA_RENDERER_ON_MY_ICON (pRenderAttr);
3949+ }
3950+
3951 mixer_element_update_with_event (myData.pControledElement, 1);
3952 if (myData.iSidCheckVolume == 0)
3953 myData.iSidCheckVolume = g_timeout_add (1000, (GSourceFunc) mixer_check_events, (gpointer) NULL);
3954@@ -278,16 +279,26 @@
3955 g_signal_handler_disconnect (G_OBJECT (myDesklet->container.pWidget), iOnLeaveCallbackID);
3956 }
3957 }
3958+ else
3959+ {
3960+ if (CD_APPLET_MY_CONTAINER_TYPE_CHANGED)
3961+ {
3962+ gtk_widget_destroy (myData.pScale);
3963+ myData.pScale = NULL;
3964+ }
3965+ }
3966 }
3967 else
3968 {
3969 ///\_______________ On redessine notre icone.
3970+ if (myDesklet && myDesklet->container.iHeight <= 64)
3971+ gtk_widget_hide (myData.pScale);
3972+
3973+ CD_APPLET_RELOAD_MY_DATA_RENDERER (NULL);
3974+
3975 if (myData.pControledElement != NULL)
3976 {
3977 mixer_element_update_with_event (myData.pControledElement, 0);
3978 }
3979-
3980- if (myDesklet && myDesklet->container.iHeight <= 64)
3981- gtk_widget_hide (myData.pScale);
3982 }
3983 CD_APPLET_RELOAD_END
3984
3985=== modified file 'alsaMixer/src/applet-mixer.c'
3986--- alsaMixer/src/applet-mixer.c 2011-08-09 18:08:08 +0000
3987+++ alsaMixer/src/applet-mixer.c 2011-10-08 22:23:24 +0000
3988@@ -264,24 +264,10 @@
3989 }
3990
3991
3992-/**static gboolean on_button_press_dialog (GtkWidget *widget,
3993- GdkEventButton *pButton,
3994- CairoDialog *pDialog)
3995-{
3996- CD_APPLET_ENTER;
3997- cairo_dock_dialog_unreference (pDialog);
3998- myData.pDialog = NULL;
3999- CD_APPLET_LEAVE(FALSE);
4000- //return FALSE;
4001-}*/
4002 static void _on_dialog_destroyed (CairoDockModuleInstance *myApplet)
4003 {
4004 myData.pDialog = NULL;
4005 }
4006-/**static gboolean _on_key_press_dialog (int iClickedButton, GtkWidget *pInteractiveWidget, gpointer *data, CairoDialog *pDialog)
4007-{
4008- myData.pDialog = NULL; // le dialogue est dereference donc tout ce qu'on a a faire c'est prendre en compte ce fait !
4009-}*/
4010 void mixer_show_hide_dialog (void)
4011 {
4012 if (myDesklet)
4013@@ -303,15 +289,10 @@
4014 attr.cText = cMessage;
4015 attr.cImageFilePath = MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE;
4016 attr.pInteractiveWidget = pScale;
4017- ///attr.pActionFunc = (CairoDockActionOnAnswerFunc) _on_key_press_dialog;
4018 attr.pUserData = myApplet;
4019 attr.pFreeDataFunc = (GFreeFunc)_on_dialog_destroyed;
4020
4021 myData.pDialog = cairo_dock_build_dialog (&attr, myIcon, myContainer);
4022- /**g_signal_connect (G_OBJECT (myData.pDialog->container.pWidget),
4023- "button-press-event",
4024- G_CALLBACK (on_button_press_dialog),
4025- myData.pDialog);*/
4026 }
4027 else
4028 {
4029@@ -325,5 +306,4 @@
4030 CD_APPLET_ENTER;
4031 snd_mixer_handle_events (myData.mixer_handle); // ne renvoie pas d'evenements pour nos actions !
4032 CD_APPLET_LEAVE(TRUE);
4033- //return TRUE;
4034 }
4035
4036=== modified file 'alsaMixer/src/applet-struct.h'
4037--- alsaMixer/src/applet-struct.h 2009-08-26 21:07:39 +0000
4038+++ alsaMixer/src/applet-struct.h 2011-10-08 22:23:24 +0000
4039@@ -37,6 +37,7 @@
4040 VOLUME_EFFECT_ZOOM,
4041 VOLUME_EFFECT_TRANSPARENCY,
4042 VOLUME_EFFECT_BAR,
4043+ VOLUME_EFFECT_GAUGE,
4044 VOLUME_NB_EFFECTS
4045 } VolumeTypeEffect;
4046
4047@@ -53,6 +54,8 @@
4048 gchar *cShortcut;
4049 gint iScrollVariation;
4050 gboolean bHideScaleOnLeave;
4051+ gchar *cGThemePath;
4052+ RendererRotateTheme iRotateTheme;
4053 } ;
4054
4055 struct _AppletData {
4056@@ -68,7 +71,6 @@
4057 guint iSidCheckVolume;
4058 CairoDialog *pDialog;
4059 cairo_surface_t *pSurface;
4060- //cairo_surface_t *pBrokenSurface;
4061 cairo_surface_t *pMuteSurface;
4062 int iCurrentVolume; // volume courant en %.
4063 gboolean bIsMute;
4064
4065=== modified file 'clock/data/clock.conf.in'
4066--- clock/data/clock.conf.in 2011-08-09 18:08:08 +0000
4067+++ clock/data/clock.conf.in 2011-10-08 22:23:24 +0000
4068@@ -21,9 +21,12 @@
4069 #{Set to 0 to use the default applet size}
4070 icon size = 0;0
4071
4072-#b Always display the icon, even when the dock is hidden?
4073+#B Always display the icon, even when the dock is hidden?
4074 always visi = false
4075
4076+#C+ Background color to add in this case
4077+bg color = .8;.8;.8;.5
4078+
4079 order=
4080
4081 #F[Applet's Handbook]
4082@@ -62,7 +65,7 @@
4083 #b Is detached from the dock
4084 initially detached=false
4085 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
4086-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
4087+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
4088 accessibility=0
4089 #b Should be visible on all desktops?
4090 sticky=true
4091
4092=== modified file 'clock/src/applet-backend-ical.c'
4093--- clock/src/applet-backend-ical.c 2010-09-18 14:20:27 +0000
4094+++ clock/src/applet-backend-ical.c 2011-10-08 22:23:24 +0000
4095@@ -133,7 +133,7 @@
4096 {
4097 //if( ICAL_VCALENDAR_COMPONENT != icalcomponent_isa(piCalComponent) ) continue;
4098 cTaskID = g_strdup(icalcomponent_get_uid(piCalComponent));
4099- g_print( "...Found task ID=%s\n", cTaskID );
4100+ cd_debug ( "...Found task ID=%s", cTaskID );
4101 if( cTaskID != NULL && strcmp( uid, cTaskID ) == 0 )
4102 {
4103 break;
4104
4105=== removed file 'debian/cairo-dock-plug-ins-data.lintian-overrides'
4106--- debian/cairo-dock-plug-ins-data.lintian-overrides 2009-08-26 21:07:39 +0000
4107+++ debian/cairo-dock-plug-ins-data.lintian-overrides 1970-01-01 00:00:00 +0000
4108@@ -1,5 +0,0 @@
4109-# Cairo-dock plugin config files uses shebang
4110-# upstream is warned
4111-cairo-dock-plug-ins-data: interpreter-not-absolute
4112-cairo-dock-plug-ins-data: script-not-executable
4113-cairo-dock-plug-ins-data: unusual-interpreter
4114
4115=== added file 'debian/cairo-dock-plug-ins-integration.lintian-overrides'
4116--- debian/cairo-dock-plug-ins-integration.lintian-overrides 1970-01-01 00:00:00 +0000
4117+++ debian/cairo-dock-plug-ins-integration.lintian-overrides 2011-10-08 22:23:24 +0000
4118@@ -0,0 +1,7 @@
4119+# Cairo-Dock Plug-Ins are not linked to gldi
4120+cairo-dock-plug-ins-integration: pkg-has-shlibs-control-file-but-no-actual-shared-libs
4121+# These integration plug-ins don't need shlibs and don't have to call ldconfig
4122+# (these plug-ins are enable only if a lib is available)
4123+cairo-dock-plug-ins-integration: postinst-has-useless-call-to-ldconfig
4124+cairo-dock-plug-ins-integration: postrm-has-useless-call-to-ldconfig
4125+cairo-dock-plug-ins-integration: missing-dependency-on-libc
4126
4127=== modified file 'debian/cairo-dock-plug-ins.install'
4128--- debian/cairo-dock-plug-ins.install 2011-08-09 19:51:45 +0000
4129+++ debian/cairo-dock-plug-ins.install 2011-10-08 22:23:24 +0000
4130@@ -1,6 +1,7 @@
4131 usr/lib*/cairo-dock/libcd-*.so
4132 usr/lib*/cli/CDApplet*.dll
4133-usr/lib*/python*/
4134+usr/lib*/python*/dist-packages/*.py
4135+usr/lib*/python*/dist-packages/*.egg-info
4136 usr/lib*/libCDApplet*.so
4137 usr/lib*/ruby*/
4138 usr/lib*/pkgconfig/
4139
4140=== added file 'debian/cairo-dock-plug-ins.lintian-overrides'
4141--- debian/cairo-dock-plug-ins.lintian-overrides 1970-01-01 00:00:00 +0000
4142+++ debian/cairo-dock-plug-ins.lintian-overrides 2011-10-08 22:23:24 +0000
4143@@ -0,0 +1,6 @@
4144+# Cairo-Dock Plug-Ins are not linked to gldi
4145+cairo-dock-plug-ins: pkg-has-shlibs-control-file-but-no-actual-shared-libs
4146+# Bug reported to upstream.
4147+cairo-dock-plug-ins: shlib-without-versioned-soname
4148+# Temporally lintian override: This package is going to be split
4149+cairo-dock-plug-ins: package-name-doesnt-match-sonames
4150
4151=== modified file 'debian/changelog'
4152--- debian/changelog 2011-08-11 23:17:39 +0000
4153+++ debian/changelog 2011-10-08 22:23:24 +0000
4154@@ -1,3 +1,104 @@
4155+cairo-dock-plug-ins (2.4.0~2-0ubuntu1) UNRELEASED; urgency=low
4156+
4157+ * New upstream bug fix release. (LP: #859984)
4158+ * Upstream (short) ChangeLog (2.4.0~0beta2 -> 2.4.0~1):
4159+ - Powermanager: correctly release the reference on the device object
4160+ - logout: now works if there is no session-manager
4161+ - Status-Notifier: fixed a small bug
4162+ (wrong callback in cairo_dock_stop_watching_dbus_name_owner)
4163+ - Folders: fixed the positionning of the new icon
4164+ and the dialog when dropping a folder inside the dock
4165+ and fixed the icon-rendering
4166+ - Dustbin: use the default theme if no icon is found
4167+ - Impulse: the default context seems to be ok and not an error
4168+ - Status-Notifier: On Ubuntu Oneiric (with indicator-0.4)
4169+ the ApplicationAdded signal has changed and has a new parameter
4170+ - Disable MeMenu on Oneiric (no longer available with indicator-0.4)
4171+ - CMakeLists.txt: Improved output messages
4172+ - Slide view: fixed a small offset in vertical view
4173+ - musicPlayer:
4174+ + split MPRIS 1.0 and 2.0 to help debugging and finding the right
4175+ name of the bug.
4176+ + 'rhythmbox-client' tool is no longer available: used MPRIS
4177+ + Disable Amazon service (it no longer work)
4178+ + Cover: fixed corrupted icons: some players (e.g. the latest version
4179+ of RB) copy covers on their cache forlder but it takes a few time.
4180+ + Fixed the update the icon and its name if the player is stopped.
4181+ + Prevent a crash if the name given by MPRIS is NULL
4182+ - Powermanager: try to prevent to have a few dialogues at the same time
4183+ - PowerManager and AlsaMixer: hidden gnome2 or 3 apps if not available
4184+ - Messaging-Menu: Updated for Natty and Oneiric
4185+ (dbus-menu gives us GVariant instead of GValue objects)
4186+ - Alsamixer: fixed a small bug on reload
4187+ - Dbus: Bash interface: Fixed a typo with emblem positions
4188+ - Sys-monitor: fixed a bug which prevented from getting
4189+ the CPU temperature in some cases
4190+ - Compiz (0.9): type filter: replaced type=utility by type=Utility
4191+ - Updated the version of all applets that have gauges
4192+ in order to use the right directory
4193+ - Wifi: Fixed the status if we are not connected
4194+ - Dbus: removed a conflict with the Help applet
4195+ - Messaging-Menu: updated applet-menu.c => Memory leaks on pixbufs
4196+ - Dbus: Fixed a crash when changing dock theme if a 'third-party' applet
4197+ is running
4198+ - Netspeed: in /proc/net/dev, there are 8 values to drop after the card id
4199+ except if there is whitespaces just after this ':' character
4200+ and fixed order and value for ON_ICON display
4201+ - dock-rendering/toto: removed a useless file
4202+ - Clipper: fixed the loading of the remembered items
4203+ (they had the wrong type) and fixed a bug if we reduce the list of items
4204+ - Folders, dustbin, Network-Monitor: tried to not use cast if it's possible
4205+ - Code cleaned and re-organised a few functions
4206+ (e.g. emblem references has been renamed)
4207+ - Removed useless files: powermanager-dbus*
4208+ - Updating translations
4209+ - Fixed a few warnings at the compilation
4210+ - Removed a few useless output messages
4211+ - Fixed these LP bugs:
4212+ + Empty trash from the trashcan does not delete files
4213+ from usb harddisks: LP: #658681
4214+ + Switcher applet doesn't respect desktop numbers LP: #626782
4215+ * Upstream (short) ChangeLog (2.4.0~1 -> 2.4.0~2):
4216+ - Messaging-Menu: fixed a wrong g_object_unref (double free)
4217+ and a small memory leak
4218+ - Folders: fixed a tiny warning at the compilation (32bits)
4219+ - switcher: removed an unnecessary config parameter
4220+ - Folders: file size: used English instead of French translation.
4221+ - Indicator applet: Forced a cast to remove an annoying warning
4222+ due to clumsy dbusmenu_gtkmenu_new() declaration
4223+ - Fixed the detection of the screensaver
4224+ - Fixed tiny warnings at the compilation (with CAIRO_CONTAINER)
4225+ * debian/control:
4226+ - Updated the version of cairo-dock-[core;data;dev].
4227+ - Added gvfs as 'Suggests' for cairo-dock-plug-ins-integration
4228+ (Used for managing files)
4229+ - Removed 'libthunar-vfs-1-dev' (libthunar-vfs is no longer installed
4230+ by default since XFCE 4.8 and it is replaced by gvfs)
4231+ - Removed 'indicator-me' (no longer available
4232+ and the installation of Cairo-Dock produces an error)
4233+ - Moved 'indicator-messages' to 'Recommends'
4234+ * debian/rules:
4235+ - Updated the name of CMake extras flags
4236+ * debian/cairo-dock-plug-ins-data.lintian-overrides:
4237+ - Deleted (now useless)
4238+ * debian/cairo-dock-plug-ins.lintian-overrides:
4239+ - Cairo-Dock Plug-Ins are not linked to gldi
4240+ - shlib-without-versioned-soname: forwarded to upstream.
4241+ * debian/cairo-dock-plug-ins-integration.lintian-overrides:
4242+ - Cairo-Dock Plug-Ins are not linked to gldi
4243+ - ldconfig and shlibs are not needed
4244+ * debian/cairo-dock-plug-ins.install:
4245+ - Fixed lintian errors: package-installs-python-bytecode
4246+ * debian/control: Fixed lintian warnings:
4247+ - python-script-but-no-python-dep
4248+ - description-synopsis-starts-with-article
4249+ * debian/changelog:
4250+ - Fixed lintian warning: old-fsf-address-in-copyright-file
4251+ * debian/patches/01-switcher-force-compact-view.patch:
4252+ - Forced the compact view because the other doesn't work
4253+
4254+ -- Matthieu Baerts (matttbe) <matttbe@gmail.com> Sun, 09 Oct 2011 00:19:16 +0200
4255+
4256 cairo-dock-plug-ins (2.4.0~0beta2-0ubuntu1) oneiric; urgency=low
4257
4258 * New upstream release. (LP: #823514)
4259
4260=== modified file 'debian/control'
4261--- debian/control 2011-08-09 19:51:45 +0000
4262+++ debian/control 2011-10-08 22:23:24 +0000
4263@@ -14,16 +14,15 @@
4264 libxml2-dev,
4265 libxtst-dev,
4266 libglib2.0-dev (>= 2.20),
4267- cairo-dock-data (>= 2.4.0~0beta2),
4268- cairo-dock-core (>= 2.4.0~0beta2),
4269- cairo-dock-dev (>= 2.4.0~0beta2),
4270+ cairo-dock-data (>= 2.4.0~1),
4271+ cairo-dock-core (>= 2.4.0~1),
4272+ cairo-dock-dev (>= 2.4.0~1),
4273 libasound2-dev,
4274 libvte-dev,
4275 x11proto-xf86vidmode-dev,
4276 libgnome-menu-dev,
4277 libgnomevfs2-dev,
4278 libgnomeui-dev,
4279- libthunar-vfs-1-dev,
4280 libgnome-keyring-dev,
4281 libgnutls-dev,
4282 libwebkitgtk-dev,
4283@@ -60,6 +59,7 @@
4284 Depends: cairo-dock-plug-ins-data (>= ${source:Version}),
4285 cairo-dock-core (>= 2.0.8.0),
4286 ${misc:Depends}
4287+Suggests: gvfs
4288 Description: Two plug-ins for cairo-dock for a better integration in GNOME or Xfce
4289 Cairo-dock-plug-ins is a set of plug-ins for Cairo-dock. It provides some new
4290 functionnalities like controling music players or note-taking, a clock or a
4291@@ -76,13 +76,13 @@
4292 cairo-dock-core (>= 2.0.8.0),
4293 curl,
4294 wget,
4295+ python,
4296 ${shlibs:Depends},
4297 ${misc:Depends}
4298 Suggests: compiz,
4299- gnote
4300-Recommends: indicator-messages,
4301- indicator-me
4302-Description: A set of plug-ins for cairo-dock
4303+ gnote,
4304+ indicator-messages
4305+Description: Set of plug-ins for cairo-dock
4306 Cairo-dock-plug-ins is a set of plug-ins for Cairo-dock. It provides some new
4307 functionnalities like controling music players or note-taking, a clock or a
4308 desktop switcher but also some views, dialogs and desklets skins, etc.
4309
4310=== modified file 'debian/copyright'
4311--- debian/copyright 2011-08-09 19:51:45 +0000
4312+++ debian/copyright 2011-10-08 22:23:24 +0000
4313@@ -18,8 +18,8 @@
4314 *
4315 * You should have received a copy of the GNU Lesser General Public
4316 * License along with this library; if not, write to the
4317- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
4318- * Boston, MA 02111-1307, USA.
4319+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
4320+ * MA 02110-1301, USA.
4321
4322 Files: systray/src/cd-tray.h
4323 systray/src/systray-config.*
4324@@ -40,7 +40,8 @@
4325 *
4326 * You should have received a copy of the GNU General Public License
4327 * along with this program; if not, write to the Free Software
4328- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4329+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
4330+ * MA 02110-1301, USA.
4331
4332 Files: terminal/*
4333 Copyright: 2007, 2008 GESTES Cedric and Fabrice Rey
4334@@ -188,4 +189,5 @@
4335 *
4336 * You should have received a copy of the GNU General Public License
4337 * along with this program; if not, write to the Free Software
4338- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4339+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
4340+ * MA 02110-1301, USA.
4341
4342=== added file 'debian/patches/01-switcher-force-compact-view.patch'
4343--- debian/patches/01-switcher-force-compact-view.patch 1970-01-01 00:00:00 +0000
4344+++ debian/patches/01-switcher-force-compact-view.patch 2011-10-08 22:23:24 +0000
4345@@ -0,0 +1,34 @@
4346+## From: Matthieu Baerts (matttbe) <matttbe@gmail.com>
4347+## Description: Forced the compact view because the other doesn't work
4348+## Forwarded: yes
4349+Index: cairo-dock-plug-ins/switcher/src/applet-config.c
4350+===================================================================
4351+--- cairo-dock-plug-ins.orig/switcher/src/applet-config.c 2011-10-08 23:26:53.222924952 +0200
4352++++ cairo-dock-plug-ins/switcher/src/applet-config.c 2011-10-08 23:26:53.306924951 +0200
4353+@@ -26,7 +26,7 @@
4354+
4355+ CD_APPLET_GET_CONFIG_BEGIN
4356+ //\_________________ On recupere toutes les valeurs de notre fichier de conf.
4357+- myConfig.bCompactView = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Vue Simple", TRUE);
4358++ myConfig.bCompactView = TRUE; // CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Vue Simple", TRUE);
4359+ myConfig.bPreserveScreenRatio = CD_CONFIG_GET_BOOLEAN ("Configuration", "preserve ratio");
4360+ myConfig.bMapWallpaper = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Map Wallpaper", TRUE);
4361+ myConfig.bDisplayNumDesk = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "display numero desktop", TRUE);
4362+Index: cairo-dock-plug-ins/.bzr/checkout/dirstate
4363+===================================================================
4364+Binary files cairo-dock-plug-ins.orig/.bzr/checkout/dirstate 2011-10-08 23:28:01.502925141 +0200 and cairo-dock-plug-ins/.bzr/checkout/dirstate 2011-10-08 23:27:09.198924995 +0200 differ
4365+Index: cairo-dock-plug-ins/switcher/data/switcher.conf.in
4366+===================================================================
4367+--- cairo-dock-plug-ins.orig/switcher/data/switcher.conf.in 2011-10-08 23:28:00.542925138 +0200
4368++++ cairo-dock-plug-ins/switcher/data/switcher.conf.in 2011-10-08 23:27:55.810925124 +0200
4369+@@ -101,10 +101,6 @@
4370+ #F[Configuration]
4371+ frame_conf =
4372+
4373+-#B Use the compact mode?
4374+-#{All desktops will be drawn on the main icon. Otherwise a sub-dock will contain all desktops.}
4375+-Vue Simple = true
4376+-
4377+ #b Preserve the ratio of the screen ?
4378+ preserve ratio = true
4379+
4380
4381=== added file 'debian/patches/series'
4382--- debian/patches/series 1970-01-01 00:00:00 +0000
4383+++ debian/patches/series 2011-10-08 22:23:24 +0000
4384@@ -0,0 +1,1 @@
4385+01-switcher-force-compact-view.patch
4386
4387=== modified file 'debian/rules'
4388--- debian/rules 2011-04-20 20:46:51 +0000
4389+++ debian/rules 2011-10-08 22:23:24 +0000
4390@@ -3,10 +3,10 @@
4391
4392 DH_ALWAYS_EXCLUDE=CVS:.bzr
4393
4394-DEB_CMAKE_EXTRA_FLAGS += -Denable_gnome_integration=yes \
4395- -Denable_old_gnome_integration=no \
4396- -Denable_kde_integration=yes \
4397- -Denable_xfce_integration=yes \
4398+DEB_CMAKE_EXTRA_FLAGS += -Denable-gnome-integration=yes \
4399+ -Denable-old-gnome-integration=no \
4400+ -Denable-kde-integration=yes \
4401+ -Denable-xfce-integration=yes \
4402 -DROOT_PREFIX=$(CURDIR)/debian/tmp
4403
4404 include /usr/share/cdbs/1/rules/debhelper.mk
4405
4406=== modified file 'desklet-rendering/src/rendering-desklet-panel.c'
4407--- desklet-rendering/src/rendering-desklet-panel.c 2011-08-09 18:08:08 +0000
4408+++ desklet-rendering/src/rendering-desklet-panel.c 2011-10-08 22:23:24 +0000
4409@@ -62,7 +62,7 @@
4410 double w = pDesklet->container.iWidth - 2 * pPanel->fMargin;
4411 double h = pDesklet->container.iHeight - 2 * pPanel->fMargin;
4412 pPanel->iMainIconSize = MIN (w, h) / 3;
4413- g_print (" desklet: %dx%d\n", (int)w, (int)h);
4414+ cd_debug (" desklet: %dx%d", (int)w, (int)h);
4415
4416 int iNbIcons = 0;
4417 Icon *pIcon;
4418@@ -90,7 +90,7 @@
4419 {
4420 q = (int) ceil ((double)pPanel->iNbIcons / p);
4421 iSize = MIN ((h - p * dy) / p - dh, ((w - (q - 1) * dx) / q - dw) / 2);
4422- g_print (" %dx%d -> %d\n", p, q, iSize);
4423+ cd_debug (" %dx%d -> %d", p, q, iSize);
4424 if (iSize > pPanel->iIconSize)
4425 {
4426 pPanel->iIconSize = iSize;
4427@@ -107,7 +107,7 @@
4428 pPanel->iIconSize = MIN ((h - p * dy) / p - dh, ((w - (q - 1) * dx) / q - dw) / 2);
4429 }
4430 pPanel->iIconSize = MIN (pPanel->iIconSize, pPanel->iMainIconSize);
4431- g_print (" panel desklet: %dx%d, %d\n", pPanel->iNbLines, pPanel->iNbColumns, pPanel->iIconSize);
4432+ cd_debug (" panel desklet: %dx%d, %d", pPanel->iNbLines, pPanel->iNbColumns, pPanel->iIconSize);
4433
4434 if ((h - pPanel->iNbLines * (pPanel->iIconSize + dh)) / pPanel->iNbLines > dy)
4435 {
4436
4437=== modified file 'dnd2share/data/dnd2share.conf.in'
4438--- dnd2share/data/dnd2share.conf.in 2011-08-09 18:08:08 +0000
4439+++ dnd2share/data/dnd2share.conf.in 2011-10-08 22:23:24 +0000
4440@@ -55,7 +55,7 @@
4441 #b Is detached from the dock
4442 initially detached=false
4443 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
4444-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
4445+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
4446 accessibility=0
4447 #b Should be visible on all desktops?
4448 sticky=true
4449
4450=== modified file 'dnd2share/src/applet-dnd2share.c'
4451--- dnd2share/src/applet-dnd2share.c 2011-04-20 20:46:51 +0000
4452+++ dnd2share/src/applet-dnd2share.c 2011-10-08 22:23:24 +0000
4453@@ -416,7 +416,7 @@
4454
4455 if (myConfig.bDisplayLastImage)
4456 {
4457- CD_APPLET_SET_LOCAL_IMAGE_ON_MY_ICON (MY_APPLET_ICON_FILE);
4458+ CD_APPLET_SET_IMAGE_ON_MY_ICON (MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE);
4459 }
4460 }
4461
4462
4463=== modified file 'dnd2share/src/applet-notifications.c'
4464--- dnd2share/src/applet-notifications.c 2011-08-09 18:08:08 +0000
4465+++ dnd2share/src/applet-notifications.c 2011-10-08 22:23:24 +0000
4466@@ -314,7 +314,7 @@
4467
4468
4469 CD_APPLET_ON_DROP_DATA_BEGIN
4470- g_print ("DND2SHARE : drop de '%s'\n", CD_APPLET_RECEIVED_DATA);
4471+ cd_debug ("DND2SHARE : drop de '%s'", CD_APPLET_RECEIVED_DATA);
4472 _on_drop_data (CD_APPLET_RECEIVED_DATA);
4473 CD_APPLET_ON_DROP_DATA_END
4474
4475@@ -403,19 +403,18 @@
4476
4477 CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Send the clipboard's content"), GTK_STOCK_PASTE, _send_clipboard, CD_APPLET_MY_MENU);
4478
4479- GtkWidget *pHistoryMenu = gtk_menu_new ();
4480+ GtkWidget *pHistoryMenu = gtk_menu_new (); // we don't use CD_APPLET_ADD_SUB_MENU_WITH_IMAGE, because we want to be able to set the menu-item unsensitive.
4481 GtkWidget *mi = gtk_image_menu_item_new_with_label (D_("History"));
4482-
4483+
4484 GtkWidget *im = gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU);
4485-#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
4486+ #if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
4487 gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (mi), TRUE);
4488-#endif
4489+ #endif
4490 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), im);
4491-
4492+
4493 gtk_menu_shell_append (GTK_MENU_SHELL (CD_APPLET_MY_MENU), mi);
4494 gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), pHistoryMenu);
4495
4496- //GtkWidget *pHistoryMenu = CD_APPLET_ADD_SUB_MENU_WITH_IMAGE (D_("History"), CD_APPLET_MY_MENU, GTK_STOCK_INDEX);
4497 if (myData.pUpoadedItems != NULL)
4498 {
4499 CDSiteBackend *pBackend;
4500@@ -453,7 +452,10 @@
4501 }
4502 if (cPreview == NULL)
4503 {
4504- cairo_dock_fm_get_file_info (pItem->cLocalPath, &cName, &cURI, &cPreview, &bIsDirectory, &iVolumeID, &fOrder, 0);
4505+ gchar *cIconName = NULL;
4506+ cairo_dock_fm_get_file_info (pItem->cLocalPath, &cName, &cURI, &cIconName, &bIsDirectory, &iVolumeID, &fOrder, 0);
4507+ cPreview = cairo_dock_search_icon_s_path (cIconName);
4508+ g_free (cIconName);
4509 g_free (cName);
4510 cName = NULL;
4511 g_free (cURI);
4512@@ -491,7 +493,7 @@
4513 else
4514 gtk_widget_set_sensitive (GTK_WIDGET (mi), FALSE);
4515
4516- pMenuItem = gtk_check_menu_item_new_with_label (_("Use only a files hosting site"));
4517+ pMenuItem = gtk_check_menu_item_new_with_label (D_("Use only a files hosting site"));
4518 gtk_menu_shell_append (GTK_MENU_SHELL (CD_APPLET_MY_MENU), pMenuItem);
4519 if (myConfig.bUseOnlyFileType)
4520 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (pMenuItem), TRUE);
4521
4522=== modified file 'dock-rendering/src/rendering-diapo-simple.c'
4523--- dock-rendering/src/rendering-diapo-simple.c 2011-08-09 18:08:08 +0000
4524+++ dock-rendering/src/rendering-diapo-simple.c 2011-10-08 22:23:24 +0000
4525@@ -81,10 +81,6 @@
4526 *gridX = index % nRowsX;
4527 *gridY = index / nRowsX;
4528 }
4529-static inline guint _get_index_from_gridXY (guint nRowsX, guint gridX, guint gridY)
4530-{
4531- return gridX + gridY * nRowsX;
4532-}
4533
4534 static guint _cd_rendering_diapo_simple_guess_grid (GList *pIconList, guint *nRowX, guint *nRowY)
4535 {
4536@@ -820,12 +816,13 @@
4537 int iOffsetY;
4538 if (pDock->container.bDirectionUp)
4539 iOffsetY = .5 * pDock->iMaxIconHeight * pDock->container.fRatio * (my_diapo_simple_fScaleMax - 1) + // les icones de la 1ere ligne zooment
4540- myIconsParam.iLabelSize + // le texte des icones de la 1ere ligne
4541+ (pDock->container.bIsHorizontal ? myIconsParam.iLabelSize : .5*myIconsParam.iLabelSize) + // le texte des icones de la 1ere ligne
4542 .5 * my_diapo_simple_lineWidth + // demi-ligne du haut;
4543 fScrollOffset;
4544 else
4545 iOffsetY = .5 * pDock->iMaxIconHeight * pDock->container.fRatio * (my_diapo_simple_fScaleMax - 1) + // les icones de la 1ere ligne zooment
4546 .5 * my_diapo_simple_lineWidth + // demi-ligne du bas;
4547+ (pDock->container.bIsHorizontal ? 0 : myIconsParam.iLabelSize/2) +
4548 fScrollOffset;
4549 double fFoldingX = (pDock->fFoldingFactor > .2 ? (pDock->fFoldingFactor - .2) / .8 : 0.); // placement de 1 a 0.2
4550 double fFoldingY = (pDock->fFoldingFactor > .5 ? (pDock->fFoldingFactor - .5) / .5 : 0.); // placement de 1 a 0.5
4551
4552=== modified file 'dock-rendering/src/rendering-rainbow.c'
4553--- dock-rendering/src/rendering-rainbow.c 2011-08-09 18:08:08 +0000
4554+++ dock-rendering/src/rendering-rainbow.c 2011-10-08 22:23:24 +0000
4555@@ -314,7 +314,7 @@
4556 x_abs = fFlatDockWidth+1;
4557
4558 float x_cumulated = 0, fXMiddle, fDeltaExtremum;
4559- double fPhase, fScale, fX;
4560+ double fPhase, fX, fScale = 0.0;
4561 int iNumRow, iPointedRow=-1;
4562 for (iNumRow = 0; iNumRow < iNbRows; iNumRow ++)
4563 {
4564
4565=== removed file 'dock-rendering/toto'
4566--- dock-rendering/toto 2010-08-10 00:05:57 +0000
4567+++ dock-rendering/toto 1970-01-01 00:00:00 +0000
4568@@ -1,217 +0,0 @@
4569-message :  (cairo-dock.c:main:427) 
4570- Compiled with Glitz (hardware acceleration support)n
4571-message :  (cairo-dock-dock-manager.c:cairo_dock_initialize_dock_manager:59) 
4572-
4573-message :  (cairo-dock-renderer-manager.c:cairo_dock_initialize_renderer_manager:135) 
4574-
4575-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57) 
4576- cairo_dock_register_renderer (default)
4577-message :  (cairo-dock.c:main:506) 
4578- environnement de bureau : 2
4579-message :  (cairo-dock-modules.c:cairo_dock_preload_module_from_directory:268) 
4580- cairo_dock_preload_module_from_directory (/users/m340689/usr/lib/cairo-dock)
4581-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4582- cairo_dock_register_desklet_renderer (Tree)
4583-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4584- cairo_dock_register_desklet_renderer (Caroussel)
4585-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4586- cairo_dock_register_desklet_renderer (Simple)
4587-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4588- cairo_dock_register_desklet_renderer (Controler)
4589-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4590- cairo_dock_register_desklet_renderer (Mediaplayer)
4591-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_dialog_renderer:122) 
4592- cairo_dock_register_dialog_renderer (Text)
4593-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159) 
4594- cairo_dock_set_renderer ((null))
4595-message :  (cairo-dock-keyfile-utilities.c:cairo_dock_write_keys_to_file:18) 
4596- cairo_dock_write_keys_to_file (/users/m340689/.cairo-dock/current_theme/cairo-dock.conf)
4597-message :  (cairo-dock-dock-manager.c:cairo_dock_deactivate_temporary_auto_hide:485) 
4598-
4599-message :  (cairo-dock-config.c:cairo_dock_read_conf_file:683) 
4600- g_cMainDockDefaultRendererName <- default
4601-warning :  (cairo-dock-config.c:cairo_dock_read_conf_file:1121) 
4602- Sorry but your X server does not support the extension.
4603- You can't have window thumbnails in the dock
4604-message :  (cairo-dock-dock-factory.c:cairo_dock_build_docks_tree_with_desktop_files:558) 
4605- cairo_dock_build_docks_tree_with_desktop_files (/users/m340689/.cairo-dock/current_theme/launchers)
4606-message :  (cairo-dock-launcher-factory.c:cairo_dock_load_icon_info_from_desktop_file:367) 
4607- no class defined for the launcher 01BitTorrent.desktop
4608- we will assume that its class is 'transmission-gtk'
4609-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402) 
4610- + BitTorrent/transmission-gtk
4611-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254) 
4612- cairo_dock_inhibate_class (transmission-gtk)
4613-message :  (cairo-dock-launcher-factory.c:cairo_dock_load_icon_info_from_desktop_file:367) 
4614- no class defined for the launcher 01bmp.desktop
4615- we will assume that its class is 'beep-media-player'
4616-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402) 
4617- + Musique/beep-media-player
4618-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254) 
4619- cairo_dock_inhibate_class (beep-media-player)
4620-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402) 
4621- + Navigateur Web Firefox/firefox
4622-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254) 
4623- cairo_dock_inhibate_class (firefox)
4624-message :  (cairo-dock-launcher-factory.c:cairo_dock_load_icon_info_from_desktop_file:367) 
4625- no class defined for the launcher 01gnome-terminal.desktop
4626- we will assume that its class is 'gnome-terminal'
4627-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402) 
4628- + Console/gnome-terminal
4629-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254) 
4630- cairo_dock_inhibate_class (gnome-terminal)
4631-message :  (cairo-dock-launcher-factory.c:cairo_dock_load_icon_info_from_desktop_file:367) 
4632- no class defined for the launcher 01nautilus.desktop
4633- we will assume that its class is 'nautilus'
4634-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402) 
4635- + Fichiers/nautilus
4636-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254) 
4637- cairo_dock_inhibate_class (nautilus)
4638-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402) 
4639- + Courrier/thunderbird-bin
4640-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254) 
4641- cairo_dock_inhibate_class (thunderbird-bin)
4642-message :  (cairo-dock-application-factory.c:cairo_dock_create_icon_from_xwindow:417) 
4643- recuperation de 'm340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole' (bIsHidden : 0)
4644-message :  (cairo-dock-class-manager.c:cairo_dock_add_appli_to_class:193) 
4645- cairo_dock_add_appli_to_class (konsole)
4646-message :  (cairo-dock-applications-manager.c:cairo_dock_insert_appli_in_dock:1115) 
4647- cairo_dock_insert_appli_in_dock (m340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole, 71303176)
4648-message :  (cairo-dock-class-manager.c:cairo_dock_prevent_inhibated_class:303) 
4649-
4650-message :  (cairo-dock-application-factory.c:cairo_dock_manage_appli_class:236) 
4651- cairo_dock_manage_appli_class (m340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole)
4652-message :  (cairo-dock-dock-factory.c:cairo_dock_insert_icon_in_dock_full:705) 
4653- separateur necessaire
4654-message :  (cairo-dock-dock-factory.c:cairo_dock_insert_icon_in_dock_full:752) 
4655- insertion de m340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole -> iSeparatorType : 3
4656-message :  (cairo-dock-applications-manager.c:cairo_dock_insert_appli_in_dock:1126) 
4657- insertion de m340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole complete (0,00 48,00x48,00) dans _MainDock_
4658-message :  (cairo-dock-application-factory.c:cairo_dock_create_icon_from_xwindow:417) 
4659- recuperation de 'rendering-diapo-simple.c - Kate' (bIsHidden : 0)
4660-Impossible de trouver l'icône « kate ». Le thème « hicolor »
4661-n'a pas non plus été trouvé. Peut-être avez-vous besoin de
4662-l'installer. Vous pouvez obtenir une copie à :
4663- http://icon-theme.freedesktop.org/releases
4664-message :  (cairo-dock-class-manager.c:cairo_dock_add_appli_to_class:193) 
4665- cairo_dock_add_appli_to_class (kate)
4666-message :  (cairo-dock-applications-manager.c:cairo_dock_insert_appli_in_dock:1115) 
4667- cairo_dock_insert_appli_in_dock (rendering-diapo-simple.c - Kate, 79691791)
4668-message :  (cairo-dock-class-manager.c:cairo_dock_prevent_inhibated_class:303) 
4669-
4670-message :  (cairo-dock-application-factory.c:cairo_dock_manage_appli_class:236) 
4671- cairo_dock_manage_appli_class (rendering-diapo-simple.c - Kate)
4672-message :  (cairo-dock-applications-manager.c:cairo_dock_insert_appli_in_dock:1126) 
4673- insertion de rendering-diapo-simple.c - Kate complete (0,00 48,00x48,00) dans _MainDock_
4674-message :  (cairo-dock-modules.c:cairo_dock_activate_module:453) 
4675- cairo_dock_activate_module (clock)
4676-cairo_dock_instanciate_module (/users/m340689/.cairo-dock/current_theme/plug-ins/clock/clock.conf)
4677- ce module est une applet
4678-message :  (cairo-dock-applet-factory.c:cairo_dock_create_applet_surface:31) 
4679- cairo_dock_create_applet_surface (48,00x48,00 x 2,00 / 1)
4680-message :  (cairo-dock-applet-factory.c:cairo_dock_create_applet_surface:40) 
4681- -> 48,00x48,00 x 2,00
4682-cairo_dock_read_module_config (40f0b480)
4683-message :  (cairo-dock-keyfile-utilities.c:cairo_dock_write_keys_to_file:18) 
4684- cairo_dock_write_keys_to_file (/users/m340689/.cairo-dock/current_theme/plug-ins/clock/clock.conf)
4685-message :  (applet-init.c:init:81) 
4686- init (/users/m340689/.cairo-dock/current_theme/plug-ins/clock/clock.conf)
4687-
4688-message :  (applet-init.c:_load_theme:39) 
4689- _load_theme (/users/m340689/usr/share/cairo-dock/plug-ins/clock/themes/silvia)
4690-message :  (cairo-dock-dock-factory.c:cairo_dock_insert_icon_in_dock_full:705) 
4691- separateur necessaire
4692-message :  (cairo-dock-dock-factory.c:cairo_dock_insert_icon_in_dock_full:752) 
4693- insertion de Poland -> iSeparatorType : 1
4694-message :  (cairo-dock-modules.c:cairo_dock_activate_module:453) 
4695- cairo_dock_activate_module (rendering)
4696-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4697- cairo_dock_register_desklet_renderer (Tree)
4698-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4699- cairo_dock_register_desklet_renderer (Caroussel)
4700-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4701- cairo_dock_register_desklet_renderer (Simple)
4702-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4703- cairo_dock_register_desklet_renderer (Controler)
4704-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77) 
4705- cairo_dock_register_desklet_renderer (Mediaplayer)
4706-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_dialog_renderer:122) 
4707- cairo_dock_register_dialog_renderer (Text)
4708-cairo_dock_instanciate_module (/users/m340689/.cairo-dock/current_theme/plug-ins/rendering/rendering.conf)
4709- ce module est un plug-in
4710-cairo_dock_read_module_config (40f50ba0)
4711-message :  (rendering-init.c:init:120) 
4712- init (/users/m340689/.cairo-dock/current_theme/plug-ins/rendering/rendering.conf)
4713-
4714-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57) 
4715- cairo_dock_register_renderer (Caroussel)
4716-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57) 
4717- cairo_dock_register_renderer (3D plane)
4718-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57) 
4719- cairo_dock_register_renderer (Parabolic)
4720-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57) 
4721- cairo_dock_register_renderer (Rainbow)
4722-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57) 
4723- cairo_dock_register_renderer (Slide)
4724-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57) 
4725- cairo_dock_register_renderer (SimpleSlide)
4726-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57) 
4727- cairo_dock_register_renderer (Curve)
4728-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159) 
4729- cairo_dock_set_renderer ((null))
4730-message :  (cairo-dock-modules.c:cairo_dock_activate_module:453) 
4731- cairo_dock_activate_module (switcher)
4732-cairo_dock_instanciate_module (/users/m340689/.cairo-dock/current_theme/plug-ins/switcher/switcher.conf)
4733- ce module est une applet
4734-message :  (cairo-dock-applet-factory.c:cairo_dock_create_applet_surface:31) 
4735- cairo_dock_create_applet_surface (32,00x32,00 x 2,00 / 1)
4736-message :  (cairo-dock-applet-factory.c:cairo_dock_create_applet_surface:40) 
4737- -> 48,00x48,00 x 2,00
4738-cairo_dock_read_module_config (40f26450)
4739-myConfig.bCompactView:0
4740-message :  (applet-init.c:init:83) 
4741- init (/users/m340689/.cairo-dock/current_theme/plug-ins/switcher/switcher.conf)
4742-
4743-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159) 
4744- cairo_dock_set_renderer ((null))
4745-message :  (cairo-dock-applications-manager.c:cairo_dock_update_applis_list:1203) 
4746- cette fenetre (88080409) de la pile n'est pas dans la liste
4747-cd_switcher_draw_main_icon (0)
4748-message :  (cairo-dock-load.c:cairo_dock_load_desktop_background_surface:856) 
4749- c'est un fond d'ecran de taille 1024x742
4750-message :  (cairo-dock-dock-factory.c:cairo_dock_reference_dock:476) 
4751- position : 1/1
4752-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159) 
4753- cairo_dock_set_renderer ((null))
4754-message :  (cairo-dock-load.c:cairo_dock_reload_buffers_in_dock:502) 
4755- cairo_dock_reload_buffers_in_dock ((null), 1)
4756-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159) 
4757- cairo_dock_set_renderer (SimpleSlide)
4758-cd_switcher_draw_main_icon (0)
4759- (0,00; 0,00) 38,40x38,40
4760- (0,00; 0,00) 38,40x38,40
4761- (0,00; 0,00) 38,40x38,40
4762- (0,00; 0,00) 38,40x38,40
4763-cd_switcher_draw_main_icon (0)
4764-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159) 
4765- cairo_dock_set_renderer ((null))
4766-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159) 
4767- cairo_dock_set_renderer (SimpleSlide)
4768-message :  (cairo-dock-dock-manager.c:cairo_dock_search_max_decorations_size:193) 
4769- decorations max : 761x52
4770-message :  (cairo-dock-keyfile-utilities.c:cairo_dock_write_keys_to_file:18) 
4771- cairo_dock_write_keys_to_file (/users/m340689/.cairo-dock/current_theme/cairo-dock_easy.conf)
4772-message :  (cairo-dock-keyfile-utilities.c:cairo_dock_write_keys_to_file:18) 
4773- cairo_dock_write_keys_to_file (/users/m340689/.cairo-dock/current_theme/cairo-dock_easy.conf)
4774-cd_switcher_draw_main_icon (0)
4775-message :  (cairo-dock-dock-manager.c:cairo_dock_stop_quick_hide:494) 
4776-
4777-message :  (cairo-dock-dock-manager.c:cairo_dock_stop_quick_hide:494) 
4778-
4779-cd_switcher_draw_main_icon (0)
4780-message :  (cairo-dock-dock-manager.c:cairo_dock_stop_quick_hide:494) 
4781-
4782-message :  (cairo-dock-dock-manager.c:cairo_dock_hide_child_docks:250) 
4783- on est dans le sous-dock, donc on ne le cache pas
4784-message :  (cairo-dock-dock-manager.c:cairo_dock_hide_child_docks:250) 
4785- on est dans le sous-dock, donc on ne le cache pas
4786
4787=== modified file 'dustbin/data/dustbin.conf.in'
4788--- dustbin/data/dustbin.conf.in 2011-08-09 18:08:08 +0000
4789+++ dustbin/data/dustbin.conf.in 2011-10-08 22:23:24 +0000
4790@@ -57,7 +57,7 @@
4791 #b Is detached from the dock
4792 initially detached=false
4793 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
4794-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
4795+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
4796 accessibility=0
4797 #b Should be visible on all desktops?
4798 sticky=true
4799
4800=== modified file 'dustbin/data/themes/CMakeLists.txt'
4801--- dustbin/data/themes/CMakeLists.txt 2010-08-10 00:05:57 +0000
4802+++ dustbin/data/themes/CMakeLists.txt 2011-10-08 22:23:24 +0000
4803@@ -1,12 +1,1 @@
4804 add_subdirectory(default)
4805-
4806-
4807-########### install files ###############
4808-
4809-
4810-
4811-
4812-#original Makefile.am contents follow:
4813-
4814-#SUBDIRS = \
4815-# default
4816
4817=== modified file 'dustbin/src/applet-init.c'
4818--- dustbin/src/applet-init.c 2010-09-07 02:38:17 +0000
4819+++ dustbin/src/applet-init.c 2011-10-08 22:23:24 +0000
4820@@ -37,6 +37,7 @@
4821
4822 static void _get_theme (void)
4823 {
4824+ // get the user images first, as they overwrite the theme.
4825 if (myConfig.cEmptyUserImage != NULL)
4826 {
4827 gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cEmptyUserImage);
4828@@ -57,6 +58,7 @@
4829 }
4830 g_free (cPath);
4831 }
4832+ // if a theme is defined, and user images are not defined, use the theme.
4833 if (myConfig.cThemePath != NULL)
4834 {
4835 if (myConfig.cEmptyUserImage == NULL)
4836@@ -66,11 +68,11 @@
4837 {
4838 g_free (myConfig.cEmptyUserImage);
4839 myConfig.cEmptyUserImage = g_strdup_printf ("%s/%s", myConfig.cThemePath, "trashcan_empty.png");
4840- if (! g_file_test (myConfig.cEmptyUserImage, G_FILE_TEST_EXISTS))
4841+ if (! g_file_test (myConfig.cEmptyUserImage, G_FILE_TEST_EXISTS)) // no svg nor png, use the default theme.
4842 {
4843 g_free (myConfig.cEmptyUserImage);
4844- myConfig.cEmptyUserImage = NULL;
4845- cd_warning ("dustbin : couldn't find an image for empty dustbin, check the existence of the files in %s", myConfig.cThemePath);
4846+ myConfig.cEmptyUserImage = g_strdup (MY_APPLET_SHARE_DATA_DIR"/themes/default/trashcan_empty.svg");
4847+ cd_warning ("using the default theme for Dustbin, as neither the user image (%s) nor the theme (%s) are valid", myConfig.cEmptyUserImage, myConfig.cThemePath);
4848 }
4849 }
4850 }
4851@@ -84,8 +86,8 @@
4852 if (! g_file_test (myConfig.cFullUserImage, G_FILE_TEST_EXISTS))
4853 {
4854 g_free (myConfig.cFullUserImage);
4855- myConfig.cFullUserImage = NULL;
4856- cd_warning ("dustbin : couldn't find an image for full dustbin, check the existence of the files in %s", myConfig.cThemePath);
4857+ myConfig.cFullUserImage = g_strdup (MY_APPLET_SHARE_DATA_DIR"/themes/default/trashcan_full.svg");
4858+ cd_warning ("using the default theme for Dustbin, as neither the user image (%s) nor the theme (%s) are valid", myConfig.cFullUserImage, myConfig.cThemePath);
4859 }
4860 }
4861 }
4862
4863=== modified file 'dustbin/src/applet-trashes-manager.c'
4864--- dustbin/src/applet-trashes-manager.c 2011-04-20 20:46:51 +0000
4865+++ dustbin/src/applet-trashes-manager.c 2011-10-08 22:23:24 +0000
4866@@ -65,11 +65,11 @@
4867
4868 if (myConfig.iQuickInfoType == CD_DUSTBIN_INFO_NB_TRASHES)
4869 {
4870- CD_APPLET_SET_QUICK_INFO_ON_MY_ICON_PRINTF ("%d%s", myData.iMeasure, (myDesklet ? D_(" trashe(s)") : ""));
4871+ CD_APPLET_SET_QUICK_INFO_ON_MY_ICON_PRINTF ("%ld%s", myData.iMeasure, (myDesklet ? D_(" trashe(s)") : ""));
4872 }
4873 else if (myConfig.iQuickInfoType == CD_DUSTBIN_INFO_NB_FILES)
4874 {
4875- CD_APPLET_SET_QUICK_INFO_ON_MY_ICON_PRINTF ("%d%s", myData.iMeasure, (myDesklet ? D_(" file(s)") : ""));
4876+ CD_APPLET_SET_QUICK_INFO_ON_MY_ICON_PRINTF ("%ld%s", myData.iMeasure, (myDesklet ? D_(" file(s)") : ""));
4877 }
4878 else if (myConfig.iQuickInfoType == CD_DUSTBIN_INFO_WEIGHT)
4879 {
4880
4881=== modified file 'gvfs-integration/cairo-dock-gio-vfs.c'
4882--- gvfs-integration/cairo-dock-gio-vfs.c 2011-08-09 18:08:08 +0000
4883+++ gvfs-integration/cairo-dock-gio-vfs.c 2011-10-08 22:23:24 +0000
4884@@ -91,7 +91,14 @@
4885 for (i = 0; cFileNames[i] != NULL && cIconPath == NULL; i ++)
4886 {
4887 //g_print (" une icone possible est : %s\n", cFileNames[i]);
4888- cIconPath = cairo_dock_search_icon_s_path (cFileNames[i]);
4889+
4890+ gchar *path = cairo_dock_search_icon_s_path (cFileNames[i]);
4891+ if (path)
4892+ {
4893+ g_free (path);
4894+ cIconPath = g_strdup (cFileNames[i]);
4895+ }
4896+
4897 //g_print (" chemin trouve : %s\n", cIconPath);
4898 }
4899 }
4900@@ -319,13 +326,26 @@
4901 cd_message ("cVolumeName : %s", cVolumeName);
4902
4903 GMount *pMount = NULL;
4904- _cd_find_mount_from_volume_name (cVolumeName, &pMount, cURI, cIconName);
4905+ gchar *uri=NULL, *iconname=NULL;
4906+ _cd_find_mount_from_volume_name (cVolumeName, &pMount, &uri, &iconname);
4907 g_return_if_fail (pMount != NULL);
4908
4909- *cName = g_strdup (cVolumeName);
4910- *bIsDirectory = TRUE;
4911- *iVolumeID = 1;
4912- *fOrder = 0;
4913+ if (cURI)
4914+ *cURI = uri;
4915+ else
4916+ g_free (uri);
4917+ if (cIconName)
4918+ *cIconName = iconname;
4919+ else
4920+ g_free (iconname);
4921+ if (cName)
4922+ *cName = g_strdup (cVolumeName);
4923+ if (bIsDirectory)
4924+ *bIsDirectory = TRUE;
4925+ if (iVolumeID)
4926+ *iVolumeID = 1;
4927+ if (fOrder)
4928+ *fOrder = 0;
4929 //g_object_unref (pMount);
4930
4931 g_free (cValidUri);
4932@@ -367,7 +387,6 @@
4933 G_FILE_QUERY_INFO_NONE, /// G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS
4934 NULL,
4935 &erreur);
4936- //g_object_unref (pFile);
4937 if (erreur != NULL) // peut arriver si l'emplacement n'est pas monte.
4938 {
4939 cd_debug ("gvfs-integration : %s", erreur->message); // inutile d'en faire un warning.
4940@@ -380,135 +399,155 @@
4941 const gchar *cFileName = g_file_info_get_name (pFileInfo);
4942 const gchar *cMimeType = g_file_info_get_content_type (pFileInfo);
4943 GFileType iFileType = g_file_info_get_file_type (pFileInfo);
4944-
4945- if (iSortType == CAIRO_DOCK_FM_SORT_BY_DATE)
4946- {
4947- GTimeVal t;
4948- g_file_info_get_modification_time (pFileInfo, &t);
4949- *fOrder = t.tv_sec;
4950- }
4951- else if (iSortType == CAIRO_DOCK_FM_SORT_BY_ACCESS)
4952- *fOrder = g_file_info_get_attribute_uint64 (pFileInfo, G_FILE_ATTRIBUTE_TIME_ACCESS);
4953- else if (iSortType == CAIRO_DOCK_FM_SORT_BY_SIZE)
4954- *fOrder = g_file_info_get_size (pFileInfo);
4955- else if (iSortType == CAIRO_DOCK_FM_SORT_BY_TYPE)
4956- *fOrder = (cMimeType != NULL ? *((int *) cMimeType) : 0);
4957- else
4958- *fOrder = 0;
4959-
4960- *bIsDirectory = (iFileType == G_FILE_TYPE_DIRECTORY);
4961- cd_message (" => '%s' (mime:%s ; bIsDirectory:%d)", cFileName, cMimeType, *bIsDirectory);
4962-
4963 const gchar *cTargetURI = g_file_info_get_attribute_string (pFileInfo, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
4964
4965- // if it's a mount point, find a readable name.
4966+ // find the order of the file
4967+ if (fOrder)
4968+ {
4969+ if (iSortType == CAIRO_DOCK_FM_SORT_BY_DATE)
4970+ {
4971+ GTimeVal t;
4972+ g_file_info_get_modification_time (pFileInfo, &t);
4973+ *fOrder = t.tv_sec;
4974+ }
4975+ else if (iSortType == CAIRO_DOCK_FM_SORT_BY_ACCESS)
4976+ *fOrder = g_file_info_get_attribute_uint64 (pFileInfo, G_FILE_ATTRIBUTE_TIME_ACCESS);
4977+ else if (iSortType == CAIRO_DOCK_FM_SORT_BY_SIZE)
4978+ *fOrder = g_file_info_get_size (pFileInfo);
4979+ else if (iSortType == CAIRO_DOCK_FM_SORT_BY_TYPE)
4980+ *fOrder = (cMimeType != NULL ? *((int *) cMimeType) : 0);
4981+ else
4982+ *fOrder = 0;
4983+ }
4984+
4985+ if (bIsDirectory)
4986+ *bIsDirectory = (iFileType == G_FILE_TYPE_DIRECTORY);
4987+
4988+
4989+ // find a readable name if it's a mount point.
4990 if (iFileType == G_FILE_TYPE_MOUNTABLE)
4991 {
4992- *cName = NULL;
4993- *iVolumeID = 1;
4994+ if (iVolumeID)
4995+ *iVolumeID = 1;
4996
4997- cd_message (" cTargetURI:%s", cTargetURI);
4998- GMount *pMount = NULL;
4999- if (cTargetURI != NULL)
5000- {
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches