fr.po

2015-06-15 20:03:33 +02:00
46 changed files with 6405 additions and 10305 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required( VERSION 2.6 )

 option( ENABLE_BATTERY "Enable battery status plugin" ON )
 option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme configurator for tint2" ON )
-option( ENABLE_EXAMPLES "Install additional tin2rc examples" ON )
+option( ENABLE_EXAMPLES "Install additional tin2rc examples" OFF )
 option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
 option( ENABLE_SN "Startup notification support" ON )
 option( ENABLE_ASAN "Build tint2 with AddressSanitizer" OFF )
@@ -23,7 +23,7 @@ pkg_check_modules( SN libstartup-notification-1.0>=0.12 )
 find_library( RT_LIBRARY rt )

 if( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )
-  message( FATAL_ERROR "Not all dependencies fulfilled. See https://gitlab.com/o9000/tint2/wikis/Install" )
+  message( FATAL_ERROR "Not all dependencies fulfilled. See https://code.google.com/p/tint2/wiki/Install" )
 endif( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )

 string( REPLACE ";" " " FLAGS_REPLACED "${IMLIB2_LDFLAGS}" )
@@ -33,8 +33,6 @@ if( NOT IMLIB_BUILD_WITH_X )
  message( FATAL_ERROR "Imlib is not built with X support" )
 endif( NOT IMLIB_BUILD_WITH_X )

-add_definitions( -D_GNU_SOURCE )
-
 include_directories( ${PROJECT_BINARY_DIR}
                     src
                     src/battery
@@ -44,7 +42,7 @@ include_directories( ${PROJECT_BINARY_DIR}
                     src/launcher
                     src/tooltip
                     src/util
-                     src/freespace
+					 src/freespace
                     ${X11_INCLUDE_DIRS}
                     ${PANGOCAIRO_INCLUDE_DIRS}
                     ${PANGO_INCLUDE_DIRS}
@@ -70,8 +68,8 @@ set( SOURCES src/config.c
             src/taskbar/taskbar.c
             src/taskbar/taskbarname.c
             src/tooltip/tooltip.c
-             src/freespace/freespace.c
-             src/util/area.c
+			 src/freespace/freespace.c
+			 src/util/area.c
             src/util/common.c
             src/util/strnatcmp.c
             src/util/timer.c
@@ -158,5 +156,5 @@ install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
 install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
 if( ENABLE_EXAMPLES )
  file( GLOB SAMPLEFILES sample/*.tint2rc )
-  install( FILES ${SAMPLEFILES} DESTINATION ${DATADIR}/tint2 )
+  install( FILES ${SAMPLEFILES} DESTINATION ${DOCDIR}/examples )
 endif( ENABLE_EXAMPLES )
--- a/13
+++ b/13
@@ -1,11 +1,8 @@
-2015-07-12 master
+2015-05-23 master
 - Note: the changes listed here are based on the previous release tint2 0.11, however some distributions (e.g. Debian)
  offered packages using newer commits and/or patches; thus from the user's perspective some of these features are
  already present. They are marked with '(already released by distros)'.
 - Major changes:
-  - Panel:
-  - Checks if a compositor is launched during the first 30 seconds after startup and if found, restarts the panel with
-    transparency enabled.
  - Launcher:
    - The launcher is now considered stable
    - Enhancement: SVG icon support
@@ -30,7 +27,7 @@
    - taskbar_hide_inactive_tasks
    - taskbar_sort_order
    - taskbar_name (already released by distros)
-    - task_align (already released by distros)
+	- task_align (already released by distros)
  - Launcher:
    - launcher* (already released by distros)
    - launcher_apps_dir (previously patched in by some distros)
@@ -73,7 +70,6 @@
    background of other icons;
  - a crash caused by a change that prevents Google Chrome (and possibly other misbehaving applications) from leaving a large
    number of empty icons in the system tray;
-  - a crash caused by the system tray code on computers with ATI cards;
  - the panel window had a shadow;
  - some ATI drivers return an extra monitor with size zero which should be ignored when using panel_monitor = all;
  - the battery applet was sometimes working incorrectly with certain laptop models (the battery applet stopped updating after
@@ -83,10 +79,7 @@
    application was started;
  - seconds were not updating in the clock;
  - tint2 hang triggered when an application started from the launcher was closed and startup notifications were enabled;
-  - tint2 may fail to process X events for a few seconds when a new icon is added to the system tray;
-  - the code that loads SVG icons was using a lot of memory;
-  - fixed occasional race at startup in detecting screen resolution changes;
-  - modified timer code to prevent some rare double-frees or duplicate timers.
+  - the code that loads SVG icons was using a lot of memory.

 2010-06-26
 - unhide tint2 panel when dragging something
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -7,4 +7,5 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr ../
 make
 sudo make install

-To see additional options you can set at the 'cmake' step, run 'cmake -L ../'
+To see additional options you can do after the cmake step a 'cmake -L ../'
+
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
-### New stable release: 0.12
+### New unstable release: 0.12-rc5
 Changes: https://gitlab.com/o9000/tint2/blob/master/ChangeLog

 Documentation: https://gitlab.com/o9000/tint2/wikis/home

 Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
-mkdir tint2-0.12
-cd tint2-0.12
-wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12' --output-document tint2-0.12.tar.gz
-tar -xzf tint2-0.12.tar.gz
+mkdir tint2-0.12-rc5
+cd tint2-0.12-rc5
+wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc5' --output-document tint2-0.12-rc5.tar.gz
+tar -xzf tint2-0.12-rc5.tar.gz
 cd tint2.git
 mkdir build
 cd build
@@ -17,12 +17,6 @@ make -j4
 ./tint2 &
 ./src/tint2conf/tint2conf &
 ```
-
-To install from source, also run (as root):
-```
-make install
-```
-
 Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedback is much appreciated.

 P.S. GitLab is now the official location of the tint2 project, migrated from Google Code, which is shutting down. In case you are wondering why not GitHub, BitBucket etc., we chose GitLab because it is open source, it is mature and works well, looks cool and has a very nice team.
--- a/README.source
+++ b/README.source
@@ -1,3 +1,4 @@
 DEPENDENCIES:
-cairo (with X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage, imlib2 (with X support)
-you might need -dev packages on Debian
+cairo (whit X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage imlib2 (with X support)
+you might need -dev packages on debian
+
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH TINT2 1 "2015-07-05"
+.TH TINT2 1 "2009-01-17"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -37,7 +37,7 @@ compliance with freedesktop specifications.
 .PP
 On the first startup tint2 creates a config file in $HOME/.config/tint2/tint2rc.
 .PP
-See the wiki page at https://gitlab.com/o9000/tint2/wikis/home for more information.
+See wiki page on http://code.google.com/p/tint2/wiki/Welcome for more information.
 .SH OPTIONS
 .TP
 .B \-c config-file
--- a/get_version.sh
+++ b/get_version.sh
@@ -1,6 +1,5 @@
 #!/bin/sh

-MAJOR=0.12
 DIRTY=""

 git update-index -q --ignore-submodules --refresh
@@ -30,8 +29,7 @@ then
    fi
 fi

-VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')")$DIRTY
-VERSION=$(echo "$VERSION" | sed 's/^v//')
+VERSION=$(git describe --exact-match 2>/dev/null || echo "0.11-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')")$DIRTY

 echo '#define VERSION_STRING "'$VERSION'"' > version.h
 echo $VERSION
--- a/sample/horizontal-dark-opaque.tint2rc
+++ b/sample/horizontal-dark-opaque.tint2rc
@@ -121,12 +121,8 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
 startup_notifications = 1
 launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop

 #-------------------------------------
 # Clock
--- a/sample/horizontal-dark-transparent.tint2rc
+++ b/sample/horizontal-dark-transparent.tint2rc
@@ -121,12 +121,8 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
 startup_notifications = 1
 launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop

 #-------------------------------------
 # Clock
--- a/sample/horizontal-light-opaque.tint2rc
+++ b/sample/horizontal-light-opaque.tint2rc
@@ -127,12 +127,8 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
 startup_notifications = 1
 launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop

 #-------------------------------------
 # Clock
--- a/sample/horizontal-light-transparent.tint2rc
+++ b/sample/horizontal-light-transparent.tint2rc
@@ -1,176 +0,0 @@
-#---- Generated by tint2conf e324 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Backgrounds
-# Background 1
-rounded = 0
-border_width = 1
-background_color = #eeeeee 0
-border_color = #bbbbbb 10
-
-# Background 2
-rounded = 5
-border_width = 0
-background_color = #eeeeee 4
-border_color = #cccccc 100
-
-# Background 3
-rounded = 5
-border_width = 1
-background_color = #dddddd 4
-border_color = #999999 100
-
-# Background 4
-rounded = 5
-border_width = 1
-background_color = #aa4400 100
-border_color = #aa7733 100
-
-# Background 5
-rounded = 2
-border_width = 1
-background_color = #ffffaa 100
-border_color = #999999 100
-
-# Background 6
-rounded = 2
-border_width = 1
-background_color = #eeeeee 4
-border_color = #cccccc 100
-
-# Background 7
-rounded = 2
-border_width = 1
-background_color = #dddddd 3
-border_color = #999999 100
-
-# Background 8
-rounded = 3
-border_width = 0
-background_color = #999999 4
-border_color = #cccccc 100
-
-#-------------------------------------
-# Panel
-panel_items = LTSC
-panel_size = 100% 32
-panel_margin = 0 0
-panel_padding = 4 2 4
-panel_background_id = 1
-wm_menu = 1
-panel_dock = 0
-panel_position = bottom center horizontal
-panel_layer = normal
-panel_monitor = all
-autohide = 0
-autohide_show_timeout = 0
-autohide_hide_timeout = 0.5
-autohide_height = 2
-strut_policy = follow_size
-panel_window_name = tint2
-disable_transparency = 0
-font_shadow = 0
-
-#-------------------------------------
-# Taskbar
-taskbar_mode = single_desktop
-taskbar_padding = 0 0 2
-taskbar_background_id = 0
-taskbar_active_background_id = 0
-taskbar_name = 1
-taskbar_hide_inactive_tasks = 0
-taskbar_hide_different_monitor = 0
-taskbar_name_padding = 6 3
-taskbar_name_background_id = 6
-taskbar_name_active_background_id = 7
-taskbar_name_font = sans bold 9
-taskbar_name_font_color = #ffffff 100
-taskbar_name_active_font_color = #ffffff 100
-taskbar_distribute_size = 1
-taskbar_sort_order = none
-task_align = left
-
-#-------------------------------------
-# Task
-task_text = 1
-task_icon = 1
-task_centered = 1
-urgent_nb_of_blink = 100000
-task_maximum_size = 140 35
-task_padding = 4 3 4
-task_font = sans 8
-task_tooltip = 1
-task_font_color = #ffffff 100
-task_icon_asb = 100 0 0
-task_background_id = 2
-task_active_background_id = 3
-task_urgent_background_id = 4
-task_iconified_background_id = 2
-mouse_left = toggle_iconify
-mouse_middle = none
-mouse_right = close
-mouse_scroll_up = prev_task
-mouse_scroll_down = next_task
-
-#-------------------------------------
-# System tray (notification area)
-systray_padding = 4 0 2
-systray_background_id = 0
-systray_sort = ascending
-systray_icon_size = 22
-systray_icon_asb = 100 0 0
-systray_monitor = 1
-
-#-------------------------------------
-# Launcher
-launcher_padding = 0 0 2
-launcher_background_id = 0
-launcher_icon_size = 22
-launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
-startup_notifications = 1
-launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
-
-#-------------------------------------
-# Clock
-time1_format = %H:%M
-time2_format = %A %d %B
-time1_font = sans bold 8
-time1_timezone = 
-time2_timezone = 
-time2_font = sans 7
-clock_font_color = #ffffff 100
-clock_padding = 1 0
-clock_background_id = 0
-clock_tooltip = 
-clock_tooltip_timezone = 
-clock_lclick_command = zenity --calendar --text ""
-clock_rclick_command = orage
-
-#-------------------------------------
-# Battery
-battery_low_status = 10
-battery_low_cmd = notify-send "battery low"
-bat1_font = sans 8
-bat2_font = sans 6
-battery_font_color = #ffffff 100
-battery_padding = 1 0
-battery_background_id = 0
-battery_hide = 101
-
-#-------------------------------------
-# Tooltip
-tooltip_show_timeout = 0.5
-tooltip_hide_timeout = 0.1
-tooltip_padding = 2 2
-tooltip_background_id = 5
-tooltip_font_color = #222222 100
-tooltip_font = sans 9
-
--- a/sample/tint2rc
+++ b/sample/tint2rc
@@ -59,12 +59,8 @@ launcher_icon_size = 18
 launcher_icon_asb = 100 0 0
 launcher_tooltip = 1
 startup_notifications = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop

 # Taskbar
 taskbar_mode = single_desktop
@@ -89,7 +85,7 @@ urgent_nb_of_blink = 100000
 task_icon_asb = 100 0 0
 task_active_icon_asb = 100 0 0
 task_urgent_icon_asb = 100 0 0
-task_iconified_icon_asb = 100 0 0
+task_iconified_icon_asb = 70 0 0

 # Fonts
 task_font = sans 8
@@ -117,7 +113,7 @@ time1_format = %H:%M
 time1_font = sans 8
 time2_format = %A %d %B
 time2_font = sans 7
-clock_font_color = #FFFFFF 100
+clock_font_color = #FFFFFF 90
 clock_padding = 1 0
 clock_background_id = 0
 clock_rclick_command = orage
@@ -136,7 +132,7 @@ battery_low_cmd = notify-send "battery low"
 battery_hide = 101
 bat1_font = sans 8
 bat2_font = sans 6
-battery_font_color = #FFFFFF 100
+battery_font_color = #FFFFFF 94
 battery_padding = 1 0
 battery_background_id = 0

--- a/sample/vertical-dark-opaque.tint2rc
+++ b/sample/vertical-dark-opaque.tint2rc
@@ -1,6 +1,4 @@
-#---- Generated by tint2conf 258e ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
+#---- Generated by tint2conf c113 ----
 #-------------------------------------
 # Backgrounds
 # Background 1
@@ -83,7 +81,6 @@ taskbar_name_font_color = #dddddd 100
 taskbar_name_active_font_color = #dddddd 100
 taskbar_distribute_size = 1
 taskbar_sort_order = none
-task_align = left

 #-------------------------------------
 # Task
@@ -122,15 +119,10 @@ launcher_padding = 0 0 2
 launcher_background_id = 0
 launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop

 #-------------------------------------
 # Clock
--- a/sample/vertical-dark-transparent.tint2rc
+++ b/sample/vertical-dark-transparent.tint2rc
@@ -121,12 +121,8 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
 startup_notifications = 1
 launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop

 #-------------------------------------
 # Clock
--- a/sample/vertical-light-opaque.tint2rc
+++ b/sample/vertical-light-opaque.tint2rc
@@ -127,12 +127,8 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
 startup_notifications = 1
 launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop

 #-------------------------------------
 # Clock
--- a/sample/vertical-light-transparent.tint2rc
+++ b/sample/vertical-light-transparent.tint2rc
@@ -1,176 +0,0 @@
-#---- Generated by tint2conf e324 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Backgrounds
-# Background 1
-rounded = 0
-border_width = 1
-background_color = #eeeeee 0
-border_color = #bbbbbb 10
-
-# Background 2
-rounded = 5
-border_width = 0
-background_color = #eeeeee 4
-border_color = #cccccc 100
-
-# Background 3
-rounded = 5
-border_width = 1
-background_color = #dddddd 4
-border_color = #999999 100
-
-# Background 4
-rounded = 5
-border_width = 1
-background_color = #aa4400 100
-border_color = #aa7733 100
-
-# Background 5
-rounded = 2
-border_width = 1
-background_color = #ffffaa 100
-border_color = #999999 100
-
-# Background 6
-rounded = 2
-border_width = 1
-background_color = #eeeeee 4
-border_color = #cccccc 100
-
-# Background 7
-rounded = 2
-border_width = 1
-background_color = #dddddd 3
-border_color = #999999 100
-
-# Background 8
-rounded = 3
-border_width = 0
-background_color = #999999 4
-border_color = #cccccc 100
-
-#-------------------------------------
-# Panel
-panel_items = CSTL
-panel_size = 100% 152
-panel_margin = 0 0
-panel_padding = 2 2 2
-panel_background_id = 1
-wm_menu = 1
-panel_dock = 0
-panel_position = bottom left vertical
-panel_layer = normal
-panel_monitor = all
-autohide = 0
-autohide_show_timeout = 0
-autohide_hide_timeout = 0.5
-autohide_height = 2
-strut_policy = follow_size
-panel_window_name = tint2
-disable_transparency = 0
-font_shadow = 0
-
-#-------------------------------------
-# Taskbar
-taskbar_mode = multi_desktop
-taskbar_padding = 0 0 2
-taskbar_background_id = 0
-taskbar_active_background_id = 0
-taskbar_name = 1
-taskbar_hide_inactive_tasks = 0
-taskbar_hide_different_monitor = 0
-taskbar_name_padding = 6 3
-taskbar_name_background_id = 6
-taskbar_name_active_background_id = 7
-taskbar_name_font = sans bold 9
-taskbar_name_font_color = #ffffff 100
-taskbar_name_active_font_color = #ffffff 100
-taskbar_distribute_size = 1
-taskbar_sort_order = none
-task_align = left
-
-#-------------------------------------
-# Task
-task_text = 1
-task_icon = 1
-task_centered = 0
-urgent_nb_of_blink = 100000
-task_maximum_size = 152 35
-task_padding = 4 3 4
-task_font = sans 8
-task_tooltip = 1
-task_font_color = #ffffff 100
-task_icon_asb = 100 0 0
-task_background_id = 2
-task_active_background_id = 3
-task_urgent_background_id = 4
-task_iconified_background_id = 2
-mouse_left = toggle_iconify
-mouse_middle = none
-mouse_right = close
-mouse_scroll_up = prev_task
-mouse_scroll_down = next_task
-
-#-------------------------------------
-# System tray (notification area)
-systray_padding = 0 0 2
-systray_background_id = 0
-systray_sort = ascending
-systray_icon_size = 22
-systray_icon_asb = 100 0 0
-systray_monitor = 1
-
-#-------------------------------------
-# Launcher
-launcher_padding = 0 0 2
-launcher_background_id = 0
-launcher_icon_size = 22
-launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
-startup_notifications = 1
-launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
-
-#-------------------------------------
-# Clock
-time1_format = %H:%M
-time2_format = %A %d %B
-time1_font = sans bold 9
-time1_timezone = 
-time2_timezone = 
-time2_font = sans 9
-clock_font_color = #ffffff 100
-clock_padding = 1 0
-clock_background_id = 0
-clock_tooltip = 
-clock_tooltip_timezone = 
-clock_lclick_command = zenity --calendar --text ""
-clock_rclick_command = orage
-
-#-------------------------------------
-# Battery
-battery_low_status = 10
-battery_low_cmd = notify-send "battery low"
-bat1_font = sans 8
-bat2_font = sans 6
-battery_font_color = #ffffff 100
-battery_padding = 1 0
-battery_background_id = 0
-battery_hide = 101
-
-#-------------------------------------
-# Tooltip
-tooltip_show_timeout = 0.5
-tooltip_hide_timeout = 0.1
-tooltip_padding = 2 2
-tooltip_background_id = 5
-tooltip_font_color = #222222 100
-tooltip_font = sans 9
-
--- a/src/launcher/apps-common.c
+++ b/src/launcher/apps-common.c
@@ -105,7 +105,6 @@ int read_desktop_file(const char *path, DesktopEntry *entry)
 	char *key, *value;
 	int i;

-	entry->path = strdup(path);
 	entry->name = entry->icon = entry->exec = NULL;

 	if ((fp = fopen(path, "rt")) == NULL) {
@@ -175,8 +174,7 @@ void free_desktop_entry(DesktopEntry *entry)
 	free(entry->name);
 	free(entry->icon);
 	free(entry->exec);
-	free(entry->path);
-	entry->name = entry->icon = entry->exec = entry->path = NULL;
+	entry->name = entry->icon = entry->exec = NULL;
 }

 void test_read_desktop_file()
--- a/src/launcher/apps-common.h
+++ b/src/launcher/apps-common.h
@@ -11,7 +11,6 @@ typedef struct DesktopEntry {
 	char *name;
 	char *exec;
 	char *icon;
-	char *path;
 } DesktopEntry;

 // Parses a line of the form "key = value". Modifies the line.
--- a/src/panel.c
+++ b/src/panel.c
@@ -549,7 +549,7 @@ void set_panel_properties(Panel *p)
 	memset(&wmhints, 0, sizeof(wmhints));
 	if (panel_dock) {
 		// Necessary for placing the panel into the dock on Openbox and Fluxbox.
-		// See https://gitlab.com/o9000/tint2/issues/465
+		// See https://code.google.com/p/tint2/issues/detail?id=465
 		wmhints.icon_window = wmhints.window_group = p->main_win;
 		wmhints.flags = StateHint | IconWindowHint;
 		wmhints.initial_state = WithdrawnState;
--- a/src/server.c
+++ b/src/server.c
@@ -284,7 +284,7 @@ void get_monitors()
 		if (res && res->ncrtc >= nbmonitor) {
 			// use xrandr to identify monitors (does not work with proprietery nvidia drivers)

-			// Workaround for issue https://gitlab.com/o9000/tint2/issues/353
+			// Workaround for issue https://code.google.com/p/tint2/issues/detail?id=353
 			// on some recent configs, XRRGetScreenResourcesCurrent returns a fantom monitor at last position
 			{
 				int i = res->ncrtc - 1;
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -52,12 +52,9 @@ int systray_max_icon_size;
 int systray_monitor;
 int chrono;
 int systray_composited;
-int systray_profile;
 // background pixmap if we render ourselves the icons
 static Pixmap render_background;

-const int min_refresh_period = 50;
-const int max_fast_refreshes = 5;

 void default_systray()
 {
@@ -70,7 +67,6 @@ void default_systray()
 	systray.area._on_change_layout = on_change_systray;
 	systray.area.size_mode = SIZE_BY_CONTENT;
 	systray.area._resize = resize_systray;
-	systray_profile = getenv("SYSTRAY_PROFILING") != NULL;
 }

 void cleanup_systray()
@@ -93,10 +89,10 @@ void init_systray()
 		return;

 	systray_composited = !server.disable_transparency && server.visual32 && server.colormap32;
-	fprintf(stderr, "Systray composited rendering %s\n", systray_composited ? "on" : "off");
+	printf("Systray composited rendering %s\n", systray_composited ? "on" : "off");

 	if (!systray_composited) {
-		fprintf(stderr, "systray_asb forced to 100 0 0\n");
+		printf("systray_asb forced to 100 0 0\n");
 		systray.alpha = 100;
 		systray.brightness = systray.saturation = 0;
 	}
@@ -129,8 +125,6 @@ void init_systray_panel(void *p)

 void draw_systray(void *obj, cairo_t *c)
 {
-	if (systray_profile)
-		fprintf(stderr, BLUE "[%f] %s:%d\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__);
 	if (systray_composited) {
 		if (render_background)
 			XFreePixmap(server.dsp, render_background);
@@ -144,8 +138,6 @@ void draw_systray(void *obj, cairo_t *c)

 int resize_systray(void *obj)
 {
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
 	Systraybar *sysbar = obj;
 	GSList *l;
 	int count;
@@ -163,7 +155,7 @@ int resize_systray(void *obj)
 			continue;
 		count++;
 	}
-	fprintf(stderr, BLUE "%s:%d number of icons = %d\n" RESET, __FUNCTION__, __LINE__, count);
+	//printf("count %d\n", count);

 	if (panel_horizontal) {
 		int height = sysbar->area.height - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
@@ -186,8 +178,6 @@ int resize_systray(void *obj)

 void on_change_systray (void *obj)
 {
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
 	// here, systray.area.posx/posy are defined by rendering engine. so we can calculate position of tray icon.
 	Systraybar *sysbar = obj;
 	if (sysbar->icons_per_column == 0 || sysbar->icons_per_row == 0)
@@ -213,8 +203,7 @@ void on_change_systray (void *obj)

 		traywin->y = posy;
 		traywin->x = posx;
-		if (systray_profile)
-			fprintf(stderr, "%s:%d win = %lu (%s), parent = %lu, x = %d, y = %d\n", __FUNCTION__, __LINE__, traywin->win, traywin->name, traywin->parent, posx, posy);
+		// printf("systray %d %d : pos %d, %d\n", traywin->parent, traywin->win, posx, posy);
 		traywin->width = sysbar->icon_size;
 		traywin->height = sysbar->icon_size;
 		if (panel_horizontal) {
@@ -248,8 +237,6 @@ void on_change_systray (void *obj)

 void start_net()
 {
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
 	if (net_sel_win) {
 		// protocol already started
 		if (!systray_enabled)
@@ -275,13 +262,13 @@ void start_net()
 		_NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
 		int ret = XGetWindowProperty(server.dsp, win, _NET_WM_PID, 0, 1024, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop);

-		fprintf(stderr, RED "tint2 : another systray is running");
+		fprintf(stderr, "tint2 : another systray is running");
 		if (ret == Success && prop) {
 			pid = prop[1] * 256;
 			pid += prop[0];
 			fprintf(stderr, " pid=%d", pid);
 		}
-		fprintf(stderr, "\n" RESET);
+		fprintf(stderr, "\n");
 		return;
 	}

@@ -302,13 +289,11 @@ void start_net()
 	XSetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN, net_sel_win, CurrentTime);
 	if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != net_sel_win) {
 		stop_net();
-		fprintf(stderr, RED "tint2 : can't get systray manager\n" RESET);
+		fprintf(stderr, "tint2 : can't get systray manager\n");
 		return;
 	}

-	fprintf(stderr, GREEN "tint2 : systray started\n" RESET);
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+	//fprintf(stderr, "tint2 : systray started\n");
 	XClientMessageEvent ev;
 	ev.type = ClientMessage;
 	ev.window = server.root_win;
@@ -323,40 +308,9 @@ void start_net()
 }


-void net_message(XClientMessageEvent *e)
-{
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
-	unsigned long opcode;
-	Window win;
-
-	opcode = e->data.l[1];
-	switch (opcode) {
-	case SYSTEM_TRAY_REQUEST_DOCK:
-		win = e->data.l[2];
-		if (win)
-			add_icon(win);
-		break;
-
-	case SYSTEM_TRAY_BEGIN_MESSAGE:
-	case SYSTEM_TRAY_CANCEL_MESSAGE:
-		// we don't show baloons messages.
-		break;
-
-	default:
-		if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA)
-			fprintf(stderr, "message from dockapp: %s\n", e->data.b);
-		else
-			fprintf(stderr, RED "SYSTEM_TRAY : unknown message type\n" RESET);
-		break;
-	}
-}
-
-
 void stop_net()
 {
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+	//fprintf(stderr, "tint2 : systray stopped\n");
 	if (systray.list_icons) {
 		// remove_icon change systray.list_icons
 		while(systray.list_icons)
@@ -376,11 +330,9 @@ void stop_net()
 gboolean error;
 int window_error_handler(Display *d, XErrorEvent *e)
 {
-	if (systray_profile)
-		fprintf(stderr, RED "[%f] %s:%d\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__);
 	error = TRUE;
 	if (e->error_code != BadWindow) {
-		fprintf(stderr, RED "systray: error code %d\n" RESET, e->error_code);
+		printf("systray: error code %d\n", e->error_code);
 	}
 	return 0;
 }
@@ -398,8 +350,20 @@ static gint compare_traywindows(gconstpointer a, gconstpointer b)

 	if (systray.sort == SYSTRAY_SORT_ASCENDING ||
 		systray.sort == SYSTRAY_SORT_DESCENDING) {
-		return g_ascii_strncasecmp(traywin_a->name, traywin_b->name, -1) *
-				(systray.sort == SYSTRAY_SORT_ASCENDING ? 1 : -1);
+		XTextProperty name_a, name_b;
+
+		if (XGetWMName(server.dsp, traywin_a->win, &name_a) == 0) {
+			return -1;
+		} else if (XGetWMName(server.dsp, traywin_b->win, &name_b) == 0) {
+			XFree(name_a.value);
+			return 1;
+		} else {
+			gint retval = g_ascii_strncasecmp((char*)name_a.value, (char*)name_b.value, -1) *
+						  (systray.sort == SYSTRAY_SORT_ASCENDING ? 1 : -1);
+			XFree(name_a.value);
+			XFree(name_b.value);
+			return retval;
+		}
 	}

 	if (systray.sort == SYSTRAY_SORT_LEFT2RIGHT ||
@@ -414,17 +378,7 @@ static gint compare_traywindows(gconstpointer a, gconstpointer b)

 gboolean add_icon(Window win)
 {
-	XTextProperty xname;
-	char *name;
-	if (XGetWMName(server.dsp, win, &xname)) {
-		name = strdup((char*)xname.value);
-		XFree(xname.value);
-	} else {
-		name = strdup("");
-	}
-
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, win, name);
+	TrayWindow *traywin;
 	Panel *panel = systray.area.panel;
 	int hide = 0;

@@ -447,56 +401,10 @@ gboolean add_icon(Window win)
 	GSList *l;
 	int num_empty_same_pid = 0;
 	for (l = systray.list_icons; l; l = l->next) {
-		TrayWindow *other = (TrayWindow*)l->data;
-		if (other->win == win) {
-			free(name);
+		if (((TrayWindow*)l->data)->win == win)
 			return FALSE;
-		}
-		if (!systray_composited) {
-			// Empty icon detection: we compare the contents of the icon with the contents of the panel pixmap.
-			// If any pixel is different, the icon is not empty.
-			imlib_context_set_visual(server.visual);
-			imlib_context_set_colormap(server.colormap);
-			imlib_context_set_drawable(other->win);
-			Imlib_Image image = imlib_create_image_from_drawable(0, 0, 0, other->width, other->height, 1);
-			if (image) {
-				imlib_context_set_drawable(panel->temp_pmap);
-				Imlib_Image bg = imlib_create_image_from_drawable(0, other->x, other->y, other->width, other->height, 1);
-				imlib_context_set_image(bg);
-				DATA32* data_bg = imlib_image_get_data_for_reading_only();
-				imlib_context_set_image(image);
-				imlib_image_set_has_alpha(other->depth > 24);
-				DATA32* data = imlib_image_get_data_for_reading_only();
-				int x, y;
-				int empty = 1;
-				for (x = 0; x < other->width && empty; x++) {
-					for (y = 0; y < other->height && empty; y++) {
-						DATA32 pixel = data[y * other->width + x];
-						DATA32 a = (pixel >> 24) & 0xff;
-						if (a == 0)
-							continue;
-
-						DATA32 rgb = pixel & 0xffFFff;
-						DATA32 pixel_bg = data_bg[y * other->width + x];
-						DATA32 rgb_bg = pixel_bg & 0xffFFff;
-						if (rgb != rgb_bg) {
-							fprintf(stderr, "Pixel: %x different from bg %x at pos %d %d\n", pixel, pixel_bg, x, y);
-							empty = 0;
-						}
-					}
-				}
-				other->empty = empty;
-				imlib_free_image_and_decache();
-				imlib_context_set_image(bg);
-				imlib_free_image_and_decache();
-				if (systray_profile)
-					fprintf(stderr, "[%f] %s:%d win = %lu (%s) empty = %d\n", profiling_get_time(), __FUNCTION__, __LINE__, other->win, other->name, other->empty);
-			}
-		}
-		if (pid && other->pid == pid) {
-			if (other->empty)
-				num_empty_same_pid++;
-		}
+		if (pid && ((TrayWindow*)l->data)->pid == pid && ((TrayWindow*)l->data)->empty)
+			num_empty_same_pid++;
 	}

 	// Remove empty icons if the application leaves behind more than 1
@@ -505,56 +413,46 @@ gboolean add_icon(Window win)
 		for (l = systray.list_icons; l; l = l->next) {
 			if (pid && ((TrayWindow*)l->data)->pid == pid && ((TrayWindow*)l->data)->empty) {
 				num_empty_same_pid++;
-				fprintf(stderr, RED "Removing tray icon %lu (%s) from misbehaving application with pid=%d (too many icons)\n" RESET, ((TrayWindow*)l->data)->win, ((TrayWindow*)l->data)->name, pid);
+				fprintf(stderr, "Removing tray icon %lu from misbehaving application with pid=%d\n", ((TrayWindow*)l->data)->win, pid);
 				remove_icon((TrayWindow*)l->data);
 				break;
 			}
 		}
 	}
+	//printf("add_icon: %d, pid %d, %d\n", win, pid, num_empty_same_pid);

 	// Create the parent window that will embed the icon
 	XWindowAttributes attr;
-	if (XGetWindowAttributes(server.dsp, win, &attr) == False) {
-		free(name);
+	if (XGetWindowAttributes(server.dsp, win, &attr) == False)
 		return FALSE;
-	}
 	unsigned long mask = 0;
 	XSetWindowAttributes set_attr;
 	Visual* visual = server.visual;
-	fprintf(stderr, GREEN "add_icon: %lu (%s), pid %d, %d, visual %p, colormap %lu, depth %d, width %d, height %d\n" RESET,
-			win, name, pid, num_empty_same_pid, attr.visual, attr.colormap, attr.depth, attr.width, attr.height);
-	if (server.disable_transparency) {
+	//printf("icon with depth: %d, width %d, height %d\n", attr.depth, attr.width, attr.height);
+	if (systray_composited || attr.depth != server.depth) {
+		visual = attr.visual;
+		set_attr.colormap = attr.colormap;
+		set_attr.background_pixel = 0;
+		set_attr.border_pixel = 0;
+		mask = CWColormap|CWBackPixel|CWBorderPixel;
+	} else {
 		set_attr.background_pixmap = ParentRelative;
 		mask = CWBackPixmap;
-		if (systray_composited || attr.depth != server.depth) {
-			visual = attr.visual;
-			set_attr.colormap = attr.colormap;
-			mask |= CWColormap;
-		}
-	} else {
-		if (systray_composited || attr.depth != server.depth) {
-			visual = attr.visual;
-			set_attr.background_pixel = 0;
-			set_attr.border_pixel = 0;
-			set_attr.colormap = attr.colormap;
-			mask = CWColormap|CWBackPixel|CWBorderPixel;
-		} else {
-			set_attr.background_pixmap = ParentRelative;
-			mask = CWBackPixmap;
-		}
 	}
 	Window parent = XCreateWindow(server.dsp, panel->main_win, 0, 0, 30, 30, 0, attr.depth, InputOutput, visual, mask, &set_attr);

 	// Add the icon to the list
-	TrayWindow *traywin = g_new0(TrayWindow, 1);
+	traywin = g_new0(TrayWindow, 1);
 	traywin->parent = parent;
 	traywin->win = win;
 	traywin->hide = hide;
 	traywin->depth = attr.depth;
 	// Reparenting is done at the first paint event when the window is positioned correctly over its empty background,
 	// to prevent graphical corruptions in icons with fake transparency
+	traywin->reparented = 0;
+	traywin->damage = 0;
+	traywin->empty = 0;
 	traywin->pid = pid;
-	traywin->name = name;
 	traywin->chrono = chrono;
 	chrono++;

@@ -566,29 +464,18 @@ gboolean add_icon(Window win)
 	else
 		systray.list_icons = g_slist_append(systray.list_icons, traywin);
 	systray.list_icons = g_slist_sort(systray.list_icons, compare_traywindows);
-
-	if (!traywin->hide && !panel->is_hidden)
-		XMapRaised(server.dsp, traywin->parent);
-	XSync(server.dsp, False);
-
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+	// printf("add_icon win %lx, %d\n", win, g_slist_length(systray.list_icons));

 	// Resize and redraw the systray
-	if (systray_profile)
-		fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__);
 	systray.area.resize = 1;
 	systray.area.redraw = 1;
 	panel->area.resize = 1;
 	panel_refresh = 1;
-	refresh_systray = 1;
 	return TRUE;
 }

 gboolean reparent_icon(TrayWindow *traywin)
 {
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
 	if (traywin->reparented)
 		return TRUE;

@@ -602,7 +489,7 @@ gboolean reparent_icon(TrayWindow *traywin)
 	XSync(server.dsp, False);
 	XSetErrorHandler(old);
 	if (error != FALSE) {
-		fprintf(stderr, RED "systray %d: cannot embed icon for window %lu (%s) parent %lu pid %d\n" RESET, __LINE__, traywin->win, traywin->name, traywin->parent, traywin->pid);
+		printf("systray %d: cannot embed icon for window %lu parent %lu pid %d\n", __LINE__, traywin->win, traywin->parent, traywin->pid);
 		remove_icon(traywin);
 		return FALSE;
 	}
@@ -615,11 +502,13 @@ gboolean reparent_icon(TrayWindow *traywin)
 	XSync(server.dsp, False);
 	XSetErrorHandler(old);
 	if (error != FALSE) {
-		fprintf(stderr, RED "systray %d: cannot embed icon for window %lu (%s) parent %lu pid %d\n" RESET, __LINE__, traywin->win, traywin->name, traywin->parent, traywin->pid);
+		printf("systray %d: cannot embed icon for window %lu parent %lu pid %d\n", __LINE__, traywin->win, traywin->parent, traywin->pid);
 		remove_icon(traywin);
 		return FALSE;
 	}

+	traywin->reparented = 1;
+
 	// Embed into parent
 	{
 		XEvent e;
@@ -641,12 +530,13 @@ gboolean reparent_icon(TrayWindow *traywin)
 		XSync(server.dsp, False);
 		XSetErrorHandler(old);
 		if (error != FALSE) {
-			fprintf(stderr, RED "systray %d: cannot embed icon for window %lu (%s) pid %d\n" RESET, __LINE__, traywin->win, traywin->name, traywin->pid);
+			printf("systray %d: cannot embed icon for window %lu pid %d\n", __LINE__, traywin->win, traywin->pid);
 			remove_icon(traywin);
 			return FALSE;
 		}
 	}

+	// Check if window was embedded
 	{
 		Atom acttype;
 		int actfmt;
@@ -657,22 +547,14 @@ gboolean reparent_icon(TrayWindow *traywin)
 		ret = XGetWindowProperty(server.dsp, traywin->win, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data);
 		if (ret == Success) {
 			if (data) {
-				if (nbitem >= 2) {
-					int hide = ((data[1] & XEMBED_MAPPED) == 0);
-					if (hide) {
-						// In theory we have to check the embedding with this and remove icons that refuse embedding.
-						// In practice we have no idea when the other application processes the event and accepts the embed so we cannot check without a race.
-						// Race can be triggered with PyGtk(2) apps.
-						//fprintf(stderr, RED "tint2: window refused embedding\n" RESET);
-						//remove_icon(traywin);
-						//XFree(data);
-						//return FALSE;
-					}
+				if (nbitem == 2) {
+					//hide = ((data[1] & XEMBED_MAPPED) == 0);
+					//printf("hide %d\n", hide);
 				}
 				XFree(data);
 			}
 		} else {
-			fprintf(stderr, RED "tint2 : xembed error\n" RESET);
+			fprintf(stderr, "tint2 : xembed error\n");
 			remove_icon(traywin);
 			return FALSE;
 		}
@@ -689,30 +571,20 @@ gboolean reparent_icon(TrayWindow *traywin)
 		XMapWindow(server.dsp, traywin->win);
 	if (!traywin->hide && !panel->is_hidden)
 		XMapRaised(server.dsp, traywin->parent);
-	XSync(server.dsp, False);

 	XMoveResizeWindow(server.dsp, traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height);
 	XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height);

-	XSync(server.dsp, False);
-
-	traywin->reparented = 1;
-
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
+	XFlush(server.dsp);

 	return TRUE;
 }

 void remove_icon(TrayWindow *traywin)
 {
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
-	Panel* panel = systray.area.panel;
-
 	// remove from our list
 	systray.list_icons = g_slist_remove(systray.list_icons, traywin);
-	fprintf(stderr, YELLOW "remove_icon: %lu (%s)\n" RESET, traywin->win, traywin->name);
+	printf("remove_icon: %lu\n", traywin->win);

 	XSelectInput(server.dsp, traywin->win, NoEventMask);
 	if (traywin->damage)
@@ -729,7 +601,6 @@ void remove_icon(TrayWindow *traywin)
 	XSync(server.dsp, False);
 	XSetErrorHandler(old);
 	stop_timeout(traywin->render_timeout);
-	free(traywin->name);
 	g_free(traywin);

 	// check empty systray
@@ -743,48 +614,60 @@ void remove_icon(TrayWindow *traywin)
 	if (count == 0)
 		hide(&systray.area);

-	// Resize and redraw the systray
-	if (systray_profile)
-		fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__);
+	// changed in systray
 	systray.area.resize = 1;
-	systray.area.redraw = 1;
-	panel->area.resize = 1;
 	panel_refresh = 1;
-	refresh_systray = 1;
 }

-void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
-{
-	if (systray_profile)
-		fprintf(stderr, "XConfigure event: win = %lu (%s), x = %d, y = %d, w = %d, h = %d\n",
-				traywin->win, traywin->name, e->xconfigure.x, e->xconfigure.y, e->xconfigure.width, e->xconfigure.height);
-	Panel* panel = systray.area.panel;

-	//fprintf(stderr, "move tray %d\n", traywin->x);
-	XMoveResizeWindow(server.dsp, traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height);
-	if (traywin->reparented) {
-		XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height);
-		// Trigger window repaint
-		stop_timeout(traywin->render_timeout);
-		traywin->render_timeout = add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
+void net_message(XClientMessageEvent *e)
+{
+	unsigned long opcode;
+	Window win;
+
+	opcode = e->data.l[1];
+	switch (opcode) {
+	case SYSTEM_TRAY_REQUEST_DOCK:
+		win = e->data.l[2];
+		if (win)
+			add_icon(win);
+		break;
+
+	case SYSTEM_TRAY_BEGIN_MESSAGE:
+	case SYSTEM_TRAY_CANCEL_MESSAGE:
+		// we don't show baloons messages.
+		break;
+
+	default:
+		if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA)
+			printf("message from dockapp: %s\n", e->data.b);
+		else
+			fprintf(stderr, "SYSTEM_TRAY : unknown message type\n");
+		break;
 	}
-	// Resize and redraw the systray
-	if (systray_profile)
-		fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__);
-	systray.area.resize = 1;
-	systray.area.redraw = 1;
-	panel->area.resize = 1;
-	panel_refresh = 1;
-	refresh_systray = 1;
 }

-void systray_destroy_event(TrayWindow *traywin)
+Display *display = NULL;
+XImage *tintXGetImage(Window win)
 {
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
-	remove_icon(traywin);
-}
+	char *display_name = XDisplayName(NULL);
+	if (!display_name)
+		return NULL;
+	if (!display)
+		display = XOpenDisplay(display_name);
+	if (!display)
+		return NULL;

+	unsigned int border_width;
+	int xpos, ypos;
+	unsigned int width, height, depth;
+	Window root;
+	if (!XGetGeometry(display, win, &root, &xpos, &ypos, &width, &height, &border_width, &depth)) {
+		fprintf(stderr, "Couldn't get geometry of window!\n");
+		return NULL;
+	}
+	return XGetImage(display, win, 0, 0, width, height, AllPlanes, XYPixmap);
+}

 void systray_render_icon_composited(void* t)
 {
@@ -792,32 +675,20 @@ void systray_render_icon_composited(void* t)
 	// we made also sure, that we always have a 32 bit visual, i.e. we can safely create 32 bit pixmaps here
 	TrayWindow* traywin = t;

-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
-
 	// wine tray icons update whenever mouse is over them, so we limit the updates to 50 ms
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
-	struct timespec earliest_render = add_msec_to_timespec(traywin->time_last_render, min_refresh_period);
-	if (compare_timespecs(&earliest_render, &now) > min_refresh_period) {
-		traywin->num_fast_renders++;
-		if (traywin->num_fast_renders > max_fast_refreshes) {
-			traywin->render_timeout = add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
-			if (systray_profile)
-				fprintf(stderr, YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
-			return;
-		}
-	} else {
-		traywin->time_last_render.tv_sec = now.tv_sec;
-		traywin->time_last_render.tv_nsec = now.tv_nsec;
-		traywin->num_fast_renders = 0;
+	struct timespec earliest_render = add_msec_to_timespec(traywin->time_last_render, 50);
+	if (compare_timespecs(&earliest_render, &now) > 0) {
+		traywin->render_timeout = add_timeout(50, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
+		return;
 	}
+	traywin->time_last_render.tv_sec = now.tv_sec;
+	traywin->time_last_render.tv_nsec = now.tv_nsec;

-	if (traywin->width == 0 || traywin->height == 0) {
+	if ( traywin->width == 0 || traywin->height == 0 ) {
 		// reschedule rendering since the geometry information has not yet been processed (can happen on slow cpu)
-		traywin->render_timeout = add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
-		if (systray_profile)
-			fprintf(stderr, YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
+		traywin->render_timeout = add_timeout(50, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
 		return;
 	}

@@ -826,25 +697,44 @@ void systray_render_icon_composited(void* t)
 		traywin->render_timeout = NULL;
 	}

-	{
-		// We shouldn't have to do this as we already listen for structure notify events.
-		// But things work fine so why change it.
-		unsigned int border_width;
-		int xpos, ypos;
-		unsigned int width, height, depth;
-		Window root;
-		if (!XGetGeometry(server.dsp, traywin->win, &root, &xpos, &ypos, &width, &height, &border_width, &depth)) {
-			fprintf(stderr, RED "Couldn't get geometry of window!\n" RESET);
-			return;
-		}
-		if (width != traywin->width || height != traywin->height || xpos != 0 || ypos != 0) {
+	int empty = 1;
+	XImage *ximage = tintXGetImage(traywin->win);
+	if (ximage) {
+		if (ximage->width != traywin->width ||
+			ximage->height != traywin->height) {
+			XFree(ximage);
+			XCloseDisplay(display);
+			display = NULL;
 			XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height);
-			traywin->render_timeout = add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
-			if (systray_profile)
-				fprintf(stderr, YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
 			return;
 		}
+		XColor color;
+		if (ximage->width > 0 && ximage->height > 0) {
+			color.pixel = XGetPixel(ximage, ximage->width/2, ximage->height/2);
+			if (color.pixel != 0)
+				empty = 0;
+			int x, y;
+			for (x = 0; empty && x < ximage->width; x++) {
+				for (y = 0; empty && y < ximage->height; y++) {
+					color.pixel = XGetPixel(ximage, x, y);
+					if (color.pixel != 0)
+						empty = 0;
+				}
+			}
+		}
+		XFree(ximage);
+		XCloseDisplay(display);
+		display = NULL;
 	}
+	if (traywin->empty != empty) {
+		traywin->empty = empty;
+		systray.area.resize = 1;
+		panel_refresh = 1;
+		systray.list_icons = g_slist_sort(systray.list_icons, compare_traywindows);
+	}
+	//printf("systray_render_icon_now: %d empty %d\n", traywin->win, empty);
+	if (empty)
+		return;

 	// good systray icons support 32 bit depth, but some icons are still 24 bit.
 	// We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and
@@ -856,7 +746,7 @@ void systray_render_icon_composited(void* t)
 	// drawable. If someone knows why it does not work with the traywindow itself, please tell me ;)
 	Pixmap tmp_pmap = XCreatePixmap(server.dsp, traywin->win, traywin->width, traywin->height, 32);
 	if (!tmp_pmap) {
-		goto on_systray_error;
+		goto on_error;
 	}
 	XRenderPictFormat *f;
 	if (traywin->depth == 24) {
@@ -864,14 +754,14 @@ void systray_render_icon_composited(void* t)
 	} else if (traywin->depth == 32) {
 		f = XRenderFindStandardFormat(server.dsp, PictStandardARGB32);
 	} else {
-		fprintf(stderr, RED "Strange tray icon found with depth: %d\n" RESET, traywin->depth);
+		printf("Strange tray icon found with depth: %d\n", traywin->depth);
 		XFreePixmap(server.dsp, tmp_pmap);
 		return;
 	}
 	XRenderPictFormat *f32 = XRenderFindVisualFormat(server.dsp, server.visual32);
 	if (!f || !f32) {
 		XFreePixmap(server.dsp, tmp_pmap);
-		goto on_systray_error;
+		goto on_error;
 	}

 	XSync(server.dsp, False);
@@ -919,14 +809,12 @@ void systray_render_icon_composited(void* t)
 	if (traywin->depth == 24) {
 		createHeuristicMask(data, traywin->width, traywin->height);
 	}
-
-	int empty = imageEmpty(data, traywin->width, traywin->height);
 	if (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
 		adjust_asb(data, traywin->width, traywin->height, systray.alpha, (float)systray.saturation/100, (float)systray.brightness/100);
 	imlib_image_put_back_data(data);
 	XCopyArea(server.dsp, render_background, systray.area.pix, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x-systray.area.posx, traywin->y-systray.area.posy);
 	render_image(systray.area.pix, traywin->x-systray.area.posx, traywin->y-systray.area.posy);
-	XCopyArea(server.dsp, systray.area.pix, panel->temp_pmap, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x, traywin->y);
+	XCopyArea(server.dsp, systray.area.pix, panel->main_win, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x, traywin->y);
 	imlib_free_image_and_decache();
 	XFreePixmap(server.dsp, tmp_pmap);
 	imlib_context_set_visual(server.visual);
@@ -934,37 +822,18 @@ void systray_render_icon_composited(void* t)

 	if (traywin->damage)
 		XDamageSubtract(server.dsp, traywin->damage, None, None);
+	XFlush(server.dsp);
+
 	XSync(server.dsp, False);
 	XSetErrorHandler(old);

 	if (error)
 		goto on_error;

-	if (traywin->empty != empty) {
-		traywin->empty = empty;
-		systray.list_icons = g_slist_sort(systray.list_icons, compare_traywindows);
-		// Resize and redraw the systray
-		if (systray_profile)
-			fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__);
-		systray.area.resize = 1;
-		systray.area.redraw = 1;
-		panel->area.resize = 1;
-		panel_refresh = 1;
-		refresh_systray = 1;
-	}
-
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
-
 	return;

 on_error:
-	fprintf(stderr, RED "systray %d: rendering error for icon %lu (%s) pid %d\n" RESET, __LINE__, traywin->win, traywin->name, traywin->pid);
-	return;
-
-on_systray_error:
-	fprintf(stderr, RED "systray %d: rendering error for icon %lu (%s) pid %d. "
-		   "Disabling compositing and restarting systray...\n" RESET, __LINE__, traywin->win, traywin->name, traywin->pid);
+	printf("systray: rendering error. Disabling compositing and restarting systray...\n");
 	systray_composited = 0;
 	stop_net();
 	start_net();
@@ -972,26 +841,14 @@ on_systray_error:
 }


-void systray_render_icon(void* t)
+void systray_render_icon(TrayWindow* traywin)
 {
-	TrayWindow* traywin = t;
-	if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
-	if (!traywin->reparented) {
-		if (!reparent_icon(traywin))
-			return;
-		if (systray_composited) {
-			// We need to process the events in the main loop first
-			stop_timeout(traywin->render_timeout);
-			traywin->render_timeout = add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
-			if (systray_profile)
-				fprintf(stderr, YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
-			return;
-		}
-	}
+	if (!reparent_icon(traywin))
+		return;

 	if (systray_composited) {
-		systray_render_icon_composited(traywin);
+		if (!traywin->render_timeout)
+			systray_render_icon_composited(traywin);
 	} else {
 		// Trigger window repaint
 		XClearArea(server.dsp, traywin->parent, 0, 0, traywin->width, traywin->height, True);
@@ -1000,10 +857,8 @@ void systray_render_icon(void* t)
 }


-void refresh_systray_icons()
+void refresh_systray_icon()
 {
-	if (systray_profile)
-		fprintf(stderr, BLUE "[%f] %s:%d\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__);
 	TrayWindow *traywin;
 	GSList *l;
 	for (l = systray.list_icons; l ; l = l->next) {
--- a/src/systray/systraybar.h
+++ b/src/systray/systraybar.h
@@ -48,9 +48,7 @@ typedef struct
 	int pid;
 	int chrono;
    struct timespec time_last_render;
-	int num_fast_renders;
 	int reparented;
-	char *name;
 } TrayWindow;


@@ -61,7 +59,6 @@ extern int refresh_systray;
 extern int systray_enabled;
 extern int systray_max_icon_size;
 extern int systray_monitor;
-extern int systray_profile;

 // default global data
 void default_systray();
@@ -87,10 +84,8 @@ void net_message(XClientMessageEvent *e);
 gboolean add_icon(Window id);
 void remove_icon(TrayWindow *traywin);

-void refresh_systray_icons();
-void systray_render_icon(void *t);
-void systray_reconfigure_event(TrayWindow *traywin, XEvent *e);
-void systray_destroy_event(TrayWindow *traywin);
+void refresh_systray_icon();
+void systray_render_icon(TrayWindow* traywin);
 void kde_update_icons();

 #endif
--- a/src/tint.c
+++ b/src/tint.c
@@ -20,7 +20,6 @@

 #include <sys/stat.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -59,43 +58,6 @@ Atom dnd_atom;
 int dnd_sent_request;
 char *dnd_launcher_exec;

-timeout* detect_compositor_timer = NULL;
-int detect_compositor_timer_counter = 0;
-
-void detect_compositor(void *arg)
-{
-	if (server.composite_manager) {
-		stop_timeout(detect_compositor_timer);
-		return;
-	}
-
-	detect_compositor_timer_counter--;
-	if (detect_compositor_timer_counter < 0) {
-		stop_timeout(detect_compositor_timer);
-		return;
-	}
-
-	// No compositor, check for one
-	if (XGetSelectionOwner(server.dsp, server.atom._NET_WM_CM_S0) != None) {
-		stop_timeout(detect_compositor_timer);
-		// Restart tint2
-		fprintf(stderr, "Detected compositor, restarting tint2...\n");
-		kill(getpid(), SIGUSR1);
-	}
-}
-
-void start_detect_compositor()
-{
-	// Already have a compositor, nothing to do
-	if (server.composite_manager)
-		return;
-
-	stop_timeout(detect_compositor_timer);
-	// Check every 0.5 seconds for up to 30 seconds
-	detect_compositor_timer_counter = 60;
-	detect_compositor_timer = add_timeout(500, 500, detect_compositor, 0, &detect_compositor_timer);
-}
-
 void signal_handler(int sig)
 {
 	// signal handler is light as it should be
@@ -203,7 +165,9 @@ static void sigchld_handler_async() {
 	while ((pid = waitpid(-1, NULL, WNOHANG)) > 0) {
 		SnLauncherContext *ctx;
 		ctx = (SnLauncherContext *) g_tree_lookup (server.pids, GINT_TO_POINTER (pid));
-		if (ctx) {
+		if (ctx == NULL) {
+			fprintf(stderr, "Unknown child %d terminated!\n", pid);
+		} else {
 			g_tree_remove (server.pids, GINT_TO_POINTER (pid));
 			sn_launcher_context_complete (ctx);
 			sn_launcher_context_unref (ctx);
@@ -239,9 +203,6 @@ void init_X11_pre_config()
 	// config file use '.' as decimal separator
 	setlocale(LC_NUMERIC, "POSIX");

-	/* Catch events */
-	XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
-
 	// get monitor and desktop config
 	get_monitors();
 	get_desktops();
@@ -263,11 +224,9 @@ void init_X11_post_config()
 		if (pipe(sn_pipe) != 0) {
 			fprintf(stderr, "Creating pipe failed.\n");
 		} else {
-			fcntl(sn_pipe[0], F_SETFL, O_NONBLOCK | fcntl(sn_pipe[0], F_GETFL));
-			fcntl(sn_pipe[1], F_SETFL, O_NONBLOCK | fcntl(sn_pipe[1], F_GETFL));
 			sn_pipe_valid = 1;
 			struct sigaction act;
-			memset(&act, 0, sizeof(struct sigaction));
+			memset (&act, 0, sizeof (struct sigaction));
 			act.sa_handler = sigchld_handler;
 			if (sigaction(SIGCHLD, &act, 0)) {
 				perror("sigaction");
@@ -280,6 +239,9 @@ void init_X11_post_config()
 	imlib_context_set_visual (server.visual);
 	imlib_context_set_colormap (server.colormap);

+	/* Catch events */
+	XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
+
 	// load default icon
 	gchar *path;
 	const gchar * const *data_dirs;
@@ -855,10 +817,8 @@ void event_expose (XEvent *e)
 }


-void event_configure_notify(XEvent *e)
+void event_configure_notify (Window win)
 {
-	Window win = e->xconfigure.window;
-
 	// change in root window (xrandr)
 	if (win == server.root_win) {
 		signal_pending = SIGUSR1;
@@ -871,7 +831,12 @@ void event_configure_notify(XEvent *e)
 	for (l = systray.list_icons; l ; l = l->next) {
 		traywin = (TrayWindow*)l->data;
 		if (traywin->win == win) {
-			systray_reconfigure_event(traywin, e);
+			//printf("move tray %d\n", traywin->x);
+			XMoveResizeWindow(server.dsp, traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height);
+			if (traywin->reparented)
+				XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height);
+			panel_refresh = 1;
+			refresh_systray = 1;
 			return;
 		}
 	}
@@ -1116,7 +1081,7 @@ int main (int argc, char *argv[])
 	int x11_fd, i;
 	Panel *panel;
 	GSList *it;
-	struct timeval* select_timeout;
+	struct timeval* timeout;
 	int hidden_dnd = 0;

 	// Make stdout/stderr flush after a newline (for some reason they don't even if tint2 is started from a terminal)
@@ -1140,7 +1105,6 @@ start:
 	}

 	init_X11_post_config();
-	start_detect_compositor();

 	init_panel();
 	if (snapshot_path) {
@@ -1168,32 +1132,32 @@ start:

 	while (1) {
 		if (panel_refresh) {
-			if (systray_profile)
-				fprintf(stderr, BLUE "[%f] %s:%d redrawing panel\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__);
 			panel_refresh = 0;

-			for (i = 0; i < nb_panel ;i++) {
+			for (i=0 ; i < nb_panel ; i++) {
 				panel = &panel1[i];

 				if (panel->is_hidden) {
 					XCopyArea(server.dsp, panel->hidden_pixmap, panel->main_win, server.gc, 0, 0, panel->hidden_width, panel->hidden_height, 0, 0);
 					XSetWindowBackgroundPixmap(server.dsp, panel->main_win, panel->hidden_pixmap);
-				} else {
-					if (panel->temp_pmap)
-						XFreePixmap(server.dsp, panel->temp_pmap);
+				}
+				else {
+					if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
 					panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
 					rendering(panel);
-					if (panel == (Panel*)systray.area.panel) {
-						if (refresh_systray && panel && !panel->is_hidden) {
-							refresh_systray = 0;
-							XSetWindowBackgroundPixmap(server.dsp, panel->main_win, panel->temp_pmap);
-							refresh_systray_icons();
-						}
-					}
 					XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
 				}
 			}
-			XFlush(server.dsp);
+			XFlush (server.dsp);
+
+			panel = (Panel*)systray.area.panel;
+			if (refresh_systray && panel && !panel->is_hidden) {
+				refresh_systray = 0;
+				// tint2 doen't draw systray icons. it just redraw background.
+				XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap);
+				// force icon's refresh
+				refresh_systray_icon();
+			}
 		}

 		// thanks to AngryLlama for the timer
@@ -1207,249 +1171,253 @@ start:
 		}
 		update_next_timeout();
 		if (next_timeout.tv_sec >= 0 && next_timeout.tv_usec >= 0)
-			select_timeout = &next_timeout;
+			timeout = &next_timeout;
 		else
-			select_timeout = 0;
+			timeout = 0;

 		// Wait for X Event or a Timer
-		if (XPending(server.dsp) > 0 || select(maxfd+1, &fdset, 0, 0, select_timeout) >= 0) {
-			if (sn_pipe_valid) {
+		if (select(maxfd+1, &fdset, 0, 0, timeout) > 0) {
+			if (FD_ISSET(sn_pipe[0], &fdset)) {
 				char buffer[1];
-				while (read(sn_pipe[0], buffer, sizeof(buffer)) > 0) {
-					sigchld_handler_async();
-				}
+				ssize_t wur = read(sn_pipe[0], buffer, 1);
+				(void) wur;
+				sigchld_handler_async();
 			}
-			while (XPending(server.dsp) > 0) {
-				XNextEvent(server.dsp, &e);
+			if (FD_ISSET(x11_fd, &fdset)) {
+				while (XPending (server.dsp)) {
+					XNextEvent(server.dsp, &e);
 #if HAVE_SN
-				if (startup_notifications)
-					sn_display_process_event(server.sn_dsp, &e);
+					if (startup_notifications)
+						sn_display_process_event(server.sn_dsp, &e);
 #endif // HAVE_SN

-				panel = get_panel(e.xany.window);
-				if (panel && panel_autohide) {
-					if (e.type == EnterNotify)
-						autohide_trigger_show(panel);
-					else if (e.type == LeaveNotify)
-						autohide_trigger_hide(panel);
-					if (panel->is_hidden) {
-						if (e.type == ClientMessage && e.xclient.message_type == server.atom.XdndPosition) {
-							hidden_dnd = 1;
-							autohide_show(panel);
+					panel = get_panel(e.xany.window);
+					if (panel && panel_autohide) {
+						if (e.type == EnterNotify)
+							autohide_trigger_show(panel);
+						else if (e.type == LeaveNotify)
+							autohide_trigger_hide(panel);
+						if (panel->is_hidden) {
+							if (e.type == ClientMessage && e.xclient.message_type == server.atom.XdndPosition) {
+								hidden_dnd = 1;
+								autohide_show(panel);
+							}
+							else
+								continue;   // discard further processing of this event because the panel is not visible yet
 						}
+						else if (hidden_dnd && e.type == ClientMessage && e.xclient.message_type == server.atom.XdndLeave) {
+							hidden_dnd = 0;
+							autohide_hide(panel);
+						}
+					}
+
+					switch (e.type) {
+					case ButtonPress:
+						tooltip_hide(0);
+						event_button_press (&e);
+						break;
+
+					case ButtonRelease:
+						event_button_release(&e);
+						break;
+
+					case MotionNotify: {
+						unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
+						if (e.xmotion.state & button_mask)
+							event_button_motion_notify (&e);
+
+						Panel* panel = get_panel(e.xmotion.window);
+						Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
+						if (area->_get_tooltip_text)
+							tooltip_trigger_show(area, panel, &e);
 						else
-							continue;   // discard further processing of this event because the panel is not visible yet
+							tooltip_trigger_hide();
+						break;
 					}
-					else if (hidden_dnd && e.type == ClientMessage && e.xclient.message_type == server.atom.XdndLeave) {
-						hidden_dnd = 0;
-						autohide_hide(panel);
-					}
-				}

-				switch (e.type) {
-				case ButtonPress:
-					tooltip_hide(0);
-					event_button_press (&e);
-					break;
-
-				case ButtonRelease:
-					event_button_release(&e);
-					break;
-
-				case MotionNotify: {
-					unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
-					if (e.xmotion.state & button_mask)
-						event_button_motion_notify (&e);
-
-					Panel* panel = get_panel(e.xmotion.window);
-					Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
-					if (area->_get_tooltip_text)
-						tooltip_trigger_show(area, panel, &e);
-					else
+					case LeaveNotify:
 						tooltip_trigger_hide();
-					break;
-				}
-
-				case LeaveNotify:
-					tooltip_trigger_hide();
-					break;
-
-				case Expose:
-					event_expose(&e);
-					break;
-
-				case PropertyNotify:
-					event_property_notify(&e);
-					break;
-
-				case ConfigureNotify:
-					event_configure_notify(&e);
-					break;
-
-				case ReparentNotify:
-					if (!systray_enabled)
 						break;
-					panel = (Panel*)systray.area.panel;
-					if (e.xany.window == panel->main_win) // reparented to us
+
+					case Expose:
+						event_expose(&e);
 						break;
-					// FIXME: 'reparent to us' badly detected => disabled
-					break;
-				case UnmapNotify:
-				case DestroyNotify:
-					if (e.xany.window == server.composite_manager) {
-						// Stop real_transparency
-						fprintf(stderr, "Detected compositor shutdown, restarting tint2...\n");
-						signal_pending = SIGUSR1;
+
+					case PropertyNotify:
+						event_property_notify(&e);
 						break;
-					}
-					if (e.xany.window == g_tooltip.window || !systray_enabled)
+
+					case ConfigureNotify:
+						event_configure_notify (e.xconfigure.window);
 						break;
-					for (it = systray.list_icons; it; it = g_slist_next(it)) {
-						if (((TrayWindow*)it->data)->win == e.xany.window) {
-							systray_destroy_event((TrayWindow*)it->data);
+
+					case ReparentNotify:
+						if (!systray_enabled)
 							break;
-						}
-					}
-					break;
-
-				case ClientMessage:
-					ev = &e.xclient;
-					if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
-						if (ev->data.l[2] == None)
+						panel = (Panel*)systray.area.panel;
+						if (e.xany.window == panel->main_win) // reparented to us
+							break;
+						// FIXME: 'reparent to us' badly detected => disabled
+						break;
+					case UnmapNotify:
+					case DestroyNotify:
+						if (e.xany.window == server.composite_manager) {
 							// Stop real_transparency
 							signal_pending = SIGUSR1;
-						else
-							// Start real_transparency
-							signal_pending = SIGUSR1;
-					}
-					if (systray_enabled && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
-						net_message(&e.xclient);
-					}
-					else if (e.xclient.message_type == server.atom.XdndEnter) {
-						dnd_enter(&e.xclient);
-					}
-					else if (e.xclient.message_type == server.atom.XdndPosition) {
-						dnd_position(&e.xclient);
-					}
-					else if (e.xclient.message_type == server.atom.XdndDrop) {
-						dnd_drop(&e.xclient);
-					}
-					break;
-
-				case SelectionNotify:
-				{
-					Atom target = e.xselection.target;
-
-					fprintf(stderr, "DnD %s:%d: A selection notify has arrived!\n", __FILE__, __LINE__);
-					fprintf(stderr, "DnD %s:%d: Requestor = %lu\n", __FILE__, __LINE__, e.xselectionrequest.requestor);
-					fprintf(stderr, "DnD %s:%d: Selection atom = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.selection));
-					fprintf(stderr, "DnD %s:%d: Target atom    = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, target));
-					fprintf(stderr, "DnD %s:%d: Property atom  = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.property));
-
-					if (e.xselection.property != None && dnd_launcher_exec) {
-						Property prop = read_property(server.dsp, dnd_target_window, dnd_selection);
-
-						//If we're being given a list of targets (possible conversions)
-						if (target == server.atom.TARGETS && !dnd_sent_request) {
-							dnd_sent_request = 1;
-							dnd_atom = pick_target_from_targets(server.dsp, prop);
-
-							if (dnd_atom == None) {
-								fprintf(stderr, "No matching datatypes.\n");
-							} else {
-								//Request the data type we are able to select
-								fprintf(stderr, "Now requsting type %s", GetAtomName(server.dsp, dnd_atom));
-								XConvertSelection(server.dsp, dnd_selection, dnd_atom, dnd_selection, dnd_target_window, CurrentTime);
+							break;
+						}
+						if (e.xany.window == g_tooltip.window || !systray_enabled)
+							break;
+						for (it = systray.list_icons; it; it = g_slist_next(it)) {
+							if (((TrayWindow*)it->data)->win == e.xany.window) {
+								remove_icon((TrayWindow*)it->data);
+								break;
 							}
-						} else if (target == dnd_atom) {
-							//Dump the binary data
-							fprintf(stderr, "DnD %s:%d: Data begins:\n", __FILE__, __LINE__);
-							fprintf(stderr, "--------\n");
-							int i;
-							for (i = 0; i < prop.nitems * prop.format/8; i++)
-								fprintf(stderr, "%c", ((char*)prop.data)[i]);
-							fprintf(stderr, "--------\n");
+						}
+						break;

-							int cmd_length = 0;
-							cmd_length += 1; // (
-							cmd_length += strlen(dnd_launcher_exec) + 1; // exec + space
-							cmd_length += 1; // open double quotes
-							for (i = 0; i < prop.nitems * prop.format/8; i++) {
-								char c = ((char*)prop.data)[i];
-								if (c == '\n') {
-									if (i < prop.nitems * prop.format/8 - 1) {
-										cmd_length += 3; // close double quotes, space, open double quotes
-									}
-								} else if (c == '\r') {
+					case ClientMessage:
+						ev = &e.xclient;
+						if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
+							if (ev->data.l[2] == None)
+								// Stop real_transparency
+								signal_pending = SIGUSR1;
+							else
+								// Start real_transparency
+								signal_pending = SIGUSR1;
+						}
+						if (systray_enabled && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+							net_message(&e.xclient);
+						}
+						else if (e.xclient.message_type == server.atom.XdndEnter) {
+							dnd_enter(&e.xclient);
+						}
+						else if (e.xclient.message_type == server.atom.XdndPosition) {
+							dnd_position(&e.xclient);
+						}
+						else if (e.xclient.message_type == server.atom.XdndDrop) {
+							dnd_drop(&e.xclient);
+						}
+						break;
+
+					case SelectionNotify:
+					{
+						Atom target = e.xselection.target;
+
+						fprintf(stderr, "DnD %s:%d: A selection notify has arrived!\n", __FILE__, __LINE__);
+						fprintf(stderr, "DnD %s:%d: Requestor = %lu\n", __FILE__, __LINE__, e.xselectionrequest.requestor);
+						fprintf(stderr, "DnD %s:%d: Selection atom = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.selection));
+						fprintf(stderr, "DnD %s:%d: Target atom    = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, target));
+						fprintf(stderr, "DnD %s:%d: Property atom  = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.property));
+
+						if (e.xselection.property != None && dnd_launcher_exec) {
+							Property prop = read_property(server.dsp, dnd_target_window, dnd_selection);
+
+							//If we're being given a list of targets (possible conversions)
+							if (target == server.atom.TARGETS && !dnd_sent_request) {
+								dnd_sent_request = 1;
+								dnd_atom = pick_target_from_targets(server.dsp, prop);
+
+								if (dnd_atom == None) {
+									fprintf(stderr, "No matching datatypes.\n");
 								} else {
-									cmd_length += 1; // 1 character
-									if (c == '`' || c == '$' || c == '\\') {
-										cmd_length += 1; // escape with one backslash
+									//Request the data type we are able to select
+									fprintf(stderr, "Now requsting type %s", GetAtomName(server.dsp, dnd_atom));
+									XConvertSelection(server.dsp, dnd_selection, dnd_atom, dnd_selection, dnd_target_window, CurrentTime);
+								}
+							} else if (target == dnd_atom) {
+								//Dump the binary data
+								fprintf(stderr, "DnD %s:%d: Data begins:\n", __FILE__, __LINE__);
+								fprintf(stderr, "--------\n");
+								int i;
+								for (i = 0; i < prop.nitems * prop.format/8; i++)
+									fprintf(stderr, "%c", ((char*)prop.data)[i]);
+								fprintf(stderr, "--------\n");
+
+								int cmd_length = 0;
+								cmd_length += 1; // (
+								cmd_length += strlen(dnd_launcher_exec) + 1; // exec + space
+								cmd_length += 1; // open double quotes
+								for (i = 0; i < prop.nitems * prop.format/8; i++) {
+									char c = ((char*)prop.data)[i];
+									if (c == '\n') {
+										if (i < prop.nitems * prop.format/8 - 1) {
+											cmd_length += 3; // close double quotes, space, open double quotes
+										}
+									} else if (c == '\r') {
+									} else {
+										cmd_length += 1; // 1 character
+										if (c == '`' || c == '$' || c == '\\') {
+											cmd_length += 1; // escape with one backslash
+										}
 									}
 								}
-							}
-							cmd_length += 1; // close double quotes
-							cmd_length += 2; // &)
-							cmd_length += 1; // terminator
+								cmd_length += 1; // close double quotes
+								cmd_length += 2; // &)
+								cmd_length += 1; // terminator

-							char *cmd = calloc(cmd_length, 1);
-							cmd[0] = '\0';
-							strcat(cmd, "(");
-							strcat(cmd, dnd_launcher_exec);
-							strcat(cmd, " \"");
-							for (i = 0; i < prop.nitems * prop.format/8; i++) {
-								char c = ((char*)prop.data)[i];
-								if (c == '\n') {
-									if (i < prop.nitems * prop.format/8 - 1) {
-										strcat(cmd, "\" \"");
+								char *cmd = calloc(cmd_length, 1);
+								cmd[0] = '\0';
+								strcat(cmd, "(");
+								strcat(cmd, dnd_launcher_exec);
+								strcat(cmd, " \"");
+								for (i = 0; i < prop.nitems * prop.format/8; i++) {
+									char c = ((char*)prop.data)[i];
+									if (c == '\n') {
+										if (i < prop.nitems * prop.format/8 - 1) {
+											strcat(cmd, "\" \"");
+										}
+									} else if (c == '\r') {
+									} else {
+										if (c == '`' || c == '$' || c == '\\') {
+											strcat(cmd, "\\");
+										}
+										char sc[2];
+										sc[0] = c;
+										sc[1] = '\0';
+										strcat(cmd, sc);
 									}
-								} else if (c == '\r') {
-								} else {
-									if (c == '`' || c == '$' || c == '\\') {
-										strcat(cmd, "\\");
-									}
-									char sc[2];
-									sc[0] = c;
-									sc[1] = '\0';
-									strcat(cmd, sc);
 								}
-							}
-							strcat(cmd, "\"");
-							strcat(cmd, "&)");
-							fprintf(stderr, "DnD %s:%d: Running command: %s\n", __FILE__, __LINE__, cmd);
-							tint_exec(cmd);
-							free(cmd);
+								strcat(cmd, "\"");
+								strcat(cmd, "&)");
+								fprintf(stderr, "DnD %s:%d: Running command: %s\n", __FILE__, __LINE__, cmd);
+								tint_exec(cmd);
+								free(cmd);

-							// Reply OK.
-							XClientMessageEvent m;
-							memset(&m, 0, sizeof(m));
-							m.type = ClientMessage;
-							m.display = server.dsp;
-							m.window = dnd_source_window;
-							m.message_type = server.atom.XdndFinished;
-							m.format = 32;
-							m.data.l[0] = dnd_target_window;
-							m.data.l[1] = 1;
-							m.data.l[2] = server.atom.XdndActionCopy; //We only ever copy.
-							XSendEvent(server.dsp, dnd_source_window, False, NoEventMask, (XEvent*)&m);
-							XSync(server.dsp, False);
+								// Reply OK.
+								XClientMessageEvent m;
+								memset(&m, 0, sizeof(m));
+								m.type = ClientMessage;
+								m.display = server.dsp;
+								m.window = dnd_source_window;
+								m.message_type = server.atom.XdndFinished;
+								m.format = 32;
+								m.data.l[0] = dnd_target_window;
+								m.data.l[1] = 1;
+								m.data.l[2] = server.atom.XdndActionCopy; //We only ever copy.
+								XSendEvent(server.dsp, dnd_source_window, False, NoEventMask, (XEvent*)&m);
+								XSync(server.dsp, False);
+							}
+
+							XFree(prop.data);
 						}

-						XFree(prop.data);
+						break;
 					}

-					break;
-				}
-
-				default:
-					if (e.type == XDamageNotify+damage_event) {
-						XDamageNotifyEvent *de = (XDamageNotifyEvent*)&e;
-						GSList *l;
-						for (l = systray.list_icons; l ; l = l->next) {
-							TrayWindow *traywin = (TrayWindow*)l->data;
-							if (traywin->parent == de->drawable) {
-								systray_render_icon(traywin);
-								break;
+					default:
+						if (e.type == XDamageNotify+damage_event) {
+							// union needed to avoid strict-aliasing warnings by gcc
+							union { XEvent e; XDamageNotifyEvent de; } event_union = {.e=e};
+							TrayWindow *traywin;
+							GSList *l;
+							XDamageNotifyEvent* de = &event_union.de;
+							for (l = systray.list_icons; l ; l = l->next) {
+								traywin = (TrayWindow*)l->data;
+								if ( traywin->parent == de->drawable ) {
+									systray_render_icon(traywin);
+									break;
+								}
 							}
 						}
 					}
@@ -1464,6 +1432,7 @@ start:
 			if (signal_pending == SIGUSR1) {
 				// restart tint2
 				// SIGUSR1 used when : user's signal, composite manager stop/start or xrandr
+				FD_CLR (x11_fd, &fdset); // not sure if needed
 				goto start;
 			}
 			else {
--- a/src/tint2conf/CMakeLists.txt
+++ b/src/tint2conf/CMakeLists.txt
@@ -20,7 +20,6 @@ include_directories( ../util
                     ${RSVG_INCLUDE_DIRS} )

 set(SOURCES ../util/common.c
-			../util/strnatcmp.c
 			../config.c
            ../server.c
            ../launcher/apps-common.c
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -18,7 +18,6 @@
 **************************************************************************/

 #include <time.h>
-#include <unistd.h>

 #ifdef HAVE_VERSION_H
 #include "version.h"
@@ -66,7 +65,6 @@ static void menuImportDefault();
 static void menuSaveAs();
 static void menuDelete();
 static void edit_current_theme();
-static void set_current_theme();
 static void refresh_current_theme();
 static void menuAbout();
 static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata);
@@ -112,7 +110,6 @@ static const char *global_ui =
 	"  </menubar>"
 	"  <toolbar  name='ToolBar'>"
 	"    <toolitem action='ThemeProperties'/>"
-	"    <toolitem action='ThemeSelect'/>"
 	"  </toolbar>"
 	"  <popup  name='ThemePopup'>"
 	"    <menuitem action='ThemeProperties'/>"
@@ -132,10 +129,7 @@ int main(int argc, char **argv)
 	GtkActionGroup *actionGroup;

 	gtk_init(&argc, &argv);
-
-#if !GLIB_CHECK_VERSION(2, 31, 0)
-	g_thread_init(NULL);
-#endif
+	g_thread_init((NULL));

 	{
 		gchar *tint2_config_dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
@@ -168,7 +162,6 @@ int main(int argc, char **argv)
 		{"ThemeSaveAs", GTK_STOCK_SAVE_AS, _("_Save as..."), NULL, _("Save theme as"), G_CALLBACK(menuSaveAs)},
 		{"ThemeDelete", GTK_STOCK_DELETE, _("_Delete"), NULL, _("Delete theme"), G_CALLBACK(menuDelete)},
 		{"ThemeProperties", GTK_STOCK_PROPERTIES, _("_Edit theme..."), NULL, _("Edit selected theme"), G_CALLBACK(edit_current_theme)},
-		{"ThemeSelect", GTK_STOCK_APPLY, _("_Make default"), NULL, _("Replace the default theme with the selected one"), G_CALLBACK(set_current_theme)},
 		{"ThemeQuit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", _("Quit"), G_CALLBACK(gtk_main_quit)},
 		{"EditMenu", NULL, _("Edit"), NULL, NULL, NULL},
 		{"EditRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Refresh"), G_CALLBACK(refresh_current_theme)},
@@ -489,33 +482,6 @@ static void edit_current_theme()
 	}
 }

-static void set_current_theme()
-{
-	GtkTreeSelection *sel;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
-	gchar *file;
-
-	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view));
-	if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
-		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file,  -1);
-		// config_read_file(file);
-
-		gchar *main_file = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
-		{
-			gchar *backup_path = g_strdup_printf("%s.backup.%ld", main_file, time(NULL));
-			copy_file(main_file, backup_path);
-			g_free(backup_path);
-		}
-		copy_file(file, main_file);
-		int unused = system("killall -SIGUSR1 tint2 || pkill -SIGUSR1 -x tint2");
-		(void)unused;
-		g_free(file);
-		select_first_theme();
-		refresh_current_theme();
-	}
-}
-
 static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
 {
 	edit_current_theme();
@@ -523,56 +489,8 @@ static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeV

 // ====== Theme load/reload ======

-static void copy_default_themes()
-{
-	gchar *path_home = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
-	if (!g_file_test(path_home, G_FILE_TEST_EXISTS)) {
-		const gchar * const * system_dirs = g_get_system_config_dirs();
-		int i;
-		for (i = 0; system_dirs[i]; i++) {
-			gchar *path = g_build_filename(system_dirs[i], "tint2", "tint2rc", NULL);
-			if (g_file_test(path, G_FILE_TEST_EXISTS)) {
-				copy_file(path, path_home);
-			}
-			g_free(path);
-		}
-	}
-	g_free(path_home);
-
-	const gchar * const * data_dirs = g_get_system_data_dirs();
-	int i;
-	for (i = 0; data_dirs[i]; i++) {
-		gchar *path_tint2 = g_build_filename(data_dirs[i], "tint2", NULL);
-		fprintf(stderr, "%s\n", path_tint2);
-		GDir *dir = g_dir_open(path_tint2, 0, NULL);
-		if (dir) {
-			const gchar *file_name;
-			while ((file_name = g_dir_read_name(dir))) {
-				if (!g_file_test(file_name, G_FILE_TEST_IS_DIR) &&
-					!strstr(file_name, "backup") &&
-					!strstr(file_name, "copy") &&
-					!strstr(file_name, "~") &&
-					(endswith(file_name, "tint2rc") ||
-					 endswith(file_name, ".conf"))) {
-					gchar *path_home = g_build_filename(g_get_user_config_dir(), "tint2", file_name, NULL);
-					if (!g_file_test(path_home, G_FILE_TEST_EXISTS)) {
-						gchar *path_usr = g_build_filename(path_tint2, file_name, NULL);
-						copy_file(path_usr, path_home);
-						g_free(path_usr);
-					}
-					g_free(path_home);
-				}
-			}
-			g_dir_close(dir);
-		}
-		g_free(path_tint2);
-	}
-}
-
 static void load_all_themes()
 {
-	copy_default_themes();
-
 	gtk_list_store_clear(GTK_LIST_STORE(g_store));

 	gchar *tint2_config_dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
@@ -582,7 +500,6 @@ static void load_all_themes()
 		return;
 	}
 	gboolean found_theme = FALSE;
-
 	const gchar *file_name;
 	while ((file_name = g_dir_read_name(dir))) {
 		if (!g_file_test(file_name, G_FILE_TEST_IS_DIR) &&
@@ -598,7 +515,12 @@ static void load_all_themes()
 		}
 	}

-	if (found_theme) {
+	if (!found_theme) {
+		gchar *path_tint2rc = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
+		copy_file(get_default_config_path(), path_tint2rc);
+		g_free(path_tint2rc);
+		load_all_themes();
+	} else {
 		select_first_theme();

 		GtkTreeIter iter;
--- a/src/tint2conf/po/bs.po
+++ b/src/tint2conf/po/bs.po
--- a/src/tint2conf/po/fr.po
+++ b/src/tint2conf/po/fr.po
--- a/src/tint2conf/po/hr.po
+++ b/src/tint2conf/po/hr.po
--- a/src/tint2conf/po/pl.po
+++ b/src/tint2conf/po/pl.po
--- a/src/tint2conf/po/readme.txt
+++ b/src/tint2conf/po/readme.txt
@@ -1,11 +0,0 @@
-Updating pot file:
-
-find .. -name '*.c' | xargs xgettext --keyword=_ --language=C --output=updated.pot -
-
-Followed by manual editing of updated.pot to make sure the header is OK. Then:
-
-cat updated.pot > tint2conf.pot && rm -f updated.pot
-
-Then update the po files:
-
-for f in *.po ; do lang=$(basename $f .po); echo $lang ; msgmerge -i -o $lang.pox $lang.po tint2conf.pot ; cat ${lang}.pox > ${lang}.po ; rm ${lang}.pox ; done
--- a/src/tint2conf/po/sr.po
+++ b/src/tint2conf/po/sr.po
--- a/src/tint2conf/po/tint2conf.pot
+++ b/src/tint2conf/po/tint2conf.pot
--- a/src/tint2conf/properties.c
+++ b/src/tint2conf/properties.c
@@ -23,7 +23,6 @@
 #include "../launcher/apps-common.h"
 #include "../launcher/icon-theme-common.h"
 #include "../util/common.h"
-#include "strnatcmp.h"

 #define ROW_SPACING 10
 #define COL_SPACING 8
@@ -1770,84 +1769,23 @@ void load_desktop_file(const char *file, gboolean selected)
 	free_desktop_entry(&entry);
 }

-void populate_from_entries(GList *entries, gboolean selected)
+void load_desktop_files(const gchar *path)
 {
-	GList *l;
-	for (l = entries; l; l = l->next) {
-		DesktopEntry *entry = (DesktopEntry *)l->data;
-		GdkPixbuf *pixbuf = load_icon(entry->icon);
-		GtkTreeIter iter;
-		gtk_list_store_append(selected ? launcher_apps : all_apps, &iter);
-		gtk_list_store_set(selected ? launcher_apps :all_apps, &iter,
-						   appsColIcon, pixbuf,
-						   appsColText, g_strdup(entry->name),
-						   appsColPath, g_strdup(entry->path),
-						   appsColIconName, g_strdup(entry->icon),
-						   -1);
-		if (pixbuf)
-			g_object_unref(pixbuf);
-	}
-}
-
-static gint compare_entries(gconstpointer a, gconstpointer b)
-{
-   return strnatcasecmp(((DesktopEntry*)a)->name, ((DesktopEntry*)b)->name);
-}
-
-void load_desktop_entry(const char *file, GList **entries)
-{
-	DesktopEntry *entry = calloc(1, sizeof(DesktopEntry));
-	if (!read_desktop_file(file, entry))
-		printf("Could not load %s\n", file);
-	if (!entry->name)
-		entry->name = strdup(file);
-	if (!entry->icon)
-		entry->icon = strdup("");
-	*entries = g_list_append(*entries, entry);
-}
-
-static gint compare_strings(gconstpointer a, gconstpointer b)
-{
-   return strnatcasecmp((const char*)a, (const char*)b);
-}
-
-void load_desktop_entries(const char *path, GList **entries)
-{
-	GList *subdirs = NULL;
-	GList *files = NULL;
-
 	GDir *d = g_dir_open(path, 0, NULL);
-	if (d) {
-		const gchar *name;
-		while ((name = g_dir_read_name(d))) {
-			gchar *file = g_build_filename(path, name, NULL);
-			if (!g_file_test(file, G_FILE_TEST_IS_DIR) && g_str_has_suffix(file, ".desktop")) {
-				files = g_list_append(files, file);
-			} else if (g_file_test(file, G_FILE_TEST_IS_DIR)) {
-				subdirs = g_list_append(subdirs, file);
-			} else {
-				g_free(file);
-			}
+	if (!d)
+		return;
+	const gchar *name;
+	while ((name = g_dir_read_name(d))) {
+		gchar *file = g_build_filename(path, name, NULL);
+		if (!g_file_test(file, G_FILE_TEST_IS_DIR) &&
+			g_str_has_suffix(file, ".desktop")) {
+			load_desktop_file(file, FALSE);
+		} else if (g_file_test(file, G_FILE_TEST_IS_DIR)) {
+			load_desktop_files(file);
 		}
-		g_dir_close(d);
-	}
-
-	subdirs = g_list_sort(subdirs, compare_strings);
-	GList *l;
-	for (l = subdirs; l; l = g_list_next(l)) {
-		gchar *dir = (gchar *)l->data;
-		load_desktop_entries(dir, entries);
-		g_free(dir);
-	}
-	g_list_free(subdirs);
-
-	files = g_list_sort(files, compare_strings);
-	for (l = files; l; l = g_list_next(l)) {
-		gchar *file = (gchar *)l->data;
-		load_desktop_entry(file, entries);
 		g_free(file);
 	}
-	g_list_free(files);
+	g_dir_close(d);
 }

 void load_theme_file(const char *file_name, const char *theme)
@@ -2277,20 +2215,10 @@ void create_launcher(GtkWidget *parent)
 	fprintf(stderr, "Icon themes loaded\n");

 	fprintf(stderr, "Loading .desktop files\n");
-	GList *entries = NULL;
-	load_desktop_entries("/usr/share/applications", &entries);
-	load_desktop_entries("/usr/local/share/applications", &entries);
+	load_desktop_files("/usr/share/applications");
+	load_desktop_files("/usr/local/share/applications");
 	gchar *path = g_build_filename(g_get_home_dir(), ".local/share/applications", NULL);
-	load_desktop_entries(path, &entries);
-	entries = g_list_sort(entries, compare_entries);
-	populate_from_entries(entries, FALSE);
-
-	GList *l;
-	for (l = entries; l; l = l->next) {
-		free_desktop_entry((DesktopEntry*)l->data);
-	}
-	g_list_free(entries);
-
+	load_desktop_files(path);
 	g_free(path);

 	icon_theme_changed();
--- a/src/tint2conf/properties_rw.c
+++ b/src/tint2conf/properties_rw.c
@@ -511,7 +511,7 @@ void config_write_launcher(FILE *fp)
 		g_strstrip(dir);
 		if (strlen(dir) > 0) {
 			char *contracted = contract_tilde(dir);
-			fprintf(fp, "launcher_apps_dir = %s\n", contracted);
+			fprintf(fp, "launcher_item_app = %s\n", contracted);
 			free(contracted);
 		}
 	}
@@ -1010,13 +1010,13 @@ void add_entry(char *key, char *value)
 	}
 	else if (strcmp(key, "task_align") == 0) {
 		if (strcmp(value, "left") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 0);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
 		else if (strcmp(value, "center") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 1);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 1);
 		else if (strcmp(value, "right") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 2);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 2);
 		else
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 0);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
 	}
 	else if (strcmp(key, "taskbar_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
--- a/src/tint2conf/theme_view.c
+++ b/src/tint2conf/theme_view.c
@@ -19,7 +19,6 @@


 #include "main.h"
-#include "strnatcmp.h"
 #include "theme_view.h"

 // The data columns that we export via the tree model interface
@@ -28,11 +27,6 @@ GtkListStore *g_store;
 int g_width_list, g_height_list;
 GtkCellRenderer *g_renderer;

-gint theme_name_compare(GtkTreeModel *model,
-						GtkTreeIter *a,
-						GtkTreeIter *b,
-						gpointer user_data);
-
 GtkWidget *create_view()
 {
 	GtkTreeViewColumn *col;
@@ -75,50 +69,21 @@ GtkWidget *create_view()
 	GtkTreeSortable *sortable;
 	sortable = GTK_TREE_SORTABLE(g_store);
 	gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
-	gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
 	return view;
 }

-gint theme_name_compare(GtkTreeModel *model,
-						GtkTreeIter *a,
-						GtkTreeIter *b,
-						gpointer user_data)
-{
-	gchar *path_a, *path_b;
-	gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
-	gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
-	gchar *name_a = path_a;
-	gchar *p;
-	for (p = name_a; *p; p++) {
-		if (*p == '/')
-			name_a = p + 1;
-	}
-	gchar *name_b = path_b;
-	for (p = name_b; *p; p++) {
-		if (*p == '/')
-			name_b = p + 1;
-	}
-	if (g_str_equal(name_a, name_b))
-		return 0;
-	if (g_str_equal(name_a, "tint2rc"))
-		return -1;
-	if (g_str_equal(name_b, "tint2rc"))
-		return 1;
-	gint result = strnatcasecmp(name_a, name_b);
-	g_free(path_a);
-	g_free(path_b);
-	return result;
-}

-void custom_list_append(const gchar *path)
+void custom_list_append(const gchar *name)
 {
 	GtkTreeIter  iter;

 	gtk_list_store_append(g_store, &iter);
-	gtk_list_store_set(g_store, &iter, COL_THEME_FILE, path, -1);
+	gtk_list_store_set(g_store, &iter, COL_THEME_FILE, name, -1);

-	gchar *name = g_strdup(strrchr(path, '/') + 1);
-	gtk_list_store_set(g_store, &iter, COL_THEME_NAME, name, -1);
+	gchar *b, *n;
+	b = strrchr(name, '/');
+	n = g_strdup(b+1);
+	gtk_list_store_set(g_store, &iter, COL_THEME_NAME, n, -1);
 }


--- a/src/tint2conf/theme_view.h
+++ b/src/tint2conf/theme_view.h
@@ -10,7 +10,7 @@ enum { COL_THEME_FILE = 0, COL_THEME_NAME, COL_SNAPSHOT, NB_COL, };

 GtkWidget *create_view();

-void custom_list_append(const gchar *path);
+void custom_list_append(const gchar *name);

 #endif

--- a/src/tint2conf/tintwizard.py
+++ b/src/tint2conf/tintwizard.py
--- a/src/util/common.c
+++ b/src/util/common.c
@@ -35,9 +35,6 @@

 void copy_file(const char *pathSrc, const char *pathDest)
 {
-	if (g_str_equal(pathSrc, pathDest))
-		return;
-
 	FILE *fileSrc, *fileDest;
 	char buffer[100];
 	int  nb;
@@ -120,13 +117,13 @@ char *contract_tilde(char *s)
 	if (!home)
 		return strdup(s);

-	char *home_slash = calloc(strlen(home) + 2, 1);
+	char *home_slash = calloc(strlen(home) + 1, 1);
 	strcat(home_slash, home);
 	strcat(home_slash, "/");

 	if ((strcmp(s, home) == 0 ||
 		strstr(s, home_slash) == s)) {
-		char *result = calloc(strlen(s) - strlen(home) + 2, 1);
+		char *result = calloc(strlen(s) - strlen(home) + 1, 1);
 		strcat(result, "~");
 		strcat(result, s + strlen(home));
 		free(home_slash);
@@ -365,42 +362,6 @@ void createHeuristicMask(DATA32* data, int w, int h)
 	}
 }

-int pixelEmpty(DATA32 argb)
-{
-
-	DATA32 a = (argb >> 24) & 0xff;
-	if (a == 0)
-		return 1;
-
-	DATA32 rgb = argb & 0xffFFff;
-	return rgb == 0;
-}
-
-int imageEmpty(DATA32* data, int w, int h)
-{
-	unsigned int x, y;
-
-	if (w > 0 && h > 0) {
-		x = w / 2;
-		y = h / 2;
-		if (!pixelEmpty(data[y * w + x])) {
-			//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, data[y * w + x]);
-			return 0;
-		}
-	}
-
-	for (y = 0; y < h; y++) {
-		for (x = 0; x < w; x++) {
-			if (!pixelEmpty(data[y * w + x])) {
-				//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, data[y * w + x]);
-				return 0;
-			}
-		}
-	}
-
-	//fprintf(stderr, "All pixels are empty\n");
-	return 1;
-}

 void render_image(Drawable d, int x, int y)
 {
--- a/src/util/common.h
+++ b/src/util/common.h
@@ -12,12 +12,6 @@
 #include <pango/pangocairo.h>
 #include "area.h"

-#define GREEN  "\033[1;32m"
-#define YELLOW "\033[1;33m"
-#define RED    "\033[31m"
-#define BLUE   "\033[1;34m"
-#define RESET  "\033[0m"
-
 /*
 void fxfree(void** ptr){
  if(*ptr){
@@ -68,7 +62,6 @@ void extract_values (const char *value, char **value1, char **value2, char **val
 // alpha from 0 to 100, satur from 0 to 1, bright from 0 to 1.
 void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright);
 void createHeuristicMask(DATA32* data, int w, int h);
-int imageEmpty(DATA32* data, int w, int h);

 void render_image(Drawable d, int x, int y);

--- a/src/util/timer.c
+++ b/src/util/timer.c
@@ -393,13 +393,8 @@ void callback_multi_timeout(void* arg)
 		timeout* t = it->data;
 		if (++t->multi_timeout->current_count >= t->multi_timeout->count_to_expiration) {
 			t->_callback(t->arg);
-			if (multi_timeouts && g_hash_table_lookup(multi_timeouts, t)) {
-				// Timer still exists
-				t->multi_timeout->current_count = 0;
-				t->timeout_expires = add_msec_to_timespec(cur_time, t->interval_msec);
-			} else {
-				return;
-			}
+			t->multi_timeout->current_count = 0;
+			t->timeout_expires = add_msec_to_timespec(cur_time, t->interval_msec);
 		}
 		it = it->next;
 	}
@@ -450,16 +445,3 @@ void stop_multi_timeout(timeout* t)
 	}
 	free(mth);
 }
-
-double profiling_get_time_old_time = 0;
-double profiling_get_time()
-{
-	struct timespec cur_time;
-	clock_gettime(CLOCK_MONOTONIC, &cur_time);
-	double t = cur_time.tv_sec + cur_time.tv_nsec * 1.0e-9;
-	if (profiling_get_time_old_time == 0)
-		profiling_get_time_old_time = t;
-	double delta = t - profiling_get_time_old_time;
-	profiling_get_time_old_time = t;
-	return delta;
-}
--- a/src/util/timer.h
+++ b/src/util/timer.h
@@ -73,9 +73,4 @@ gint compare_timespecs(const struct timespec* t1, const struct timespec* t2);

 struct timespec add_msec_to_timespec(struct timespec ts, int msec);

-/** Returns the time difference in seconds between the current time and the last time this function was called.
-  * At the first call returns zero.
-**/
-double profiling_get_time();
-
 #endif // TIMER_H
--- a/tint2.config
+++ b/tint2.config
@@ -1,4 +0,0 @@
-// ADD PREDEFINED MACROS HERE!
-#define HAVE_RSVG 1
-#define HAVE_SN 1
-#define ENABLE_BATTERY 1
--- a/tint2.creator
+++ b/tint2.creator
@@ -1 +0,0 @@
-[General]
--- a/tint2.desktop
+++ b/tint2.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Encoding=UTF-8
 Name=Tint2 panel
-Name[am]=ፓነል tint2
+Name[am]=ፓነል  tint2
 Name[ar]=الشريط tint2
 Name[ast]=Panel tint2
 Name[be]=Панэль tint2
@@ -12,7 +12,7 @@ Name[da]=Panel tint2
 Name[de]=Leiste tint2
 Name[dz]=པེ་ནཱལ། tint2
 Name[el]=Ταμπλό tint2
-Name[en]=Tint2 panel
+Name[en_GB]=Panel tint2
 Name[eo]=Panelo tint2
 Name[es]=Panel tint2
 Name[et]=Ääreriba tint2
@@ -36,6 +36,7 @@ Name[nn]=Panel tint2
 Name[pa]=ਪੈਨਲ tint2
 Name[pl]=Panel tint2
 Name[pt]=Painel tint2
+Name[pt_BR]=Painel tint2
 Name[ro]=Panou tint2
 Name[ru]=Панель tint2
 Name[si]=පුවරුව tint2
@@ -47,10 +48,12 @@ Name[tr]=Panel tint2
 Name[ug]=panel tint2
 Name[uk]=Панель tint2
 Name[ur]=پینل tint2
+Name[ur_PK]=پینل tint2
 Name[vi]=Panel tint2
-Name[zh]=面板 tint2
+Name[zh_CN]=面板 tint2
+Name[zh_TW]=面板 tint2
 Comment=Lightweight panel
-Comment[fr]=Panel léger
+Comment[fr_FR]=Panel léger
 Comment[pl]=Lekki panel
 Exec=tint2
 Icon=taskbar
--- a/tint2.files
+++ b/tint2.files
@@ -1,153 +0,0 @@
-doc/tint2.1
-sample/icon_and_text_1.tint2rc
-sample/icon_and_text_2.tint2rc
-sample/icon_and_text_3.tint2rc
-sample/icon_and_text_4.tint2rc
-sample/icon_only_1.tint2rc
-sample/icon_only_2.tint2rc
-sample/icon_only_3.tint2rc
-sample/icon_only_4.tint2rc
-sample/icon_only_6.tint2rc
-sample/icon_only_7.tint2rc
-sample/text_only_1.tint2rc
-sample/text_only_2.tint2rc
-sample/text_only_3.tint2rc
-sample/text_only_4.tint2rc
-sample/text_only_5.tint2rc
-sample/text_only_6.tint2rc
-sample/tint2rc
-src/battery/battery.c
-src/battery/battery.h
-src/clock/clock.c
-src/clock/clock.h
-src/execplugin/execplugin.c
-src/execplugin/execplugin.h
-src/launcher/launcher.c
-src/launcher/launcher.h
-src/launcher/xsettings-client.c
-src/launcher/xsettings-client.h
-src/launcher/xsettings-common.c
-src/launcher/xsettings-common.h
-src/sysmon/sysmon.c
-src/sysmon/sysmon.h
-src/systray/systraybar.c
-src/systray/systraybar.h
-src/taskbar/task.c
-src/taskbar/task.h
-src/taskbar/taskbar.c
-src/taskbar/taskbar.h
-src/taskbar/taskbarname.c
-src/taskbar/taskbarname.h
-src/tint2conf/CMakeLists.txt
-src/tint2conf/main.c
-src/tint2conf/main.h
-src/tint2conf/properties.c
-src/tint2conf/properties.h
-src/tint2conf/properties_rw.c
-src/tint2conf/properties_rw.h
-src/tint2conf/taskbar.svg
-src/tint2conf/theme_view.c
-src/tint2conf/theme_view.h
-src/tint2conf/tint2conf.desktop
-src/tint2conf/tintwizard.py
-src/tooltip/tooltip.c
-src/tooltip/tooltip.h
-src/util/area.c
-src/util/area.h
-src/util/blur.c
-src/util/blur.h
-src/util/common.c
-src/util/common.h
-src/util/timer.c
-src/util/timer.h
-src/util/window.c
-src/util/window.h
-src/config.c
-src/config.h
-src/panel.c
-src/panel.h
-src/server.c
-src/server.h
-src/tint.c
-AUTHORS
-ChangeLog
-CMakeLists.txt
-COPYING
-default_icon.png
-get_svnrev.sh
-INSTALL.txt
-make_release.sh
-README
-README.source
-src/launcher/apps-common.c
-src/launcher/apps-common.h
-src/launcher/icon-theme-common.c
-src/launcher/icon-theme-common.h
-src/util/strnatcmp.c
-src/util/strnatcmp.h
-get_version.sh
-src/battery/battery.c
-src/battery/battery.h
-src/clock/clock.c
-src/clock/clock.h
-src/launcher/apps-common.c
-src/launcher/apps-common.h
-src/launcher/icon-theme-common.c
-src/launcher/icon-theme-common.h
-src/launcher/launcher.c
-src/launcher/launcher.h
-src/launcher/xsettings-client.c
-src/launcher/xsettings-client.h
-src/launcher/xsettings-common.c
-src/launcher/xsettings-common.h
-src/systray/systraybar.c
-src/systray/systraybar.h
-src/taskbar/task.c
-src/taskbar/task.h
-src/taskbar/taskbar.c
-src/taskbar/taskbar.h
-src/taskbar/taskbarname.c
-src/taskbar/taskbarname.h
-src/tint2conf/CMakeLists.txt
-src/tint2conf/main.c
-src/tint2conf/main.h
-src/tint2conf/properties.c
-src/tint2conf/properties.h
-src/tint2conf/properties_rw.c
-src/tint2conf/properties_rw.h
-src/tint2conf/theme_view.c
-src/tint2conf/theme_view.h
-src/tint2conf/tint2conf.desktop
-src/tint2conf/tint2conf.svg
-src/tint2conf/tintwizard.py
-src/tooltip/tooltip.c
-src/tooltip/tooltip.h
-src/util/area.c
-src/util/area.h
-src/util/common.c
-src/util/common.h
-src/util/strnatcmp.c
-src/util/strnatcmp.h
-src/util/timer.c
-src/util/timer.h
-src/util/window.c
-src/util/window.h
-src/config.c
-src/config.h
-src/panel.c
-src/panel.h
-src/server.c
-src/server.h
-src/tint.c
-po/CMakeLists.txt
-po/LINGUAS
-po/POTFILES.in
-src/tint2conf/po/CMakeLists.txt
-src/tint2conf/po/CMakeLists.txt
-src/tint2conf/po/fr.po
-src/tint2conf/po/tint2conf.pot
-src/tint2conf/po/pl.po
-src/tint2conf/po/tint2conf.pot
-src/freespace/freespace.c
-src/freespace/freespace.h
-src/tint2conf/po/readme.txt
--- a/tint2.includes
+++ b/tint2.includes
@@ -1,22 +0,0 @@
-.
-./src
-./src/battery
-./src/clock
-./src/execplugin
-./src/launcher
-./src/sysmon
-./src/systray
-./src/taskbar
-./src/tint2conf
-./src/tooltip
-./src/util
-/usr/include
-/usr/include/gtk-2.0
-/usr/include/glib-2.0
-/usr/include/gdk-pixbuf-2.0
-/usr/include/cairo
-/usr/include/pango-1.0
-/usr/include/startup-notification-1.0
-po
-src/tint2conf/po
-src/freespace