debian/0000775000000000000000000000000012320620257007167 5ustar debian/libgldi-dev.install0000664000000000000000000000005712014010622012730 0ustar usr/include usr/lib/*/*.so usr/lib/*/pkgconfig debian/changelog0000664000000000000000000014461612320616426011060 0ustar cairo-dock (3.3.99.beta1.2.really.3.3.2-0ubuntu2) trusty; urgency=medium * debian/control: - gnome-session is no longer by default on Ubuntu and we need it for the Cairo-Dock session - Added support of Mate and Cinnamon -- Matthieu Baerts (matttbe) Mon, 07 Apr 2014 23:47:42 +0200 cairo-dock (3.3.99.beta1.2.really.3.3.2-0ubuntu1) trusty; urgency=medium * Revert back to the 3.3.2 version: (LP: #1302246) Unfortunately, due to the lack of time, we have to revert back to the latest stable version. Sorry for that but feel free to help us ;-) * debian/patches: cherry-pick patches from upstream BZR repo, all 'bug-fix' and changes that were already in the 3.3.99.beta1 version except all changes linked to the new style, the menu and the configuration. - bzr1670_Default_themes_Disable_icon-effects.patch: Default themes: disable icon-effects: maybe a bit 'too much' for the current trend - bzr1684_Utils_Added_get_default_terminal.patch: Utils: Added: 'get_default_terminal()' to get the default terminal. - bzr1708-1709_Utils_Cmd_with_right_terminal_and_theme_packager_support_ and_exception_for_konsole.patch: Utils: Cmd with right terminal: added an exception for 'konsole'. Theme: Pkg: Cmd: used simple quotes instead of double quotes in the second cmd - bzr1714_change_default_img_dir_to_Images_dir_in_home.patch: GUI: widget: file chooser: images: default directory is now ~/Images - bzr1715-1716_File_Mgr_added_the_possibility_to_monitor_a_process.patch: File Mgr: added the possibility to monitor a process - bzr1719_unblacklist_intel_hd4000.patch: GLX: blacklist Intel HD4000: this bug is now fixed when using Mesa 10.1 - bzr1720_gsettings_can_have_quotes.patch: style: handle the case where font_name in gsettings has quotes * debian/patches/session_desktopname_Unity.patch: Switch DesktopName to Unity to also take advantage of patches added in some GNOME apps and specially made for Unity to avoid some behaviour designed only for Gnome-Shell (e.g. Nautilus, indicators, etc.). * debian/control: bumped Plugins versions -- Matthieu Baerts (matttbe) Sun, 06 Apr 2014 23:45:58 +0200 cairo-dock (3.3.99.beta1.1~20140219~bzr1717-0ubuntu2) trusty; urgency=medium * New upstream snapshot. * Short Upstream ChangeLog: - Style: unified the style for all objects. - Menu: added the possibility to customise them - Config: updated some sections linked to the style - API: - Updated functions about the style - Added new features about PID monitoring - Some bugs have been fixed, other tweaks * debian/control: - bumped plug-ins versions (+ fixed typo) - bumped Standard Version (no change needed) -- Matthieu Baerts (matttbe) Thu, 20 Feb 2014 00:23:22 +0100 cairo-dock (3.3.2-0ubuntu2) trusty; urgency=low * No change: Rebuild for the new version of GTK -- Matthieu Baerts (matttbe) Tue, 10 Dec 2013 22:54:12 +0100 cairo-dock (3.3.2-0ubuntu1) trusty; urgency=low * New upstream release. (bug-fix version) * Detailed Upstream ChangeLog (3.3.1 -> 3.3.2) - Class: implemented a workaround for Chromium and Google Chrome web apps - Docks: fixed 2 bugs when reloading a dock: when changing the visibility from 'keep hidden' to 'hide when overlapping a window' and when changing the offset from the screen edges - Launching animation: don't stop it when the dock hides itself - Menus: correctly setup the menu during its init - Taskbar: - Fixed a regression when the application changes its class - Removed 'opening animation' option: now in plugins (Animated-Icons and Icon-effect) - Translations: imported translations from Launchpad * debian/control: - bumped plug-ins versions - bumped Standards-Version to 3.9.4 (no change needed) -- Matthieu Baerts (matttbe) Sun, 10 Nov 2013 23:49:32 +0100 cairo-dock (3.3.1-0ubuntu1) saucy; urgency=low * New upstream release. (bug-fix version) * Detailed Upstream ChangeLog (3.3.0 -> 3.3.1) - GLX backend: with GTK2, use the GDK default display for all glx functions (without that, the dock is fully transparent) - Docks: the input shape was incorrectly set at startup - Menu: show the menu-items before popping the menu up, so that they are realized (as before) - Launchers: Updated our .desktop file with the latest translations * debian/control: bumped plug-ins versions -- Matthieu Baerts (matttbe) Tue, 08 Oct 2013 18:44:04 +0200 cairo-dock (3.3.0-0ubuntu1) saucy; urgency=low * New upstream release. * Detailed Upstream ChangeLog (beta 2 -> release) - Desklets: when something is dropped onto a desklet, get the data and not only the text - Dialogs: fixed a bug that made the background of the widgets inside the dialog visible - Menus: split menus functions into separated files to prepare future menus and imported gtkimagemenuitem.c but only used with GTK 3.10 Note: no changes for Saucy (with GTK 3.8) - src: remove some g_print's - po: imported translations from Launchpad * A few bugs have been fixed: - Invalid fastbin entry LP: #1212981 - Cairo-Dock Session is broken with Gnome-Session 3.8 LP: #1193598 - Dock doesn't hide when a Downloading windows overlaps LP: #1094825 - Thumbnails of windows not showing when minimized LP: #1051174 - Icon label persists after hover away LP: #1108611 - Insecure RPATH in libgldi.so LP: #1170229 - Dock becames visible although it should be hidden LP: #1218360 * debian/control: bumped plug-ins versions -- Matthieu Baerts (matttbe) Fri, 04 Oct 2013 14:58:22 +0200 cairo-dock (3.2.99.beta2.1~20130919~bzr1630-0ubuntu1) saucy; urgency=low * New upstream snapshot. * Detailed Upstream ChangeLog (rev 1613 -> 1629) - Dock: Fixed a possible crash when removing an Icon - Cinnamon integration: fixed the 'present_class' method - Core: a bit of code cleaning - ChangeLog: updated the message - Icon: launch command: fixed typo - Dock visibility: set the input shape fully transparent when the dock is hidden - Dock visibility: fixed a regression where the dock didn't re-appear - cairo-dock.c: connect to SIGHUP to properly quit when its controlling terminal is closed - po: updated translations - X manager: notify of the 'windows stack order changed' when needed - Menu: menu-item with buttons inside: connect to the 'draw' event only for the given menu-item - Class manager: fixed a crash + fixed the auto-stop of the startup notification * debian/control: bumped plugins version -- Matthieu Baerts (matttbe) Thu, 19 Sep 2013 12:15:44 +0200 cairo-dock (3.2.99.beta1.1~20130827~bzr1613-0ubuntu1) saucy; urgency=low * New upstream snapshot. * Short Upstream ChangeLog: - Added support of the StartupNotification protocol - A huge rewrite of the core using Objects * debian/rules: - Added DEB_BUILD_PARALLEL flag * debian/control: - Bumped plugins version * debian/patches/: - Removed cairo-dock-session_without_fallback_session: fixed by upstream -- Matthieu Baerts (matttbe) Tue, 27 Aug 2013 16:38:10 +0200 cairo-dock (3.2.1-0ubuntu2) saucy; urgency=low * debian/patches/cairo-dock-session_without_fallback_session.patch: - Refreshed to support Gnome-Session 3.8 (bzr upstream patch) -- Matthieu Baerts (matttbe) Sat, 22 Jun 2013 13:19:03 +0200 cairo-dock (3.2.1-0ubuntu1) raring; urgency=low * New upstream release. (bug-fix version) LP: #1168839 * Detailed Upstream ChangeLog: - Dialogues: - Fixed a small bug with the default icon - Force taking the focus when the dialogue has an user widget, since some WM prevent focus steal LP: #531152 - Gnome-Shell: the dash was hidden all the time - GUI: - Docks list: only list main docks and subdocks and not launchers and applications with subdocks (when there are windows with the same class and if these icons are regrouped into a subdock) - Menu and GUI: Move to another dock: if it s a container: Do not add subdocks that are contained in this container (to avoid loop: subdock1->subdock2->subdock1) - Simple: Plugins: Help applet was not listed - Simple: Config: force displaying the config widget (the config panel was empty with some older versions of GTK) - Help applet: - This applet didn t have any preview icon file - Icon: - Label: If we don t want to show label, keep info about the font: it can be used by other applets (e.g. Clock) - Windows thumbnails: fixed a small bug that made the thumbnail unavailable the first time the window is minimized - Init & Themes: deactivate the option Show Windows Thumbnail in the current theme. - This option can provoke annoying bugs with other applications the desktop (e.g. Gedit or Nautilus displayed corrupted icons when using a smooth scroll) - It seems this bug is due to the video drivers and it s fixed with the latest stable version of these drivers (but which is not available with most distributions) - Note: It s still possible to re-enable this option from the config panel - Taskbar: Fixed a possible crash in a convoluted scenario (if there are a few untitled windows with the same empty class) - X11: - Fixed a crash when using Xinerama with multi-monitors - Translations: Imported translations files from Launchpad * debian/control: - Bumped Cairo-Dock Plug-Ins versions -- Matthieu Baerts (matttbe) Sun, 14 Apr 2013 11:58:46 +0200 cairo-dock (3.2.0-0ubuntu1) raring; urgency=low * New upstream release. * Upstream ChangeLog: - Enable the Indicator-Generic by default on a Cairo-Dock session under Ubuntu - Removed the deprecated option 'hide on fullscreen' - Task: fixed a bug in cairo_dock_stop_task - BSD port: fixed some compilation and linking problems - Taskbar: fixed a bug where an icon didn't stop demanding the attention - Docks: when changing the alignment of the main dock, correctly update the dock - Removed the need for pangox (was not used) - Drop on container: add URI target before the text target, or we will get the link text instead of the link URI in Konqueror (other browsers don't have this problem) - If an applet crashed the dock when launching it, this applet was not blacklisted - GUI: fixed a crash in the ModuleWidget class - Core: separated gldi-config.h in 2 parts, so that the one that is installed doesn't contain any architecture-dependant value - po: Imported translations from Launchpad * debian/control: - Mutter is now better supported by the dock: added on the recommended list * debian/rules: - CMake flag: replaced 'yes' by 'ON' -- Matthieu Baerts (matttbe) Tue, 26 Mar 2013 00:01:34 +0100 cairo-dock (3.1.99.rc2.1~20130304~bzr1411-0ubuntu1) raring; urgency=low * New upstream snapshot. * Short Upstream ChangeLog: - Multi-screen support has been improved - Added Systemd support for the session management - Countless bug-fixes and improvements * debian/rules: - Removed useless flag (was needed for GTK2) * debian/control: - XRandr is now used by default instead of Xinerama - Bumped Cairo-Dock Plug-Ins versions * debian/cairo-dock-core.install: - Added all libcd*.so: the 'Help' is now in a separated file. -- Matthieu Baerts (matttbe) Mon, 04 Mar 2013 23:51:02 +0100 cairo-dock (3.1.2.1-0ubuntu1) raring; urgency=low * New upstream release. (bug-fix version) * Detailed Upstream ChangeLog: - Dialogues Mgr: + cairo_dock_set_dialog_message (used by Help): used markup if it's needed + Fixed 2 bugs when an icon holding a modal dialog is destroyed - GUI: + Search for an icon path if the module gives us only the name of its icon (e.g. Deluge, Transmission, Menus) + Simple: Behavior: Position of the taskbar: 'After a given icon' choise was missing - Icon Mgr: removed a now useless static mutex - Init: + Initialised threads on new versions of GLib (>= 2.24) + This should finally fix a crash when opening Logout menu - Help: Used markup for the dialogues - Menu: Quit with a Cairo-Dock session: check if it's really the shift key which is used to unlock the quit menu entry * debian/control: bumped cairo-dock-plug-ins* versions -- Matthieu Baerts (matttbe) Thu, 06 Dec 2012 18:51:36 +0100 cairo-dock (3.1.1-0ubuntu1) raring; urgency=low * New upstream release. (bug-fix version) * Detailed Upstream Changelog: - Dialogues Mgr: Rewrite blocking dialogue to avoid bug with 'terminal' applet - GUI + Simple: + Used the right translation for titles of all main categories and description of views + With old versions of GTK2 (< 2.22, e.g. on Debian stable or Ubuntu Lucid): this config panel had tabs but without any widget inside + Advanced: + Widget Items: Invisible modules: displayed the title (which is translated) - Icon Mgr: + Fixed a crash with the icons theme when it is reloaded + Icon was invisible for launchers that are pinned to a given desktop + Icons were not correctly sorted (it impacted Shortcuts) - Init: Used dbus_g_thread_init before 'gtk_init' in order to be called before the first use of DBus + It should fixed a "random" crash when clicking on logout applet. - Help: always check the composite on startup, until the user choose not to - Theme: Panel: + Added Printers-Menu.conf file (needed to place this applet at the right position) + Dnd2share: used the new 'busy' animation - Misc.: + Compilation libdir: some distro (e.g. Gentoo) use LIB_SUFFIX flag: used a specific case for that + Updated translations * debian/patches/bzr_translate_titles_of_categories_and_readme.patch: - Removed: Now in upstream * debian/control: - Forced the use of the same version of libgldi3 -- Matthieu Baerts (matttbe) Sat, 10 Nov 2012 23:52:14 +0100 cairo-dock (3.1.0-0ubuntu2) quantal; urgency=low * debian/control: - Cairo-Dock plug-ins dependencies: Removed '-0ubuntu1' to allow other distros and backports to work smoother (Thanks to Laney!) (LP: #1064130) -- Matthieu Baerts (matttbe) Tue, 09 Oct 2012 23:36:25 +0200 cairo-dock (3.1.0-0ubuntu1) quantal; urgency=low * New upstream release. (LP: #1064130) - Even if there are a lot of changes, this is a 'bug-fix' version. Changes are big mainly because the translations have been updated and a lot of GCC warnings (from -Wall and -Wextra) have been fixed. * Upstream ChangeLog (detailed changes since the last version): - Only disable drag'n'drop onto the dock when the dock is completely locked, not when the icons position is locked. - Prevented quicklists for an icon (e.g. used by musicPlayer applet to remove double menu entries) - Menu: renamed this title: 'Below *other* windows' + fixed a typo (bIsMaximized was checked a bit too late) - Man: 'A' ('ask-backend') option was missing and 'i' (indirect) is no longer supported + for 'colors', used 'F' instead of 'A' which is already used by 'ask-backend' - When a label is updated, update the drawing accordingly - Dialogs: fixed a crash if the dialog was forced above (GTK3) - Advanced GUI: fixed a bug that prevented to edit a 2nd instance of an applet + renamed 'cairo-dock-gui-main.[ch]' to 'cairo-dock-gui-advanced.[ch]' - Don't close the dock if no plug-ins are found, just display the message - Menu on appli: put the window actions into a single menu-item, which avoid having a crowded menu or another sub-menu - Default view: use all the screen space to avoid the jitter of the dock when it is resized (although this is mainly a problem in the Window Managers, unfortunately very few handle the resizing correctly) - Locked dock: prevent any modification when the dock is locked - Advanced GUI: fixed a small bug when reloading an applet - Application manager: handle the case where there is no dock (e.g. for cairo-desklet) - when starting in maintenance mode, force the use of the advanced configuration (easier to fix problem) - Compilation: fixed a lot of warnings during the compilation (mostly 'unused-variable' and 'unused-parameters' by using G_GNUC_UNUSED) when using -Wall and -Wextra - GTK3.4: used GtkGrid instead of GtkTable (now deprecated) - Labels in vertical dock: + fixed the calculation with a helper + terminate with a gradation if the label is too large to be fully drawn + fixed a small offset in the position of the X icon geometry - Indicators: icons was not visible with the Cairo backend if we wanted to have an image as indicator of the active window and if we don't give any image - Fixed a bug in cairo_dock_create_surface_from_pattern (when using a pattern as the background image) - Themes: Added write rights in the new theme folder (if the user has just changed its current theme) - OpenGL backend: fixed a small bug in the drawing of always visible icons - Fixed a crash when re-inserting an applet into a dock - GUI: fixed 2 bugs in the module widget - Taskbar: when placing appli icons after launchers, don't count separators as launchers - When loading an image based on a pattern, constrain the image height, so that it only repeats on its width - Taskbar: added back the use of _NET_WM_STATE_DEMANDS_ATTENTION (this might be used by Skype and therefore solve the bug LP: #1013635) - Menu: Window Actions: drawn: Min - Max - Close instead of Max - Min - Close + drawn Min and Max only if the window is not hidden - Code cleaning: removed a few useless g_print (or used cd_debug instead) - Menu: Custom icon: only display images on the file chooser - Menu: Custom Icon: do not display the menu entry if bLockAll is defined (if the action is useless) + do not stop the action if bLockIcons - Widget Items: the main GtkWindow is needed to build other widgets - po: imported translations from Launchpad and Added Lithuanian language - Options: AskBackend: show the backend even if we force the use of the OpenGL backend - Help: Help menu entry: this menu entry no longer worked: used cairo_dock_show_items_gui like the Edit menu entry - Menu: Help menu entry: if we use the simple mode, switch to the advanced mode because the help settings are only available there - Some cleaning * debian/patches/bzr_screens_with_null_dimensions.patch: - Removed (now in upstream) * Added bzr_translate_titles_of_categories_and_readme from upstream: - Translate the titles of all main categories and views' description * debian/control: - Bumpped Cairo-Dock Plug-ins versions -- Matthieu Baerts (matttbe) Tue, 09 Oct 2012 02:53:48 +0200 cairo-dock (3.0.99.beta1.1~20120827~bzr1193-0ubuntu2) quantal; urgency=low * Added bzr_screens_with_null_dimensions.patch from upstream: - Prevent screens with null dimensions: the dock can be invisible if the 'multi-monitors' option is enabled and a wrong screen is chosen. - Try to get dimensions from all screens with XRandr and also with Xinerama if there is a problem. -- Matthieu Baerts (matttbe) Tue, 28 Aug 2012 11:46:13 +0200 cairo-dock (3.0.99.beta1.1~20120827~bzr1193-0ubuntu1) quantal; urgency=low * New upstream snapshot. * Upstream ChangeLog (detailed changes): - Task: the thread clean itself to avoid crash + fixed a typo with the check of bDiscard + cancel: checked if pThread has not been freeed before talking with it + converted g_print to cd_debug + Cancel the next iteration if 'iPeriod == 0' - Added a workaround for Metacity not handling the _NET_WM_OPACITY correctly - Man: Added the new -W (--metacity-workaround) option - XRandr: Use it by default instead of Xinerama which is deprecated according to its website - XRandr: Checked if 1.1 version is available for basic functions (e.g. to change the resolution) and 1.3 version (to replace Xinerama) - Xrandr: Added cairo_dock_xrandr_is_available (needed to avoid a crash in ShowDesktop applet) - Module Mgr: removed GModule dependence (which is no longer used since version 2.4) + stopped the compilation if 'dl' or 'm' libraries or 'dlfcn.h' or 'math.h' are not found + linked gldi to 'dl' - Progress bar: Cairo Backend: no longer drawn the bar if the value is 0 (was drawn only on the Cairo backend) - Fixed a crash if we launch the dock with '-l debug' and if a module is not loaded (e.g. 'integration' modules) - include: can no longer be included directly since LibRSVG 2.36.2 - Class manager: handle custom .desktop files located in ~/.local/share/applications - Dialogs: fixed a small offset in the position of a dialog above its icon when the dock is hidden - Class Mgr: translations of QuickList menus are generally available in their Gettext domain (this info is available in the .desktop file) - Themes: updated themes folder, defined it in CMakeList.txt - Taskbar: fixed a bug that inserted an extra separator when grouping applis togather in a sub-dock - Menu: moved all window management entries to a submenu * debian/control: - Bump Cairo-Dock Plug-ins versions -- Matthieu Baerts (matttbe) Mon, 27 Aug 2012 15:17:48 +0200 cairo-dock (3.0.99.beta1-0ubuntu1) quantal; urgency=low * New upstream beta release. * Upstream ChangeLog (main changes): - Better integration of Unity: support of the Launcher API and better support of indicators - All configuration windows have been merged into a single one. - Added progress bars in several applets and in the Dbus API - The Music Player applet can control players in the systray. - Icons of the taskbar can be separated from launchers or not - And as always ... various bug fixes and improvements :-) * Fixed a few bugs reported on Launchpad: - A crash with logout applet (LP: #1033190) - Shortcuts do not accept Control key entries (LP: #1007539) * debian/custom_cairo-dock_badge.png, debian/source/include-binaries: - Added a badge for LightDM (LP: #987247) * debian/patches/cairo-dock-session_without_fallback_session.patch, debian/cairo-dock-data.install: - Only installed 'Cairo-Dock' session without Unity-2D and Metacity support due to the suppression of Unity-2D and the use of llvmpipe - Renamed 'Cairo-Dock (Gnome + Effects)' to 'Cairo-Dock (GNOME)' * debian/control: - Added a new suggested dependence for cairo-dock-core: gnome-session - Updated my email address * debian: Used 'wrap-and-sort' tool -- Matthieu Baerts (matttbe) Sun, 19 Aug 2012 00:15:54 +0200 cairo-dock (3.0.2-0ubuntu2) quantal; urgency=low * debian/apport/cairo-dock.py: ported to python3 (LP: #1013171) Thanks to Edward Donovan for the patch -- Matthieu Baerts (matttbe) Tue, 26 Jun 2012 12:50:23 +0200 cairo-dock (3.0.2-0ubuntu1) quantal; urgency=low * New upstream bug-fix release. (LP: #1014801) * Upstream ChangeLog (3.0.0 -> 3.0.1): - Dialogs: fixed a bug where the dock could auto-hide when a modal dialog was raised - Dialog: fixed a crash with gcc-4.7: the local variable can be corrupted due to optimisations - Fixed a bug where the dock didn't accept clicks when the mouse touches the screen edge (with auto-hide) - Added a compilation option to not force the display of icons in menus (design request but disable by default) - Fixed a bug where the hidden dock background color was not updated properly - Class-Manager: fixed a bug with Windows applications whose name is in upper case (.EXE) - GUI: use cairo_dock_get_xwindow_class to link a program with a launcher - French translations: fixed 2 small errors * Upstream ChangeLog (3.0.1 -> 3.0.2): - Main GUI: Fixed a crash when hovering group buttons too quickly - Main GUI: The dialog and preview didn't appear when hovering the button - Accelerators: On recent distro, 'Control' key is now called 'Primary' - Icon Mgr: Added a mutex because of occasional crashes with gtk_icon_theme_lookup_icon - Icon Mgr: Don't call a 'change-icon' callback when clicking or scrolling on an icon, and trigger an unneeded animation on the icon - Dock Mgr: Avoid emitting an 'enter' event when not needed - Class Mgr: Fixed 2 typos (special case for kdesu and not kdes) - Class Mgr: Remove launching options (%U) in quick-list Exec command (LP: #1002691) - Dialogues: Prevent closing the dialog unexpectedly when clicking on it, if the click is actually inside the interactive widget - Background: When set to 'always visible', applets' background couldn't be turned off - Added a workaround for the Unity-panel which has a wrong window type - po: Updated translations * debian/patches: - Removed all patches (now in upstream) * debian/cairo-dock-data: - Removed a lintian warning by added symlinks (binary-without-manpage) -- Matthieu Baerts (matttbe) Sat, 23 Jun 2012 14:25:10 -0400 cairo-dock (3.0.0.1-0ubuntu2) quantal; urgency=low * debian/patches/01-bzr_dock-s_menu.patch: don't hide the dock if it's raised and don't try to check if the mouse has left the dock if the menu is raised (LP: #988102) - It's an uptream patch (lp:cairo-dock-core/3.0 - rev 1070) * debian/patches/02-bzr_fixed_compilation_error.patch: - Fixed a compilation error with GLib >= 2.33 -- Matthieu Baerts (matttbe) Wed, 25 Apr 2012 01:29:46 +0200 cairo-dock (3.0.0.1-0ubuntu1) precise; urgency=low * New upstream release. (LP: #983288) * Upstream ChangeLog: - Updated translations - Themes: Renamed the default theme and move it to the new 'themes' directory - Included here our default-panel theme from our server in order to use this theme without an Internet connexion (this theme is highly recommended for the Cairo-Dock' session) - Moved 'battery' to cairo-dock-plug-ins - Theme manager: fixed the preview made when the current theme is saved - Fixed a bug with icons that are always visible (their alpha was not reseted correctly) - Fixed a bug that prevented the dock from hiding when leaving and re-entering quickly - Containers: set opacity to 0 on creation, so that we don't get grey rectangles on loading (before we receive the first X Expose event) + increase the size of default windows to avoid invisible icons LP: #960282 - When destroying a flying container, don't forget to detach the icon - Removed prints - Pango: only used the logical rectangle in order to avoid any deplacements - Draw: Icons always visible: limit the background margin to 1px, avoid icons to stick togather - Menu: disabled the Quit menu entry for all Cairo-Dock sessions (not only 'cairo-dock') - cairo-dock-session: only modify Compiz settings if '--replace' paramater is given - don't launch 'cairo-dock' if Cairo-Dock is already use only by current user - Session: Used shorter names (was too long for DM and we were not able to read the full name) - Used IsRunnableHelper to check if compiz can be launched or we have to use metacity (on Ubuntu) - The latest version of unity-2d-panel is now supported (it's no longer needed to modify config file with root rights or to kill a processus to have unity-2d-panel and Cairo-Dock) - cairo-dock.conf: fixed a typo (a wrong icon name) - initial-setup: no longer modify gconf keys of gnome settings (LP: #981092) - cairo-dock.c: initialised gettext before getopt in order to translate the output of 'cairo-dock -h' - Used the new name of the default theme - fixed the retrieval of the desktop background (was broken since the switch to GTK3) - Use the right web address of the themes' directory on our server. - Help.conf: removed lines which only contain 'TODO' and bump Help's version - fixed the drawing of multi-lines dialogs (sometime the text was invisible) - X manager: when receiving a NetDesktopGeometry signal from X notify everybody every time, and also update the number of viewports - Welcome message: replaced 'Cairo-Dock2' by 'Cairo-Dock' * This 3.0 series (and previous series) also fixes these bugs: - "glx-dock does not work with kde 4.8.1" (LP: #961048) - "the dock position is wrong when multiple monitor's resolution is different" (LP: #905912) - "GLX-Dock Hardware acc. UNDO!" (LP: #875975) - "Can't disable zoom" (LP: #702800) - "all button tips visible if icons 'maximum zoom' set to 1.0" (LP: #618336) - "create new sud-dock icon that looking like flat." (LP: #614686) - "Add custom launchers or sub-docks, can't modify name." (LP: #612617) - "no option in config file to set GL/Cairo mode" (LP: #612355) - "if I click on an icon a piece of plane disappears" (LP: #640398) - "icon labels go off-screen" (LP: #611733) - "Quick-Hide hides the dock forever" (LP: #580596) - "Hide when a window is maximized doesn't work if the taskbar is turned off" (LP: #580284) - "Incorrect Explanation in Help" (LP: #576069) - "xinerama:doc in one screen, subdocs in another" (LP: #540979) - "Click at the position where icon label was, the icon and dock still receive the event" (LP: #537115) - "ugly notifications with dialog boxes" (LP: #535083) - "Icons are being stacked" (LP: #526466) - "Separator not removed when closing grouped windows" (LP: #521369) - "dock appears under all windows after a full screen app is run" (LP: #518453) - "Icons aren't updated properly on configuring" (LP: #513212) - "xsession-errors log" (LP: #500677) - "Can't play videos in kaffeine, dragon player, gwenview and smplayer using the 'xv' driver after running cairo-dock" (LP: #475375) - "A little detail with the magnifier (hard to explain)" (LP: #420417) * debian/control: - Bump Standards-Version - cairo-dock-core: added 'compiz-plugins' as recommended (Compiz's DBus plugin can be used to have a better integration with the WM) -- Matthieu Baerts (matttbe) Mon, 16 Apr 2012 19:52:09 +0200 cairo-dock (3.0.0.0rc1-0ubuntu1) precise; urgency=low * New upstream release. (LP: #961578) * Upstream ChangeLog: (main changes) - Updated translations - Fixed the default theme (wrong sensitivity) - Fixed a small regression with the module loader - Added a modifier to display a widget in cairo or opengl only (an option for poor drivers) - Fixed a regression that made incorrect dock size in Parabolic view and the rendering of docks - Fixed a small bug in the advanced config window and fixed a memory leak - Avoid some 'unforseen consequences' when the icon theme changes - Copyright: Fixed a few typo with the licences - Advanced mode of the config panel: a few tweaks to get a better look - Fixed a bug where class container-icons were invisible - Added a workaround to fix a bug in Compiz (or X?) where down-sizing the screen resolution does not trigger the _NET_DESKTOP_GEOMETRY atom - Fixed a possible (although probably very rare) crash case with sub-docks - When entering a dock, update correctly the pointed icon to avoid animation on the previously pointed icon - Take into account the window border to compute the right window position and size - quick-info: reduce the background size to minimize their surface - GTK3: gdk_window_get_pointer and gdk_display_get_pointer functions are deprecated - GTK3: since the release of GTK 3.3.18, we have to add GDK_SCROLL_MASK to be notified with scroll events. - data-renderer: ensure the container's window has reached its correct size before drawing - resize the containers to 1x1 initially, to avoid seeing them before a correct size has been set - Icons from GTK themes: specify the right icons size in order to not load too detailed images for tiny icons sizes - Reduced the icon size in the advanced GUI window (32 -> 28) - Added cairo_dock_add_path_to_icon_theme and cairo_dock_remove_path_from_icon_theme to avoid useless icon loading - Handle the case where the icon tries to draw itself before the GL context is ready - Fixed the server adress in the simple GUI - A few code cleaning - Fixed a few details and tiny bugs (-> BZR logs) -- Matthieu Baerts (matttbe) Wed, 21 Mar 2012 21:00:24 +0100 cairo-dock (3.0.0.0beta1-0ubuntu1) precise; urgency=low * New upstream release. (LP: #932041) * Upstream (short) ChangeLog: - The taskbar has been greatly enhanced. - The control of the dock from the keyboard is now very powerful: - many shortkeys have been added in different applets - you can activate a launcher by pressing a shortkey + its number - all shortkeys can now be managed in a single place in the configuration window. - A new Twitter applet lets you tweet in one click. - A new applet to inhibit the screensaver in one click. - Cairo-Dock now uses GTK3, for a better integration in a Gnome desktop - It's possible to donate to support the project! - (...) * debian/patches: - Removed all previous patches (now in upstream) * debian/rules and debian/control: - Added multiarch support * debian/control: - libgtk-3-dev is now needed instead of libgtk2.0-dev - libgtkglext1-dev is no longer needed (replaced by libgl, libglu and libpango) - cairo-dock: increase the version of plug-ins packages and added: cairo-dock-plug-ins-dbus-interface-python - cairo-dock-dev has been replaced by libgldi-dev and dependences have been updated - Added a new package (libgldi3) in order to support multiarch and to fix this lintian error: package-name-doesnt-match-sonames * debian/cairo-dock-core.install and debian/libgldi3.install: - libgldi3 package has been added - It contains the library used by cairo-dock - MultiArch is supported * debian/cairo-dock-dev.install and debian/libgldi-dev.install: - cairo-dock-dev has been replaced by libgldi-dev * Updated debian/watch -- Matthieu Baerts (matttbe) Thu, 16 Feb 2012 01:08:11 +0200 cairo-dock (2.4.0~2-0ubuntu1) oneiric; urgency=low [ Matthieu Baerts (matttbe) ] * New upstream bug fix release. (LP: #859982) * Upstream (short) ChangeLog (2.4.0~0beta2 -> 2.4.0~1): - Improved support of the new Gnome 3 session (to avoid conflicts with the new Gnome-Panel). - Code cleaned and re-organised a few functions (e.g. with cairo-dock-overlay, cairo-dock.c, etc.) - Updating translations - Improved the support of XFCE and LXDE environments - Removed invalid launcher desktop files - Used a default icon if the path set by the user is wrong - Fixed the possibility to sticky a desklet (bug due to a Xorg update) - GUI: fixed the list-entry widget - Fixed support of the Widget Layer in Compiz >= 0.9 - Compiz type filter: replaced type=utility by type=Utility - Fixed a small refresh bug in cairo mode (with icons that are always visible) - Improved the placement of icons when avoiding the mouse (when something is being dropped onto the dock) - Updated the default theme in order to use new applications - Gauge implementation: Rewritten to use CairoDockImageBuffer and fixed the problem with png images - Graphs: Improved the drawing and added more precisions - Improved the 'lock' option description - GUI simple: fixed a bad update of the parameters when switching back to the previous value - Fixed the path of the preview for the default view - Help: Fixed the problem with tips - Default-theme: .conf files: fixed lintian warnings - Fixed a few warnings at the compilation - Removed a few useless output messages - Fixed these LP bugs: + Cairo-dock corrupts Kdenlive monitor display LP: #729970 + Can't play videos in kaffeine LP: #475375 - And fixed a lot of tiny bugs, please have a look to bzr logs. * Upstream (short) ChangeLog (2.4.0~1 -> 2.4.0~2): - Fixed a bug with the detection of compiz plugins - doc: used the right version - Fixed a possible crash with an empty dock LP: #861725 - FlyingContainer: draw the icon correctly * debian/patches: - Removed 01-musicPlayer_with_banshee: now in upstream * debian/copyright: - Updated and fixed lintian warnings: old-fsf-address-in-copyright-file * debian/rules and debian/cairo-dock-data.install: - Added support of the new Gnome 3 session. * debian/control: - Fixed lintian warning: description-synopsis-starts-with-article - Fixed lintian error: version-substvar-for-external-package * debian/cairo-dock-data.lintian-overrides: - Removed old warnings (fixed) - Added binary-without-manpage (custom scripts used) * debian/cairo-dock-core.install and debian/cairo-dock-dev.install: - Fixed a lintian warning: non-dev-pkg-with-shlib-symlink * debian/patches/01-improved-cairo-dock-session.patch: - Improved the launch of our Cairo-Dock session (by removing Unity Compiz plugin and by launching the dock with a short delay) - Fixed lintian error: shell-script-fails-syntax-check (it seems I made wrong manipulation with vim...) * debian/patches/02-manpage-not-compressed-with-max-compression.patch: - Fixed this lintian error: manpage-not-compressed-with-max-compression -- Iain Lane Tue, 11 Oct 2011 10:53:26 +0100 cairo-dock (2.4.0~0beta2-0ubuntu1) oneiric; urgency=low * New upstream release. (LP: #823513) * Upstream (short) ChangeLog: - A new Help applet has been added to help our beloved user. - Improved integration in the XFCE and LXDE desktop. - Improved the classifying of our files in the source code and in share/cairo-dock directory. - Launchers and applications now uses the linked .desktop file. - Fixed a few bugs as usual * debian/patches: - Removed 01-default_theme_with_default_apps (now in upstream). - Added 01-musicPlayer_with_banshee in order to use Banshee instead of Rhythmbox for the default music player. * debian/control: - Bump Standard-Version to 3.9.2. - Removed gawk from the build dependences list (no longer needed). -- Matthieu Baerts (matttbe) Tue, 09 Aug 2011 21:39:42 +0200 cairo-dock (2.3.0~3-0ubuntu1) oneiric; urgency=low * New upstream release. (LP: #799773) * Upstream ChangeLog: - Fixed a crash that occurs when the MP applet is in desklet mode and applets separated from launchers and the music-player is launched. (LP: #797273) * debian/patches: - Removed 02-mouse-leaves-on-the-edge_upstream-version-2.3.0~2.1.patch (now in the upstream release) -- Matthieu Baerts (matttbe) Mon, 20 Jun 2011 16:55:12 +0200 cairo-dock (2.3.0~2-0ubuntu1) oneiric; urgency=low * New upstream release. (LP: #786104) * Upstream ChangeLog: - Fixed a crash that occured when a class sub-dock was destroyed (LP: #773280) - Fixed a major bug where the dock couldn't re-appear after a menu has been triggerd from outside the dock (ie, from a shortcut) * debian/patches: - Added an upstream's patch to fix an annoying bug when we slowly leave the dock with the cursor on the edge of it -- Matthieu Baerts (matttbe) Sat, 21 May 2011 21:03:26 +0200 cairo-dock (2.3.0~1-0ubuntu1) natty; urgency=low * New Upstream Version (LP: #723994) * Upstream short ChangeLog: - Updated translations - Updated the integration of the new versions of kwin and compiz - Updated default theme - Fixed a few bugs - Updated the man * debian/control: - Added suggests apps for cairo-dock-core (needed by the default theme) - Updated the description (from launchpad.net/cairo-dock) - Added cairo-dock-plug-ins as a new suggestion for cairo-dock-core * debian/patches: - Updated the default theme to use default apps of Ubuntu Natty * Switch to dpkg-source 3.0 (quilt) format * Removed the desktop-file-category patch (sync with debian packages) * debian/rules: - Added a CMake flag to disable the gtk grip - No longer used simple-patchsys * Updated the debian/watch -- Matthieu Baerts (matttbe) Thu, 17 Mar 2011 14:08:48 +0100 cairo-dock (2.2.0~4-0ubuntu1) maverick; urgency=low * New Upstream Version (LP: #653702) * Fixed a few bugs: - Fixed a random crash if CD is launched much time before the WM - Improved the OpenGL backend. - Some Images paths were wrong - Icon label text was truncated (LP: #611738) - Fixed a bug when the font was too big - Gauges: Add a line return in order to read all Readme file - Dialogues don't respect selected font (LP: #518628) * data/help.conf.in: - Removed the Gnome-Panel: Used the right gconf key -- Matthieu Baerts (matttbe) Wed, 06 Oct 2010 19:23:03 +0200 cairo-dock (2.2.0~2-0ubuntu1) maverick; urgency=low * New Upstream Version (LP: #638527) * Fixed a few bugs: - Third-party applets can be deleted if the user switch to offline - Fixed a crash when changing the theme - Fixed transparency for data-renderer texts - Installed in lib/ directory by default for 64bits architecture - Fixed the name of applets in the launchers config panel - Fixed address of third-party applets in the menu - Code cleaning. * Updated Translations * debian/patches - Updated 01-desktop-file-category.patch (desktop files has changed) * data/messages: Removed an useless file * Removed a few useless excecution rights. -- Matthieu Baerts (matttbe) Sat, 18 Sep 2010 14:17:48 +0200 cairo-dock (2.2.0~0rc1-0ubuntu1) maverick; urgency=low * New Upstream Version (LP: #632055) * Fixed a few bugs on LP: - LP: #618336 all button tips visible if icons 'maximum zoom' set to 1.0 - LP: #614686 create new sud-dock icon that looking like flat - LP: #612617 Add custom launchers or sub-docks, can't modify name. - LP: #612355 Add option in config file to set GL/Cairo mode - LP: #611733 icon labels go off-screen * Fixed a crash when changing theme or gauges * Updated translations -- Matthieu Baerts (matttbe) Tue, 07 Sep 2010 20:31:25 +0200 cairo-dock (2.2.0~0beta4-0ubuntu1) maverick; urgency=low * New Upstream Version (LP: #614624) * Fixed a few bugs on LP: - LP: #518453: Dock appears under all windows (Compiz - fullscreen window) - LP: #521369: Separator are not removed when closing grouped windows - LP: #521762: Some sentences are not correct - LP: #526466: Icons of apps with same class shouldn't be stacked by default - LP: #535083: Dialogues looks ugly when a lot of them appears at the same time - More details on the 'ChangeLog' file * debian/rules: - Autotools has been replaced by CMake - Man pages are now included in the source code * debian/copyright: - Updated with the new pathes and new files * debian/control: - Autotools has been replaced by CMake - Added libcurl4-gnutls-dev as Build-deps - Bump Standard-Version to 3.9.1 * debian/cairo-dock-core.install: - Man pages are now included in the source code - All sonames are now installed into lib32 or lib64 * debian/cairo-dock-dev.install: - pkgconfig is now installed into lib32 or lib64 -- Matthieu Baerts (matttbe) Mon, 09 Aug 2010 23:26:12 +0200 cairo-dock (2.1.3-10-lucid-0ubuntu1) lucid; urgency=low [ Matthieu Baerts (matttbe) ] * New Upstream Version (LP: #568083). * Fixed some bugs: - Fixed a important crash when read several xml data - LP: #521167 Cairo-dock crashes by theme changing - Fixed a bug with desklets buttons - Used icons of the system - Fixed a bug when removing a container with OpenGL backend - Fixed some typo on some define - Fixed a little bug in the drag motion - Reduced the disk access for SSD disk * Used the official Ubuntu Lucid theme. [ Iain Lane ] * debian/watch: Update to match current upstream version -- Matthieu Baerts (matttbe) Tue, 20 Apr 2010 02:44:22 +0200 cairo-dock (2.1.3-6-0ubuntu1) lucid; urgency=low [ Matthieu Baerts (matttbe) ] * New Upstream Version. (LP: #521534) * Updated debian/watch and debian/copyright with LP account. * Removed debian/patches/02-merge-changelog.patch' - data/ChangeLog.txt has to respect a syntax and is used by CD. * debian/cairo-dock.1: - Updated with the latest release. - The domain name 'cairo-dock.org' has changed to 'glx-dock.org' * debian/control: - Changed the homepage and other links (glx-dock.org) - Updated cairo-dock-dev architecture to 'all' (it no longer contains compiled files) * debian/cairo-dock-dev.install - libcairo-dock.a and libcairo-dock.so no longer exist * debian/rules - removed uneeded changelog file * Updated debian/patches/01-desktop-file-category.patch [ Didier Roche ] * Fix debian/watch * Fix some issue in versionning * debian/control: clean the packaging and add right -plugins depends -- Matthieu Baerts (matttbe) Mon, 01 Mar 2010 21:24:00 +0100 cairo-dock (2.0.9-0ubuntu1) karmic; urgency=low [ Matthieu Baerts (matttbe) ] * New Upstream Version. (LP: #435587) * Added apport hook in debian/apport - Add debian/apport - debian/cairo-dock-core.install: Added debian/apport/cairo-dock.py * Use .desktop provided by upstream - Removed debian/*.desktop - debian/cairo-dock-core.install: install upstream desktop files. [ Julien Lavergne ] * Adjust debian/changelog with Daniel Holbach suggestions. * debian/patches/01_rename_cairo-dock-package-theme.patch: drop, merged upstream. * debian/patches/01-desktop-file-category.patch: - Remove Encoding field and set category to Utility. * debian/patches/02-merge-changelog.patch: - Merge ChangeLog and ChangeLog-2.0.9. * debian/apport: Remove commands with grep, python doesn't like it. -- Julien Lavergne Sun, 04 Oct 2009 16:33:52 +0200 cairo-dock (2.0.8.1-0ubuntu1) karmic; urgency=low [ Matthieu Baerts (matttbe) ] * New Upstream Version. * debian/control: - Remove cairo-dock as depends for cairo-dock-data * Update the man page * Rename cairo-dock -> cairo-dock-core * Add a new meta-package (cairo-dock) for cairo-dock-core and cairo-dock-plug-ins * Add licences [ Didier Roche ] * Repackage to have a separated diff.gz (as debian/ directory is not in upstream bz2) * debian/rules: - install manpage in cairo-dock-core - remove uneeded dh_desktop call * debian/control: - add ${misc:Depends} to cairo-dock to fix lintian warning - fix typos and wrong description usage - bump Standard-Version to 3.8.3 * debian/cairo-dock.install: removed * debian/cairo-dock-core.install: add destkop file there * debian/debian/cairo-dock-data.install: add some missing files and renamed cairo-dock-package-theme.sh to cairo-dock-package-theme * Add debian/cairo-dock-data.lintian-overrides as plugin config file uses a shebang (upstream warned) * add debian/patches/01_rename_cairo-dock-package-theme.patch (upstream will apply it next time) * debian/cairo-dock-dev.install: remove .la file -- Didier Roche Wed, 26 Aug 2009 17:13:42 +0200 cairo-dock (2.0.5-0ubuntu1) karmic; urgency=low * New Upstream Version. (LP: #390053) * debian/rules: - Drop autoreconf call, it's fixed upstream. - Call dh_desktop for all desktop files. * debian/control: - Add libgtkglext1-dev as depends for cairo-dock-dev. -- Julien Lavergne Sat, 20 Jun 2009 23:46:54 +0200 cairo-dock (2.0.3-0ubuntu1) karmic; urgency=low [ Andrew Starr-Bochicchio ] * New upstream release. (LP: #375125) * debian/control: Bump Standards-Version * debian/rules: Call autoreconf - config.status should create po/stamp-it but does not, causing an infinite loop in the build, probably due to upstream using an older version of intltool. Hopefully this can be dropped with next release. [ Julien Lavergne ] * debian/control : - Replace libglitz build-depends by libxrender-dev, libxcomposite-dev, libgtkglext1-dev and libxinerama-dev. - Add missing ${misc:Depends} for cairo-dock-dev. * debian/cairo-dock-cairo.desktop - New desktop file to launch the non-OpenGL version. * debian/cairo-dock-data.install : - Add new directorie usr/share/pixmaps - update to install both desktop files. -- Andrew Starr-Bochicchio Wed, 03 Jun 2009 20:39:11 -0400 cairo-dock (1.6.3.1-0ubuntu1) jaunty; urgency=low * New upstream release (LP: #297809). * debian/cairo-dock-data.install: - Update to new upstream installation. * debian/copyright - Update copyright of new files. -- Julien Lavergne Thu, 13 Nov 2008 22:04:19 +0100 cairo-dock (1.6.2.3-0ubuntu2) jaunty; urgency=low * debian/control: - Recommends xdotool (LP: #292864). * debian/cairo-dock.desktop: - Add a desktop file. * debian/cairo-dock.install: - Install the .desktop file. (LP: #296095). * debian/rules: - Register the desktop file. -- Julien Lavergne Tue, 11 Nov 2008 00:35:44 +0100 cairo-dock (1.6.2.3-0ubuntu1) intrepid; urgency=low * New upstream release. * debian/control - Update to 3.8.0 (no change needed). - Add libxtst-dev as Build-Depends. * debian/cairo-dock-data.install - Add usr/share/cairo-dock/emblems directory. * debian/watch - Update location. * debian/rules - Add a get-orig-source rule. -- Julien Lavergne Sun, 14 Sep 2008 16:26:12 +0200 cairo-dock (1.5.5.3-repack0-0ubuntu1) intrepid; urgency=low * Initial release (LP: #134091) * Repack original tarball to pack only cairo-dock and generate configure. -- Julien Lavergne Sun, 04 May 2008 17:16:20 +0200 debian/cairo-dock-data.install0000664000000000000000000000033312014010622013465 0ustar debian/custom_cairo-dock_badge.png usr/share/unity-greeter/ usr/bin/cairo-dock-session usr/share/cairo-dock/ usr/share/gnome-session/sessions/cairo-dock.session usr/share/pixmaps/ usr/share/xsessions/cairo-dock.desktop debian/watch0000664000000000000000000000014011743041045010213 0ustar version=3 https://launchpad.net/cairo-dock-core/+download .*/cairo-dock-([\d\.]+(?:.*)?).tar.gz debian/libgldi3.install0000664000000000000000000000002112014010622012226 0ustar usr/lib/*/*.so.* debian/cairo-dock-core.install0000664000000000000000000000024512115222452013516 0ustar debian/apport/cairo-dock.py usr/share/apport/package-hooks/ usr/bin/cairo-dock usr/lib/*/cairo-dock/libcd*.so usr/share/applications usr/share/locale usr/share/man/ debian/apport/0000775000000000000000000000000012320620257010474 5ustar debian/apport/cairo-dock.py0000664000000000000000000000251511772311536013073 0ustar '''apport package hook for cairo-dock (c) 2009 Author: Matthieu Baerts ''' from __future__ import print_function from apport.hookutils import * from os import path def add_info(report): # Build System Environment report['system'] = "distro = Ubuntu, architecture = %s, kernel = %s" % (command_output(['uname','-m']), command_output(['uname','-r'])) attach_related_packages(report, [ "xserver-xorg", "libgl1-mesa-glx", "libdrm2", "xserver-xorg-video-intel", "xserver-xorg-video-ati" ]) attach_file_if_exists(report, path.expanduser('~/.config/cairo-dock/current_theme/cairo-dock.conf'), 'CairoDockConf') # attach_hardware(report) # One-line description of display hardware report['PciDisplay'] = pci_devices(PCI_DISPLAY).split('\n')[0] # GLX report['glxinfo'] = command_output(['glxinfo']) # Compositing report['CompositingMetacity'] = command_output(['gconftool-2', '--get', '/apps/metacity/general/compositing_manager']) # WM report['WM'] = command_output(['gconftool-2', '--get', '/desktop/gnome/applications/window_manager/current']) ## DEBUGING ## if __name__ == '__main__': report = {} add_info(report) for key in report: print('[%s]\n%s' % (key, report[key])) debian/source/0000775000000000000000000000000012320620257010467 5ustar debian/source/format0000664000000000000000000000001411743041045011675 0ustar 3.0 (quilt) debian/source/include-binaries0000664000000000000000000000004311775110572013633 0ustar debian/custom_cairo-dock_badge.png debian/custom_cairo-dock_badge.png0000664000000000000000000000121411772372764014443 0ustar PNG  IHDRĴl;sRGBbKGDC pHYs  tIME#T4_ IDAT8˵=hA\ 9Dh@P.BJS4`)JR"!Z[BD!D['D" $ |yz7;;;l.` 6#5pROj権նfFW{ XSBC-Original-Maintainer: Matthieu Baerts (matttbe) , Julien Lavergne , Fabrice Rey Build-Depends: cdbs, cmake, debhelper (>= 8.1.3), libcairo2-dev, libcurl4-gnutls-dev, libdbus-glib-1-dev, libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev, libgtk-3-dev, libpango1.0-dev, librsvg2-dev, libxcomposite-dev, libxrandr-dev, libxml2-dev, libxrender-dev, libxtst-dev Standards-Version: 3.9.5 Homepage: http://www.glx-dock.org/ Package: cairo-dock Section: graphics Architecture: all Conflicts: cairo-dock (<= 2.0.8.0) Depends: cairo-dock-core (>= ${source:Version}), cairo-dock-plug-ins (>= 3.3.99.beta1.2.really.3.3.2), cairo-dock-plug-ins-dbus-interface-python (>= 3.3.99.beta1.2.really.3.3.2), cairo-dock-plug-ins-integration (>= 3.3.99.beta1.2.really.3.3.2), ${misc:Depends} Description: Light and eye-candy dock to launch your programs (metapackage) Cairo-Dock is a pretty, light and convenient interface to your desktop, able to replace advantageously your system panel! It features multi-docks, taskbar, launchers and a lot of useful applets. Applets can be detached from the dock to act as desktop widgets. Numerous ready-to-use themes are downloadable in 1 click, and can be easily customized at your convenience. It can use hardware acceleration to be very fast and low on CPU. . Some screenshots are available : http://pics.glx-dock.org Development site: https://launchpad.net/cairo-dock . This metapackage provides the components necessary for running Cairo-Dock. It provides the Cairo-Dock core, a set of standard plugins and the files necessary to integrate Cairo-Dock with your desktop environment. Package: cairo-dock-core Section: graphics Architecture: any Conflicts: cairo-dock (<= 2.0.8.0) Replaces: cairo-dock (<= 2.0.8.0) Depends: cairo-dock-data (>= ${source:Version}), libgldi3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Recommends: cairo-dock, cairo-dock-plug-ins, compiz-plugins | e17 | kde-window-manager | openbox | xfwm4 | mutter | marco | muffin, gnome-session | e17 | kde-workspace | openbox | lxsession-logout | xfce4-session | mate-desktop | cinnamon-session Suggests: compiz-plugins, gnome-session Description: Light and eye-candy dock to launch your programs (core package) Cairo-Dock is a pretty, light and convenient interface to your desktop, able to replace advantageously your system panel! It features multi-docks, taskbar, launchers and a lot of useful applets. Applets can be detached from the dock to act as desktop widgets. Numerous ready-to-use themes are downloadable in 1 click, and can be easily customized at your convenience. It can use hardware acceleration to be very fast and low on CPU. . Some screenshots are available : http://pics.glx-dock.org Development site: https://launchpad.net/cairo-dock . This package is the core of Cairo-Dock project. Package: libgldi-dev Section: libdevel Architecture: any Depends: libcairo2-dev, libcurl4-gnutls-dev, libdbus-glib-1-dev, libgl1-mesa-dev | libgl-dev, libgldi3 (= ${binary:Version}), libglib2.0-dev, libglu1-mesa-dev | libglu-dev, libgtk-3-dev, libpango1.0-dev, librsvg2-dev, libxcomposite-dev, libxrandr-dev, libxml2-dev, libxrender-dev, libxtst-dev, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Recommends: cairo-dock Multi-Arch: same Description: Light and eye-candy dock to launch your programs (dev package) Cairo-Dock is a pretty, light and convenient interface to your desktop, able to replace advantageously your system panel! It features multi-docks, taskbar, launchers and a lot of useful applets. Applets can be detached from the dock to act as desktop widgets. Numerous ready-to-use themes are downloadable in 1 click, and can be easily customized at your convenience. It can use hardware acceleration to be very fast and low on CPU. . Some screenshots are available : http://pics.glx-dock.org Development site: https://launchpad.net/cairo-dock . This package provides the include files and static library for cairo-dock functions. Package: cairo-dock-data Section: graphics Architecture: all Conflicts: cairo-dock (<= 2.0.8.0) Replaces: cairo-dock (<= 2.0.8.0) Depends: ${misc:Depends} Description: Light and eye-candy dock to launch your programs (common files) Cairo-Dock is a pretty, light and convenient interface to your desktop, able to replace advantageously your system panel! It features multi-docks, taskbar, launchers and a lot of useful applets. Applets can be detached from the dock to act as desktop widgets. Numerous ready-to-use themes are downloadable in 1 click, and can be easily customized at your convenience. It can use hardware acceleration to be very fast and low on CPU. . Some screenshots are available : http://pics.glx-dock.org Development site: https://launchpad.net/cairo-dock . This package contains default icons and themes for Cairo-Dock. Package: libgldi3 Section: graphics Architecture: any Conflicts: cairo-dock (<= 2.0.8.0) Replaces: cairo-dock (<= 2.0.8.0), cairo-dock-core (<< 3.0.0) Breaks: cairo-dock-core (<< 3.0.0) Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: cairo-dock-data (>= ${source:Version}) Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: Light and eye-candy dock to launch your programs (lib package) Cairo-Dock is a pretty, light and convenient interface to your desktop, able to replace advantageously your system panel! It features multi-docks, taskbar, launchers and a lot of useful applets. Applets can be detached from the dock to act as desktop widgets. Numerous ready-to-use themes are downloadable in 1 click, and can be easily customized at your convenience. It can use hardware acceleration to be very fast and low on CPU. . Some screenshots are available : http://pics.glx-dock.org Development site: https://launchpad.net/cairo-dock . This package contains the library created and used by the Cairo-Dock project. debian/compat0000664000000000000000000000000211743041045010365 0ustar 8 debian/cairo-dock-data.links0000664000000000000000000000011612013705560013151 0ustar usr/share/man/man1/cairo-dock.1.gz usr/share/man/man1/cairo-dock-session.1.gz debian/copyright0000664000000000000000000000544212014010622011114 0ustar X-Source-Downloaded-From: https://launchpad.net/cairo-dock X-Upstream-Author: Fabrice Rey . Files: src/* Copyright: Fabrice Rey Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence) * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * MA 02110-1301, USA. Files: src/gldit/cairo-dock-dbus.* Copyright: Adrien Pilleboue Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence) Files: src/gldit/cairo-dock-desklet.*, src/gldit/cairo-dock-keybinder.*, src/gldit/cairo-dock-log.* Copyright: Copyright (C) 2008 Cedric GESTES Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence) Files: src/gldit/egg* Copyright: Copyright (C) 2002 Red Hat, Inc.; Copyright 1998, 2001 Tim Janik Licence: GPL 2+ (See /usr/share/common-licenses/GPL-2 for complete licence) * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * MA 02110-1301, USA. Files: src/gldit/texture-gradation.h Copyright: Copyright (C) 2007 Gimp dev. Licence: GPL 2+ (See /usr/share/common-licenses/GPL-2 for complete licence) Files: data/*.svg, data/*.png Copyright: Humanity devs (some of them modified by Matthieu Baerts) Licence: GPL 3+ Files: data/default-theme/ data/man/ data/ Copyright: Matthieu Baerts Licence: LGPL Files: debian/* Copyright: Copyright (C) Julien Lavergne Licence: GPL 2+ (See /usr/share/common-licenses/GPL-2 for complete licence) Updated by Matthieu Baerts for new releases. debian/patches/0000775000000000000000000000000012320620257010616 5ustar debian/patches/bzr1684_Utils_Added_get_default_terminal.patch0000664000000000000000000000565512320257557021502 0ustar revno: 1684 committer: Matthieu Baerts branch nick: cairo-dock-core timestamp: Sat 2013-11-30 18:55:58 +0100 message: Utils: Added: 'get_default_terminal()' to get the default terminal Code from 'get_command_with_right_terminal()' This new function can be useful to just launch the default terminal (e.g. from the Terminal applet) === modified file 'src/gldit/cairo-dock-utils.c' Index: cairo-dock/src/gldit/cairo-dock-utils.c =================================================================== --- cairo-dock.orig/src/gldit/cairo-dock-utils.c 2014-04-06 15:53:21.264151580 +0200 +++ cairo-dock/src/gldit/cairo-dock-utils.c 2014-04-06 15:53:21.260151580 +0200 @@ -309,24 +309,27 @@ return TRUE; } -gchar * cairo_dock_get_command_with_right_terminal (const gchar *cCommand) +const gchar * cairo_dock_get_default_terminal (void) { - gchar *cFullCommand; const gchar *cTerm = g_getenv ("COLORTERM"); - if (cTerm != NULL && strlen (cTerm) > 1) // Filter COLORTERM=1 ou COLORTERM=y because we need the name of the terminal - cFullCommand = g_strdup_printf ("%s -e \"%s\"", cTerm, cCommand); + if (cTerm != NULL && strlen (cTerm) > 1) // Filter COLORTERM=1 or COLORTERM=y because we need the name of the terminal + return cTerm; else if (g_iDesktopEnv == CAIRO_DOCK_GNOME) - cFullCommand = g_strdup_printf ("gnome-terminal -e \"%s\"", cCommand); + return "gnome-terminal"; else if (g_iDesktopEnv == CAIRO_DOCK_XFCE) - cFullCommand = g_strdup_printf ("xfce4-terminal -e \"%s\"", cCommand); + return "xfce4-terminal"; else if (g_iDesktopEnv == CAIRO_DOCK_KDE) - cFullCommand = g_strdup_printf ("konsole -e \"%s\"", cCommand); + return "konsole"; else if ((cTerm = g_getenv ("TERM")) != NULL) - cFullCommand = g_strdup_printf ("%s -e \"%s\"", cTerm, cCommand); + return cTerm; else - cFullCommand = g_strdup_printf ("xterm -e \"%s\"", cCommand); + return "xterm"; +} - return cFullCommand; +gchar * cairo_dock_get_command_with_right_terminal (const gchar *cCommand) +{ + const gchar *cTerm = cairo_dock_get_default_terminal (); + return g_strdup_printf ("%s -e \"%s\"", cTerm, cCommand); } Index: cairo-dock/src/gldit/cairo-dock-utils.h =================================================================== --- cairo-dock.orig/src/gldit/cairo-dock-utils.h 2014-04-06 15:53:21.264151580 +0200 +++ cairo-dock/src/gldit/cairo-dock-utils.h 2014-04-06 15:53:21.260151580 +0200 @@ -63,6 +63,12 @@ gboolean cairo_dock_launch_command_full (const gchar *cCommand, const gchar *cWorkingDirectory); #define cairo_dock_launch_command(cCommand) cairo_dock_launch_command_full (cCommand, NULL) +/** Get the command to launch the default terminal + */ +const gchar * cairo_dock_get_default_terminal (void); +/** Get the command to launch another one from a terminal + * @param cCommand command to launch from a terminal + */ gchar * cairo_dock_get_command_with_right_terminal (const gchar *cCommand); /* Like g_strcmp0, but saves a function call. debian/patches/bzr1720_gsettings_can_have_quotes.patch0000664000000000000000000000244512320260044020260 0ustar revno: 1720 committer: Fabrice Rey branch nick: cairo-dock-core timestamp: Sun 2014-02-23 01:33:57 +0100 message: style: handle the case where font_name in gsettings has quotes Index: cairo-dock/src/gldit/cairo-dock-config.c =================================================================== --- cairo-dock.orig/src/gldit/cairo-dock-config.c 2014-04-06 15:53:23.148151482 +0200 +++ cairo-dock/src/gldit/cairo-dock-config.c 2014-04-06 15:53:23.144151483 +0200 @@ -645,8 +645,19 @@ if (s_cFontName == NULL) { if (g_iDesktopEnv == CAIRO_DOCK_GNOME) - s_cFontName = cairo_dock_launch_command_sync ("gconftool-2 -g /desktop/gnome/interface/font_name"); /// ou document_font_name ?... - else + { + s_cFontName = cairo_dock_launch_command_sync ("gconftool-2 -g /desktop/gnome/interface/font_name"); // GTK2 + if (! s_cFontName) + { + s_cFontName = cairo_dock_launch_command_sync ("gsettings get org.gnome.desktop.interface font-name"); // GTK3 + if (s_cFontName && *s_cFontName == '\'') // the value may be between quotes... get rid of them! + { + s_cFontName ++; // s_cFontName is never freeed + s_cFontName[strlen(s_cFontName) - 1] = '\0'; + } + } + } + if (! s_cFontName) s_cFontName = g_strdup ("Sans 10"); } return g_strdup (s_cFontName); ././@LongLink0000644000000000000000000000016500000000000011605 Lustar rootrootdebian/patches/bzr1708-1709_Utils_Cmd_with_right_terminal_and_theme_packager_support_and_exception_for_konsole.patchdebian/patches/bzr1708-1709_Utils_Cmd_with_right_terminal_and_theme_packager_support_and_exception_f0000664000000000000000000000372712320257646031225 0ustar revno: 1709 committer: Matthieu Baerts branch nick: cairo-dock-core timestamp: Thu 2014-01-02 20:06:23 +0100 message: Utils: Cmd with right terminal: added an exception for 'konsole' From konsole's man pages: '-e [ arguments ]' (without quotes around the command) revno: 1708 committer: Matthieu Baerts branch nick: cairo-dock-core timestamp: Thu 2014-01-02 17:55:58 +0100 message: Theme: Pkg: Cmd: used simple quotes instead of double quotes in the second cmd === modified file 'src/gldit/cairo-dock-themes-manager.c' Index: cairo-dock/src/gldit/cairo-dock-themes-manager.c =================================================================== --- cairo-dock.orig/src/gldit/cairo-dock-themes-manager.c 2014-04-06 15:53:21.640151561 +0200 +++ cairo-dock/src/gldit/cairo-dock-themes-manager.c 2014-04-06 15:53:21.636151561 +0200 @@ -311,7 +311,7 @@ if (bScriptFound) { int r; - gchar *cCommand = g_strdup_printf ("%s '%s' \"%s\"", + gchar *cCommand = g_strdup_printf ("%s '%s' '%s'", cPackageBuilderPath, cNewThemeName, cDirPath); gchar *cFullCommand = cairo_dock_get_command_with_right_terminal (cCommand); r = system (cFullCommand); // we need to wait... Index: cairo-dock/src/gldit/cairo-dock-utils.c =================================================================== --- cairo-dock.orig/src/gldit/cairo-dock-utils.c 2014-04-06 15:53:21.640151561 +0200 +++ cairo-dock/src/gldit/cairo-dock-utils.c 2014-04-06 15:53:21.636151561 +0200 @@ -329,7 +329,13 @@ gchar * cairo_dock_get_command_with_right_terminal (const gchar *cCommand) { const gchar *cTerm = cairo_dock_get_default_terminal (); - return g_strdup_printf ("%s -e \"%s\"", cTerm, cCommand); + /* Very very strange, an exception for KDE! :-) + * From konsole's man: -e [ arguments ] + */ + if (strncmp (cTerm, "konsole", 7) == 0) + return g_strdup_printf ("%s -e %s", cTerm, cCommand); + else + return g_strdup_printf ("%s -e \"%s\"", cTerm, cCommand); } debian/patches/bzr1670_Default_themes_Disable_icon-effects.patch0000664000000000000000000000406512320257525022044 0ustar revno: 1670 committer: Matthieu Baerts branch nick: cairo-dock-core timestamp: Tue 2013-10-29 10:54:15 +0100 message: Default themes: disable icon-effects: maybe a bit 'too much' for the current trend === modified file 'data/themes/default-theme-panel/cairo-dock.conf' === modified file 'data/themes/default-theme-panel/cairo-dock.conf' Index: cairo-dock/data/themes/default-theme-panel/cairo-dock.conf =================================================================== --- cairo-dock.orig/data/themes/default-theme-panel/cairo-dock.conf 2014-04-06 15:53:20.880151600 +0200 +++ cairo-dock/data/themes/default-theme-panel/cairo-dock.conf 2014-04-06 15:53:20.876151600 +0200 @@ -292,7 +292,7 @@ #{Let empty if you don't need to log-in to the proxy with a user/password.} conn passwd= -modules=switcher;GMenu;logout;Animated icons;Status-Notifier;Remote-Control;AlsaMixer;Calendar;Indicator-Generic;Recent-Events;Messaging Menu;icon effects;musicPlayer;dnd2share;Clipper;illusion;showDesktop;clock;Quick Browser;PowerManager;Help;shortcuts +modules=switcher;GMenu;logout;Animated icons;Status-Notifier;Remote-Control;AlsaMixer;Calendar;Indicator-Generic;Recent-Events;Messaging Menu;musicPlayer;dnd2share;Clipper;illusion;showDesktop;clock;Quick Browser;PowerManager;Help;shortcuts [Background] Index: cairo-dock/data/themes/default-theme/cairo-dock.conf =================================================================== --- cairo-dock.orig/data/themes/default-theme/cairo-dock.conf 2014-04-06 15:53:20.880151600 +0200 +++ cairo-dock/data/themes/default-theme/cairo-dock.conf 2014-04-06 15:53:20.876151600 +0200 @@ -277,7 +277,7 @@ #{Let empty if you don't need to log-in to the proxy with a user/password.} conn passwd= -modules=switcher;dnd2share;illusion;logout;showDesktop;shortcuts;Quick Browser;GMenu;Recent-Events;Animated icons;icon effects;Scooby-Do;musicPlayer;Help;Remote-Control +modules=switcher;dnd2share;illusion;logout;showDesktop;shortcuts;Quick Browser;GMenu;Recent-Events;Animated icons;Scooby-Do;musicPlayer;Help;Remote-Control [Background] debian/patches/bzr1719_unblacklist_intel_hd4000.patch0000664000000000000000000000461212320260016017517 0ustar revno: 1719 committer: Matthieu Baerts branch nick: cairo-dock-core timestamp: Thu 2014-02-20 19:19:21 +0100 message: GLX: blacklist Intel HD4000: this bug is now fixed when using Mesa 10.1. Great news :-) I will not remove the blacklist for previous Mesa versions now because some Mesa <= 10.0 users which still have this bug are using the Cairo backend thanks to this blacklist === modified file 'src/implementations/cairo-dock-glx.c' Index: cairo-dock/src/implementations/cairo-dock-glx.c =================================================================== --- cairo-dock.orig/src/implementations/cairo-dock-glx.c 2014-04-06 15:57:27.784138790 +0200 +++ cairo-dock/src/implementations/cairo-dock-glx.c 2014-04-06 16:00:08.576130448 +0200 @@ -43,19 +43,21 @@ #define _gldi_container_get_Xid(pContainer) GDK_WINDOW_XID (gldi_container_get_gdk_window(pContainer)) +// Mesa 10.1 is used in Ubuntu Trusty, no need to blacklist the Intel 4000HD :-) +/* static gboolean _is_blacklisted (const gchar *cVersion, const gchar *cVendor, const gchar *cRenderer) { - if (strstr (cVersion, "3.0 Mesa") != NULL // affect all versions and latest seen with the bug was: 3.0 Mesa 9.1.4 (July 13) - && strstr (cVendor, "Intel Open Source Technology Center") != NULL - && strstr (cRenderer, "Mesa DRI Intel(R) Ivybridge Mobile") != NULL) + if (strstr (cRenderer, "Mesa DRI Intel(R) Ivybridge Mobile") != NULL + && (strstr (cVersion, "Mesa 9") != NULL // affect all versions <= 10.0 + || strstr (cVersion, "Mesa 10.0") != NULL) + && strstr (cVendor, "Intel Open Source Technology Center") != NULL) { - cd_warning ("%s Intel 4000 HD Ivybridge Mobile.\n %s https://bugs.freedesktop.org/show_bug.cgi?id=55036", - "This card is blacklisted due to a bug with your video drivers:", - "Please have a look there:"); + cd_warning ("This card is blacklisted due to a bug with your video drivers: Intel 4000 HD Ivybridge Mobile.\n Please install Mesa >= 10.1"); return TRUE; } return FALSE; } +*/ static inline gboolean _check_extension (const char *extName, const gchar *cExtensions) { @@ -365,7 +367,7 @@ cRenderer); // we need a context to use glGetString, this is why we did it now - if (! s_bForceOpenGL && _is_blacklisted (cVersion, cVendor, cRenderer)) + if (! s_bForceOpenGL) { cd_warning ("%s 'cairo-dock -o'\n" " OpenGL Version: %s\n OpenGL Vendor: %s\n OpenGL Renderer: %s", debian/patches/series0000664000000000000000000000067012320342261012032 0ustar bzr1670_Default_themes_Disable_icon-effects.patch bzr1684_Utils_Added_get_default_terminal.patch bzr1708-1709_Utils_Cmd_with_right_terminal_and_theme_packager_support_and_exception_for_konsole.patch bzr1714_change_default_img_dir_to_Images_dir_in_home.patch bzr1715-1716_File_Mgr_added_the_possibility_to_monitor_a_process.patch bzr1719_unblacklist_intel_hd4000.patch bzr1720_gsettings_can_have_quotes.patch session_desktopname_Unity.patch debian/patches/bzr1715-1716_File_Mgr_added_the_possibility_to_monitor_a_process.patch0000664000000000000000000001422212320257764026046 0ustar revno: 1716 committer: Matthieu Baerts branch nick: cairo-dock-core timestamp: Fri 2014-01-24 10:51:22 +0100 message: File Mgr: cairo_dock_fm_monitor_pid: added the possibility to monitor the process name (even if the PID is different) + used pidof instead of pgrep we can get the PID of more than one process with pidof and it can be useful to monitor a name instead of an ID: dpkg is launched a few time during an upgrade/install to unpack, (pre)configure, etc. revno: 1715 committer: Matthieu Baerts branch nick: cairo-dock-core timestamp: Tue 2014-01-21 23:22:15 +0100 message: File Mgr: added the possibility to monitor a process It can be useful if we want to be notified when apt/aptitude/dpkg has finished the installation of a program (for logout/gmenu) Note that it's not easy to be notified when a non child process is stopped... We can't use waitpid (not a child process) or monitor /proc/PID dir (or a file into it) with g_file_monitor, poll or inotify => it's not working... And for apt-get/dpkg, we can't monitor the lock file with fcntl because we need root rights to do that. Let's just check every 5 seconds if the PID is still running === modified file 'src/gldit/cairo-dock-file-manager.c' Index: cairo-dock/src/gldit/cairo-dock-file-manager.c =================================================================== --- cairo-dock.orig/src/gldit/cairo-dock-file-manager.c 2014-04-06 15:53:22.392151522 +0200 +++ cairo-dock/src/gldit/cairo-dock-file-manager.c 2014-04-06 15:53:22.384151522 +0200 @@ -17,8 +17,9 @@ * along with this program. If not, see . */ -#include -#include +#include // atoi +#include // memset +#include // stat #include "gldi-config.h" #include "cairo-dock-dock-factory.h" @@ -518,6 +519,81 @@ return TRUE; } + + /////////// + /// PID /// +/////////// + +int cairo_dock_fm_get_pid (const gchar *cProcessName) +{ + int iPID = -1; + gchar *cCommand = g_strdup_printf ("pidof %s", cProcessName); + gchar *cPID = cairo_dock_launch_command_sync (cCommand); + + if (cPID != NULL && *cPID != '\0') + iPID = atoi (cPID); + + g_free (cPID); + g_free (cCommand); + + return iPID; +} + +static gboolean _wait_pid (gpointer *pData) +{ + gboolean bCheckSameProcess = GPOINTER_TO_INT (pData[0]); + gchar *cProcess = pData[1]; + + // check if /proc/%d dir exists or the process is running + if ((bCheckSameProcess && ! g_file_test (cProcess, G_FILE_TEST_EXISTS)) + || (! bCheckSameProcess && cairo_dock_fm_get_pid (cProcess) == -1)) + { + GSourceFunc pCallback = pData[2]; + gpointer pUserData = pData[3]; + + pCallback (pUserData); + + // free allocated ressources just used for this function + g_free (cProcess); + g_free (pData); + + return FALSE; + } + + return TRUE; +} + +gboolean cairo_dock_fm_monitor_pid (const gchar *cProcessName, gboolean bCheckSameProcess, GSourceFunc pCallback, gboolean bAlwaysLaunch, gpointer pUserData) +{ + int iPID = cairo_dock_fm_get_pid (cProcessName); + if (iPID == -1) + { + if (bAlwaysLaunch) + pCallback (pUserData); + return FALSE; + } + + gpointer *pData = g_new (gpointer, 4); + pData[0] = GINT_TO_POINTER (bCheckSameProcess); + if (bCheckSameProcess) + pData[1] = g_strdup_printf ("/proc/%d", iPID); + else + pData[1] = g_strdup (cProcessName); + pData[2] = pCallback; + pData[3] = pUserData; + + /* It's not easy to be notified when a non child process is stopped... + * We can't use waitpid (not a child process) or monitor /proc/PID dir (or a + * file into it) with g_file_monitor, poll or inotify => it's not working... + * And for apt-get/dpkg, we can't monitor the lock file with fcntl because + * we need root rights to do that. + * Let's just check every 5 seconds if the PID is still running + */ + g_timeout_add_seconds (5, (GSourceFunc)_wait_pid, pData); + + return TRUE; +} + //////////// /// INIT /// //////////// Index: cairo-dock/src/gldit/cairo-dock-file-manager.h =================================================================== --- cairo-dock.orig/src/gldit/cairo-dock-file-manager.h 2014-04-06 15:53:22.392151522 +0200 +++ cairo-dock/src/gldit/cairo-dock-file-manager.h 2014-04-06 15:53:22.384151522 +0200 @@ -258,6 +258,26 @@ gboolean cairo_dock_copy_file (const gchar *cFilePath, const gchar *cDestPath); +/** Get process ID given its name + * @param cProcessName name of the process + * @return the PID if it exists or -1 + */ +int cairo_dock_fm_get_pid (const gchar *cProcessName); + +/** Monitor a process. Call a function when the process is no longer running + * @param cProcessName name(es) of the process(es) + * @param bCheckSameProcess TRUE to check if first match is running. FALSE to + * check every time if this process name is running even if it's not the + * same PID. + * @param pCallback function to call when the process is no longer running + * @param bAlwaysLaunch TRUE to launch the callback function even if the process + * is not running or if there is an error + * @param pUserData data to pass to pCallback + * @return FALSE if the process is not running or if there is an error + */ +gboolean cairo_dock_fm_monitor_pid (const gchar *cProcessName, gboolean bCheckSameProcess, GSourceFunc pCallback, gboolean bAlwaysLaunch, gpointer pUserData); + + void gldi_register_desktop_environment_manager (void); G_END_DECLS Index: cairo-dock/src/gldit/cairo-dock-icon-manager.c =================================================================== --- cairo-dock.orig/src/gldit/cairo-dock-icon-manager.c 2014-04-06 15:53:22.392151522 +0200 +++ cairo-dock/src/gldit/cairo-dock-icon-manager.c 2014-04-06 15:53:22.384151522 +0200 @@ -37,7 +37,6 @@ #include "cairo-dock-dock-manager.h" // gldi_icons_foreach_in_docks #include "cairo-dock-dialog-manager.h" // cairo_dock_remove_dialog_if_any #include "cairo-dock-data-renderer.h" // cairo_dock_remove_data_renderer_on_icon -#include "cairo-dock-file-manager.h" // cairo_dock_fm_remove_monitor_full #include "cairo-dock-animations.h" // cairo_dock_animation_will_be_visible #include "cairo-dock-dock-facility.h" // cairo_dock_update_dock_size #include "cairo-dock-icon-facility.h" // gldi_icons_foreach_of_type debian/patches/session_desktopname_Unity.patch0000664000000000000000000000167012320347144017111 0ustar From: Matthieu Baerts Date: Sun, 06 Apr 2014 23:23:21 +0200 Subject: [PATCH] Switch DesktopName to Unity Description: Switch DesktopName to Unity to also take advantage of patches added in some GNOME apps and specially made for Unity to avoid some behaviour designed only for Gnome-Shell (e.g. Nautilus, have indicators running, etc.). === modified file 'data/desktop-manager/gnome-session-3.8/cairo-dock.session' Index: cairo-dock/data/desktop-manager/gnome-session-3.8/cairo-dock.session =================================================================== --- cairo-dock.orig/data/desktop-manager/gnome-session-3.8/cairo-dock.session 2014-04-06 23:18:41.523386817 +0200 +++ cairo-dock/data/desktop-manager/gnome-session-3.8/cairo-dock.session 2014-04-06 23:18:41.515386818 +0200 @@ -1,4 +1,4 @@ [GNOME Session] Name=Cairo-Dock RequiredComponents=gnome-settings-daemon;compiz;cairo-dock; -DesktopName=GNOME +DesktopName=Unity debian/patches/bzr1714_change_default_img_dir_to_Images_dir_in_home.patch0000664000000000000000000000645212320257704024011 0ustar revno: 1714 committer: Matthieu Baerts branch nick: cairo-dock-core timestamp: Wed 2014-01-08 20:05:20 +0100 message: gldi: GUI: widget: file chooser: images: default directory is now ~/Images It's maybe better than '/usr/share/icons'. This old dir and '/usr/share/pixmaps' are now added in the shortcuts panel And do not add a preview widget when selecting a directory === modified file 'src/gldit/cairo-dock-gui-factory.c' Index: cairo-dock/src/gldit/cairo-dock-gui-factory.c =================================================================== --- cairo-dock.orig/src/gldit/cairo-dock-gui-factory.c 2014-04-06 15:53:22.024151541 +0200 +++ cairo-dock/src/gldit/cairo-dock-gui-factory.c 2014-04-06 15:53:22.016151541 +0200 @@ -762,19 +762,29 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + + // set the current folder to the current value in conf. const gchar *cFilePath = gtk_entry_get_text (pEntry); - gchar *cDirectoryPath = (cFilePath == NULL || *cFilePath != '/' ? - g_strdup (iFileType == 2 ? "/usr/share/icons" : g_getenv ("HOME")) : - g_path_get_dirname (cFilePath)); - //g_print (">>> on se place sur '%s'\n", cDirectoryPath); - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (pFileChooserDialog), cDirectoryPath); // set the current folder to the current value in conf. - g_free (cDirectoryPath); + if (cFilePath == NULL || *cFilePath != '/') + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (pFileChooserDialog), + iFileType == 2 ? + g_get_user_special_dir (G_USER_DIRECTORY_PICTURES) : + g_getenv ("HOME")); + else + { + gchar *cDirectoryPath = g_path_get_dirname (cFilePath); + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (pFileChooserDialog), + cDirectoryPath); + g_free (cDirectoryPath); + } gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (pFileChooserDialog), FALSE); - - // a preview - GtkWidget *pPreviewImage = gtk_image_new (); - gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (pFileChooserDialog), pPreviewImage); - g_signal_connect (GTK_FILE_CHOOSER (pFileChooserDialog), "update-preview", G_CALLBACK (_cairo_dock_show_image_preview), pPreviewImage); + if (iFileType == 2) // image: add shortcuts to icons of the system + { + gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (pFileChooserDialog), + "/usr/share/icons", NULL); + gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (pFileChooserDialog), + "/usr/share/pixmaps", NULL); + } // a filter GtkFileFilter *pFilter; @@ -785,12 +795,18 @@ gtk_file_filter_add_pattern (pFilter, "*"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (pFileChooserDialog), pFilter); } - if (iFileType == 0 || iFileType == 2) // images + if (iFileType != 1) // preview and images filter: not when selecting a directory { pFilter = gtk_file_filter_new (); gtk_file_filter_set_name (pFilter, _("Image")); gtk_file_filter_add_pixbuf_formats (pFilter); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (pFileChooserDialog), pFilter); + + // a preview + GtkWidget *pPreviewImage = gtk_image_new (); + gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (pFileChooserDialog), pPreviewImage); + g_signal_connect (GTK_FILE_CHOOSER (pFileChooserDialog), "update-preview", + G_CALLBACK (_cairo_dock_show_image_preview), pPreviewImage); } gtk_widget_show (pFileChooserDialog); debian/rules0000775000000000000000000000062012207134210010236 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 DH_ALWAYS_EXCLUDE=CVS:.bzr DEB_CMAKE_EXTRA_FLAGS += -Denable-desktop-manager=ON \ -DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk DEB_INSTALL_CHANGELOGS_ALL := ChangeLog DEB_BUILD_PARALLEL = yes get-orig-source: dh_testdir uscan --force-download --verbose --repack