Started work on spacer item

2015-05-05 23:32:18 +02:00
38 changed files with 712 additions and 6326 deletions
--- a/1
+++ b/1
@@ -5,7 +5,6 @@ tint2 is developped by :
 - Euan Freeman <euan04@gmail.com> (tintwizard)
 - Christian Ruppert <Spooky85@gmail.com> (autotools build system)
 - Ovidiu M <mrovi9000 at gmail.com> : launcher, bug fixes
- Mishael A Sibiryakov (death@junki.org) : freespace

 tint2 is based on ttm source code (http://code.google.com/p/ttm/)
 - 2007-2008 Pål Staurland <staura@gmail.com>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,6 @@ include_directories( ${PROJECT_BINARY_DIR}
                     src/launcher
                     src/tooltip
                     src/util
-					 src/freespace
                     ${X11_INCLUDE_DIRS}
                     ${PANGOCAIRO_INCLUDE_DIRS}
                     ${PANGO_INCLUDE_DIRS}
@@ -68,8 +67,7 @@ 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/util/area.c
             src/util/common.c
             src/util/strnatcmp.c
             src/util/timer.c
--- a/37
+++ b/37
@@ -1,4 +1,4 @@
-2015-06-12 master
+2015-05-03 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)'.
@@ -11,10 +11,6 @@
    - Experimental, testing/feedback needed
  - Icons (system tray, task buttons, launcher):
    - Changed rendering method to fix icon corruptions (please report any problems)
-  - System tray:
-    - Icon rendering is faster
-    - Several kinds of graphical corruptions have been fixed
-    - Added workaround for misbehaving applications leaving empty tray icons
  - Many bugfixes
 - New config options (see https://gitlab.com/o9000/tint2/wikis/Configure):
  - Panel:
@@ -27,7 +23,6 @@
    - taskbar_hide_inactive_tasks
    - taskbar_sort_order
    - taskbar_name (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)
@@ -35,7 +30,6 @@
    - launcher_icon_theme_override
  - System tray:
    - systray_monitor
-  - Freespace (already released by distros)
 - Config options with changed behavior:
  - Panel:
    - panel_dock: previously, 'panel_dock = 1' was actually not placing the panel into the dock. This option now
@@ -50,37 +44,8 @@
      Reason for change: legibility improved for transparent panels.
  - Launcher:
    - launcher_item_app: now it expands leading ~ to the path to the user's home directory.
- Known issues:
-  - tint2 might close unexpectedly and/or cause X to freeze on certain ATI graphics cards.
-    Workaround: set 'disable_transparency = 1' in the config.
-    Reference: https://gitlab.com/o9000/tint2/issues/497
 - Project hosting:
  - Migrated from https://code.google.com/p/tint2 to https://gitlab.com/o9000/tint2 and switched from svn to git
- Bugfixes:
-  - task switching from tint2 using the mouse wheel (mouse_scroll_up = prev_task and mouse_scroll_down = next_task) with
-    multiple desktops and taskbar_mode = multi_desktop when hovering over the first/last window in the taskbar was broken;
-    also when a window is set to appear on all desktops;
-  - the launcher was not loading an icon if the icon theme was not providing it in a size close to the value of launcher_icon_size;
-  - the launcher was not loading an icon if the extension was incorrect (e.g. file contents were PNG but the file name
-    had extension SVG);
-  - some launcher icons (PNG files saved with an indexed colormap and alpha mask) were sometimes rendered with white instead of
-    transparency;
-  - icons looked washed out when the panel was very transparent;
-  - the panel border was rendered in the background of every systray icon; sometimes systray icons were rendered in the
-    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
-    suspend with the battery unplugged);
-  - crashed caused by incomplete or malformed config files;
-  - with the fvwm window manager, the window title was sometimes not displayed correctly if it changed right after an
-    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;
-  - the code that loads SVG icons was using a lot of memory.

 2010-06-26
 - unhide tint2 panel when dragging something
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
-### New unstable release: 0.12-rc6
+### New unstable release: 0.12-rc3
 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-rc6
-cd tint2-0.12-rc6
-wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc6' --output-document tint2-0.12-rc6.tar.gz
-tar -xzf tint2-0.12-rc6.tar.gz
+mkdir tint2-0.12-rc3
+cd tint2-0.12-rc3
+wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc3' --output-document tint2-0.12-rc3.tar.gz
+tar -xzf tint2-0.12-rc3.tar.gz
 cd tint2.git
 mkdir build
 cd build
@@ -49,7 +49,7 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
  * [Configure](https://gitlab.com/o9000/tint2/wikis/Configure)
  * [Add applet not supported by tint2](https://gitlab.com/o9000/tint2/wikis/ThirdPartyApplets)
  * [Other frequently asked questions](https://gitlab.com/o9000/tint2/wikis/FAQ)
-  * [Debug](https://gitlab.com/o9000/tint2/wikis/Debug)  
+  * [Debug](https://gitlab.com/o9000/tint2/wikis/Debug)

 ### How can I help out?

--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -76,9 +76,6 @@ void update_battery_tick(void* arg)
 	int16_t old_hours = battery_state.time.hours;
 	int8_t old_minutes = battery_state.time.minutes;
 	
-	if (!battery_found) {
-		init_battery();
-	}
 	if (update_battery() != 0) {
 		// Reconfigure
 		init_battery();
@@ -106,23 +103,15 @@ void update_battery_tick(void* arg)

 	int i;
 	for (i = 0; i < nb_panel; i++) {
-		if (!battery_found) {
-			if (panel1[i].battery.area.on_screen == 1) {
-				hide(&panel1[i].battery.area);
-				panel_refresh = 1;
-			}
-		} else {
-			if (battery_state.percentage >= percentage_hide) {
-				if (panel1[i].battery.area.on_screen == 1) {
-					hide(&panel1[i].battery.area);
-					panel_refresh = 1;
-				}
-			} else {
-				if (panel1[i].battery.area.on_screen == 0) {
-					show(&panel1[i].battery.area);
-					panel_refresh = 1;
-				}
-			}
+		if (!battery_found && panel1[i].battery.area.on_screen == 1) {
+			hide(&panel1[i].battery.area);
+			panel_refresh = 1;
+		} else if (battery_state.percentage >= percentage_hide && panel1[i].battery.area.on_screen == 1) {
+			hide(&panel1[i].battery.area);
+			panel_refresh = 1;
+		} else if (battery_state.percentage < percentage_hide && panel1[i].battery.area.on_screen == 0) {
+			show(&panel1[i].battery.area);
+			panel_refresh = 1;
 		}
 		if (panel1[i].battery.area.on_screen == 1) {
 			panel1[i].battery.area.resize = 1;
@@ -290,7 +279,7 @@ void init_battery()
 #endif

 	if (!battery_timeout)
-		battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
+		battery_timeout = add_timeout(10, 10000, update_battery_tick, 0, &battery_timeout);
 }


@@ -485,7 +474,7 @@ int update_battery() {
 	battery_state.time.seconds = seconds;

 	if (energy_full > 0)
-		new_percentage = 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
+		new_percentage = ((energy_now <= energy_full ? energy_now : energy_full) * 100) / energy_full;

 	battery_state.percentage = new_percentage;

--- a/src/config.c
+++ b/src/config.c
@@ -41,7 +41,6 @@

 #include "common.h"
 #include "server.h"
-#include "strnatcmp.h"
 #include "panel.h"
 #include "task.h"
 #include "taskbar.h"
@@ -154,48 +153,23 @@ int config_get_monitor(char* monitor)
 	return -1;
 }

-static gint compare_strings(gconstpointer a, gconstpointer b)
-{
-   return strnatcasecmp((const char*)a, (const char*)b);
-}
-
 void load_launcher_app_dir(const char *path)
 {
-    GList *subdirs = NULL;
-	GList *files = NULL;
-
-    GDir *d = g_dir_open(path, 0, 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);
+			if (!g_file_test(file, G_FILE_TEST_IS_DIR) &&
+				g_str_has_suffix(file, ".desktop")) {
+				panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, strdup(file));
 			} else if (g_file_test(file, G_FILE_TEST_IS_DIR)) {
-				subdirs = g_list_append(subdirs, file);
-			} else {
-                g_free(file);
-            }
+				load_launcher_app_dir(file);
+			}
+			g_free(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_launcher_app_dir(dir);
-        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;
-        panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, strdup(file));
-        g_free(file);
-    }
-    g_list_free(files);
 }

 void add_entry (char *key, char *value)
@@ -544,15 +518,6 @@ void add_entry (char *key, char *value)
 			taskbar_sort_method = TASKBAR_NOSORT;
 		}
 	}
-	else if (strcmp (key, "task_align") == 0) {
-		if (strcmp(value, "center") == 0) {
-			taskbar_alignment = ALIGN_CENTER;
-		} else if (strcmp(value, "right") == 0) {
-			taskbar_alignment = ALIGN_RIGHT;
-		} else {
-			taskbar_alignment = ALIGN_LEFT;
-		}
-	}

 	/* Task */
 	else if (strcmp (key, "task_text") == 0)
@@ -648,13 +613,13 @@ void add_entry (char *key, char *value)
 	}
 	else if (strcmp(key, "systray_sort") == 0) {
 		if (strcmp(value, "descending") == 0)
-			systray.sort = SYSTRAY_SORT_DESCENDING;
+			systray.sort = -1;
 		else if (strcmp(value, "ascending") == 0)
-			systray.sort = SYSTRAY_SORT_ASCENDING;
+			systray.sort = 1;
 		else if (strcmp(value, "left2right") == 0)
-			systray.sort = SYSTRAY_SORT_LEFT2RIGHT;
+			systray.sort = 2;
 		else  if (strcmp(value, "right2left") == 0)
-			systray.sort = SYSTRAY_SORT_RIGHT2LEFT;
+			systray.sort = 3;
 	}
 	else if (strcmp(key, "systray_icon_size") == 0) {
 		systray_max_icon_size = atoi(value);
--- a/src/freespace/freespace.c
+++ b/src/freespace/freespace.c
@@ -1,93 +0,0 @@
-/**************************************************************************
-*
-* Tint2 : freespace
-*
-* Copyright (C) 2011 Mishael A Sibiryakov (death@junki.org)
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License version 2
-* as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**************************************************************************/
-
-
-#include <string.h>
-#include <stdio.h>
-#include <cairo.h>
-#include <cairo-xlib.h>
-#include <pango/pangocairo.h>
-#include <stdlib.h>
-
-#include "window.h"
-#include "server.h"
-#include "panel.h"
-#include "freespace.h"
-#include "common.h"
-
-void init_freespace_panel(void *p)
-{
-	Panel *panel = (Panel*)p;
-	FreeSpace *freespace = &panel->freespace;
-
-	if (freespace->area.bg == 0)
-		freespace->area.bg = &g_array_index(backgrounds, Background, 0);
-	freespace->area.parent = p;
-	freespace->area.panel = p;
-	freespace->area.size_mode = SIZE_BY_CONTENT;
-	freespace->area.resize = 1;
-	freespace->area.on_screen = 1;
-	freespace->area._resize = resize_freespace;
-}
-
-int freespace_get_max_size(Panel *p) {
-	// Get space used by every element except the freespace
-	GList *walk;
-	int size = 0;
-	for (walk = p->area.list; walk; walk = g_list_next(walk)) {
-		Area *a = (Area *)walk->data;
-
-		if (a->_resize == resize_freespace || !a->on_screen)
-			continue;
-
-		if (panel_horizontal)
-			size += a->width + (a->bg->border.width * 2) + p->area.paddingx;
-		else
-			size += a->height + (a->bg->border.width * 2) + p->area.paddingy;
-	}
-
-	if (panel_horizontal)
-		size = p->area.width - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
-	else
-		size = p->area.height - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
-
-	return size;
-}
-
-int resize_freespace(void *obj) {
-	FreeSpace *freespace = (FreeSpace*)obj;
-	Panel *panel = (Panel*)freespace->area.panel;
-	if (!freespace->area.on_screen)
-		return 0;
-
-	int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
-	int size = freespace_get_max_size(panel);
-	if (old_size == size)
-		return 0;
-
-	if (panel_horizontal) {
-		freespace->area.width = size;
-	} else {
-		freespace->area.height = size;
-	}
-
-	freespace->area.redraw = 1;
-	panel_refresh = 1;
-	return 1;
-}
--- a/src/freespace/freespace.h
+++ b/src/freespace/freespace.h
@@ -1,20 +0,0 @@
-/**************************************************************************
-* Copyright (C) 2011 Mishael A Sibiryakov (death@junki.org)
-**************************************************************************/
-
-#ifndef FREESPACE_H
-#define FREESPACE_H
-
-#include "common.h"
-#include "area.h"
-
-typedef struct FreeSpace {
-	Area area;
-} FreeSpace;
-
-void cleanup_freespace();
-void init_freespace_panel(void *panel);
-
-int resize_freespace(void *obj);
-
-#endif
--- a/src/launcher/icon-theme-common.c
+++ b/src/launcher/icon-theme-common.c
@@ -536,9 +536,6 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 	char *next_larger = NULL;
 	GSList *next_larger_theme = NULL;

-	int file_name_size = 4096;
-	char *file_name = calloc(file_name_size, 1);
-
 	for (theme = themes; theme; theme = g_slist_next(theme)) {
 		((IconTheme*)theme->data)->list_directories = g_slist_sort_with_data(((IconTheme*)theme->data)->list_directories,
 																			 compare_theme_directories,
@@ -563,13 +560,8 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 					char *theme_name = ((IconTheme*)theme->data)->name;
 					char *dir_name = ((IconThemeDir*)dir->data)->name;
 					char *extension = (char*) ext->data;
-					if (strlen(base_name) + strlen(theme_name) +
-						strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100 > file_name_size) {
-						file_name_size = strlen(base_name) + strlen(theme_name) +
-										 strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100;
-						file_name = realloc(file_name, file_name_size);
-					}
-					file_name[0] = 0;
+					char *file_name = calloc(strlen(base_name) + strlen(theme_name) +
+											 strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100, 1);
 					// filename = directory/$(themename)/subdirectory/iconname.extension
 					sprintf(file_name, "%s/%s/%s/%s%s", base_name, theme_name, dir_name, icon_name, extension);
 					if (DEBUG_ICON_SEARCH)
@@ -604,12 +596,11 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 								printf("next_larger = %s; next_larger_size = %d\n", next_larger, next_larger_size);
 						}
 					}
+					free(file_name);
 				}
 			}
 		}
 	}
-	free(file_name);
-	file_name = NULL;
 	if (next_larger) {
 		g_slist_free(extensions);
 		free(best_file_name);
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -31,8 +31,6 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <sys/types.h>
-#include <sys/wait.h>

 #ifdef HAVE_RSVG
 #include <librsvg/rsvg.h>
@@ -152,7 +150,8 @@ void cleanup_launcher_theme(Launcher *launcher)
 	for (l = launcher->list_icons; l ; l = l->next) {
 		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
 		if (launcherIcon) {
-			free_icon(launcherIcon->image);
+			free_icon(launcherIcon->icon_scaled);
+			free_icon(launcherIcon->icon_original);
 			free(launcherIcon->icon_name);
 			free(launcherIcon->icon_path);
 			free(launcherIcon->cmd);
@@ -187,7 +186,7 @@ int resize_launcher(void *obj)
 	// Resize icons if necessary
 	for (l = launcher->list_icons; l ; l = l->next) {
 		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon->icon_size != icon_size || !launcherIcon->image) {
+		if (launcherIcon->icon_size != icon_size || !launcherIcon->icon_original) {
 			launcherIcon->icon_size = icon_size;
 			launcherIcon->area.width = launcherIcon->icon_size;
 			launcherIcon->area.height = launcherIcon->icon_size;
@@ -196,69 +195,69 @@ int resize_launcher(void *obj)
 			char *new_icon_path = get_icon_path(launcher->list_themes, launcherIcon->icon_name, launcherIcon->icon_size);
 			if (!new_icon_path) {
 				// Draw a blank icon
-				free_icon(launcherIcon->image);
-				launcherIcon->image = NULL;
+				free_icon(launcherIcon->icon_original);
+				launcherIcon->icon_original = NULL;
+				free_icon(launcherIcon->icon_scaled);
+				launcherIcon->icon_scaled = NULL;
 				continue;
 			}
-
-			// Free the old files
-			free_icon(launcherIcon->image);
-			launcherIcon->image = NULL;
-			// Load the new file and scale
-			launcherIcon->image = imlib_load_image_immediately(new_icon_path);
+			if (launcherIcon->icon_path && strcmp(new_icon_path, launcherIcon->icon_path) == 0) {
+				// If it's the same file just rescale
+				free_icon(launcherIcon->icon_scaled);
+				launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, icon_size);
+				free(new_icon_path);
+				fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+			} else {
+				// Free the old files
+				free_icon(launcherIcon->icon_original);
+				free_icon(launcherIcon->icon_scaled);
+				launcherIcon->icon_original = launcherIcon->icon_scaled = NULL;
+				// Load the new file and scale
+				launcherIcon->icon_original = imlib_load_image_immediately(new_icon_path);
 #ifdef HAVE_RSVG
-			if (!launcherIcon->image && g_str_has_suffix(new_icon_path, ".svg")) {
-				char suffix[128];
-				sprintf(suffix, "tmpicon-%d.png", getpid());
-				// We fork here because librsvg allocates memory like crazy
-				pid_t pid = fork();
-				if (pid == 0) {
-					// Child
+				if (!launcherIcon->icon_original && g_str_has_suffix(new_icon_path, ".svg")) {
 					GError* err = NULL;
 					RsvgHandle* svg = rsvg_handle_new_from_file(new_icon_path, &err);

 					if (err != NULL) {
 						fprintf(stderr, "Could not load svg image!: %s", err->message);
 						g_error_free(err);
-						launcherIcon->image = NULL;
+						launcherIcon->icon_original = NULL;
 					} else {
+						char suffix[128];
+						sprintf(suffix, "tmpicon-%d.png", getpid());
 						gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
 						GdkPixbuf *pixbuf = rsvg_handle_get_pixbuf(svg);
 						gdk_pixbuf_save(pixbuf, name, "png", NULL, NULL);
+						launcherIcon->icon_original = imlib_load_image_immediately_without_cache(name);
+						g_remove(name);
+						g_free(name);
+						g_object_unref(G_OBJECT(pixbuf));
+						g_object_unref(G_OBJECT(svg));
 					}
-					exit(0);
-				} else {
-					// Parent
-					waitpid(pid, 0, 0);
-					gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
-					launcherIcon->image = imlib_load_image_immediately_without_cache(name);
-					g_remove(name);
-					g_free(name);
-				}
-			} else
+				} else
 #endif
-			{
-				launcherIcon->image = imlib_load_image_immediately(new_icon_path);
-			}
-			// On loading error, fallback to default
-			if (!launcherIcon->image) {
-				free(new_icon_path);
-				new_icon_path = get_icon_path(launcher->list_themes, DEFAULT_ICON, launcherIcon->icon_size);
-				if (new_icon_path)
-					launcherIcon->image = imlib_load_image_immediately(new_icon_path);
-			}
+				{
+					launcherIcon->icon_original = imlib_load_image_immediately(new_icon_path);
+				}
+				// On loading error, fallback to default
+				if (!launcherIcon->icon_original) {
+					free(new_icon_path);
+					new_icon_path = get_icon_path(launcher->list_themes, DEFAULT_ICON, launcherIcon->icon_size);
+					if (new_icon_path)
+						launcherIcon->icon_original = imlib_load_image_immediately(new_icon_path);
+				}

-			if (!launcherIcon->image) {
-				// Loading default icon failed, draw a blank icon
-				free(new_icon_path);
-			} else {
-				// Loaded icon successfully
-				Imlib_Image original = launcherIcon->image;
-				launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
-				free_icon(original);
-				free(launcherIcon->icon_path);
-				launcherIcon->icon_path = new_icon_path;
-				fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+				if (!launcherIcon->icon_original) {
+					// Loading default icon failed, draw a blank icon
+					free(new_icon_path);
+				} else {
+					// Loaded icon successfully
+					launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, launcherIcon->icon_size);
+					free(launcherIcon->icon_path);
+					launcherIcon->icon_path = new_icon_path;
+					fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+				}
 			}
 		}
 	}
@@ -332,7 +331,6 @@ int resize_launcher(void *obj)
 			}
 		}
 	}
-
 	return 1;
 }

@@ -357,8 +355,9 @@ void draw_launcher_icon(void *obj, cairo_t *c)
 {
 	LauncherIcon *launcherIcon = (LauncherIcon*)obj;

+	Imlib_Image icon_scaled = launcherIcon->icon_scaled;
 	// Render
-	imlib_context_set_image(launcherIcon->image);
+	imlib_context_set_image(icon_scaled);
 	if (server.real_transparency) {
 		render_image(launcherIcon->area.pix, 0, 0);
 	} else {
@@ -404,7 +403,7 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
 	char *cmd = calloc(strlen(icon->cmd) + 10, 1);
 	sprintf(cmd, "(%s&)", icon->cmd);
 #if HAVE_SN
-	SnLauncherContext* ctx = 0;
+	SnLauncherContext* ctx;
 	Time time;
 	if (startup_notifications) {
 		ctx = sn_launcher_context_new(server.sn_dsp, server.screen);
--- a/src/launcher/launcher.h
+++ b/src/launcher/launcher.h
@@ -23,7 +23,8 @@ typedef struct Launcher {
 typedef struct LauncherIcon {
 	// always start with area
 	Area area;
-	Imlib_Image image;
+	Imlib_Image icon_scaled;
+	Imlib_Image icon_original;
 	char *cmd;
 	char *icon_name;
 	char *icon_path;
--- a/src/panel.c
+++ b/src/panel.c
@@ -204,8 +204,6 @@ void init_panel()
 			}
 			if (panel_items_order[k] == 'C')
 				init_clock_panel(p);
-			if (panel_items_order[k] == 'F' && !strstr(panel_items_order, "T"))
-				init_freespace_panel(p);
 		}
 		set_panel_items_order(p);

@@ -324,13 +322,13 @@ void init_panel_size_and_position(Panel *panel)

 int resize_panel(void *obj)
 {
-	Panel *panel = (Panel*)obj;
-	resize_by_layout(panel, 0);
+	resize_by_layout(obj, 0);
 	
 	//printf("resize_panel\n");
 	if (panel_mode != MULTI_DESKTOP && taskbar_enabled) {
 		// propagate width/height on hidden taskbar
 		int i, width, height;
+		Panel *panel = (Panel*)obj;
 		width = panel->taskbar[server.desktop].area.width;
 		height = panel->taskbar[server.desktop].area.height;
 		for (i=0 ; i < panel->nb_desktop ; i++) {
@@ -341,6 +339,7 @@ int resize_panel(void *obj)
 	}
 	if (panel_mode == MULTI_DESKTOP && taskbar_enabled && taskbar_distribute_size) {
 		// Distribute the available space between taskbars
+		Panel *panel = (Panel*)obj;

 		// Compute the total available size, and the total size requested by the taskbars
 		int total_size = 0;
@@ -355,7 +354,7 @@ int resize_panel(void *obj)
 			}

 			Taskbar *taskbar = &panel->taskbar[i];
-			GList *l;
+			GSList *l;
 			for (l = taskbar->area.list; l; l = l->next) {
 				Area *child = l->data;
 				if (!child->on_screen)
@@ -390,7 +389,7 @@ int resize_panel(void *obj)

 				int requested_size = (2 * taskbar->area.bg->border.width) + (2 * taskbar->area.paddingxlr);
 				int items = 0;
-				GList *l = taskbar->area.list;
+				GSList *l = taskbar->area.list;
 				if (taskbarname_enabled)
 					l = l->next;
 				for (; l; l = l->next) {
@@ -419,8 +418,6 @@ int resize_panel(void *obj)
 			}
 		}
 	}
-	if (panel->freespace.area.on_screen)
-		resize_freespace(&panel->freespace);
 	return 0;
 }

@@ -485,31 +482,39 @@ void set_panel_items_order(Panel *p)
 	int k, j;
 	
 	if (p->area.list) {
-		g_list_free(p->area.list);
+		g_slist_free(p->area.list);
 		p->area.list = 0;
 	}

 	for (k=0 ; k < strlen(panel_items_order) ; k++) {
 		if (panel_items_order[k] == 'L') {
-			p->area.list = g_list_append(p->area.list, &p->launcher);
+			p->area.list = g_slist_append(p->area.list, &p->launcher);
 			p->launcher.area.resize = 1;
 		}
 		if (panel_items_order[k] == 'T') {
 			for (j=0 ; j < p->nb_desktop ; j++)
-				p->area.list = g_list_append(p->area.list, &p->taskbar[j]);
+				p->area.list = g_slist_append(p->area.list, &p->taskbar[j]);
 		}
 #ifdef ENABLE_BATTERY
 		if (panel_items_order[k] == 'B') 
-			p->area.list = g_list_append(p->area.list, &p->battery);
+			p->area.list = g_slist_append(p->area.list, &p->battery);
 #endif
 		int i = p - panel1;
 		if (panel_items_order[k] == 'S' && systray_on_monitor(i, nb_panel)) {
-			p->area.list = g_list_append(p->area.list, &systray);
+			p->area.list = g_slist_append(p->area.list, &systray);
 		}
 		if (panel_items_order[k] == 'C')
-			p->area.list = g_list_append(p->area.list, &p->clock);
-		if (panel_items_order[k] == 'F')
-			p->area.list = g_list_append(p->area.list, &p->freespace);
+			p->area.list = g_slist_append(p->area.list, &p->clock);
+		if (panel_items_order[k] == 'F') {
+			Area *spacer = calloc(sizeof(Area), 1);
+			spacer->panel = p;
+			spacer->parent = p;
+			spacer->bg = &g_array_index(backgrounds, Background, 0);
+			spacer->on_screen = 1;
+			spacer->size_mode = SIZE_BY_LAYOUT;
+			spacer->gc = 1;
+			p->area.list = g_slist_append(p->area.list, spacer);
+		}
 	}
 	init_rendering(&p->area, 0);
 }
@@ -634,7 +639,7 @@ void set_panel_background(Panel *p)
 	}

 	// redraw panel's object
-	GList *l0;
+	GSList *l0;
 	Area *a;
 	for (l0 = p->area.list; l0 ; l0 = l0->next) {
 		a = l0->data;
@@ -700,7 +705,7 @@ Taskbar *click_taskbar (Panel *panel, int x, int y)

 Task *click_task (Panel *panel, int x, int y)
 {
-	GList *l0;
+	GSList *l0;
 	Taskbar *tskbar;

 	if ( (tskbar = click_taskbar(panel, x, y)) ) {
@@ -802,7 +807,7 @@ Area* click_area(Panel *panel, int x, int y)
 	Area* new_result = result;
 	do {
 		result = new_result;
-		GList* it = result->list;
+		GSList* it = result->list;
 		while (it) {
 			Area* a = it->data;
 			if (a->on_screen && x >= a->posx && x <= (a->posx + a->width)
--- a/src/panel.h
+++ b/src/panel.h
@@ -20,7 +20,6 @@
 #include "taskbar.h"
 #include "systraybar.h"
 #include "launcher.h"
-#include "freespace.h"

 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -117,8 +116,6 @@ typedef struct {

 	Launcher launcher;

-	FreeSpace freespace;
-
 	// autohide
 	int is_hidden;
 	int hidden_width, hidden_height;
--- a/src/server.c
+++ b/src/server.c
@@ -98,7 +98,6 @@ void server_init_atoms ()
 	server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ORIENTATION", False);
 	server.atom._XEMBED = XInternAtom(server.dsp, "_XEMBED", False);
 	server.atom._XEMBED_INFO = XInternAtom(server.dsp, "_XEMBED_INFO", False);
-	server.atom._NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);

 	// drag 'n' drop
 	server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);
--- a/src/server.h
+++ b/src/server.h
@@ -15,8 +15,9 @@

 #ifdef HAVE_SN
 #include <libsn/sn.h>
-#endif
 #include <glib.h>
+#endif
+

 typedef struct Global_atom
 {
@@ -73,7 +74,6 @@ typedef struct Global_atom
 	Atom _NET_SYSTEM_TRAY_ORIENTATION;
 	Atom _XEMBED;
 	Atom _XEMBED_INFO;
-	Atom _NET_WM_PID;
 	Atom _XSETTINGS_SCREEN;
 	Atom _XSETTINGS_SETTINGS;
 	Atom XdndAware;
@@ -154,4 +154,4 @@ void get_monitors();
 void get_desktops();
 int server_get_number_of_desktops();

-#endif
+#endif
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -41,6 +41,8 @@ GSList *icons;
 #define SYSTEM_TRAY_BEGIN_MESSAGE   1
 #define SYSTEM_TRAY_CANCEL_MESSAGE  2

+#define FORCE_COMPOSITED_RENDERING  1
+
 // selection window
 Window net_sel_win = None;

@@ -50,8 +52,7 @@ int refresh_systray;
 int systray_enabled;
 int systray_max_icon_size;
 int systray_monitor;
-int chrono;
-int systray_composited;
+
 // background pixmap if we render ourselves the icons
 static Pixmap render_background;

@@ -60,9 +61,8 @@ void default_systray()
 {
 	memset(&systray, 0, sizeof(Systraybar));
 	render_background = 0;
-	chrono = 0;
 	systray.alpha = 100;
-	systray.sort = SYSTRAY_SORT_LEFT2RIGHT;
+	systray.sort = 3;
 	systray.area._draw_foreground = draw_systray;
 	systray.area._on_change_layout = on_change_systray;
 	systray.area.size_mode = SIZE_BY_CONTENT;
@@ -85,19 +85,16 @@ void cleanup_systray()

 void init_systray()
 {
+	start_net();
+
 	if (!systray_enabled)
 		return;

-	systray_composited = !server.disable_transparency && server.visual32 && server.colormap32;
-	printf("Systray composited rendering %s\n", systray_composited ? "on" : "off");
-
-	if (!systray_composited) {
-		printf("systray_asb forced to 100 0 0\n");
+	if (!server.visual32 && (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)) {
+		printf("No 32 bit visual for your X implementation. 'systray_asb = 100 0 0' will be forced\n");
 		systray.alpha = 100;
 		systray.brightness = systray.saturation = 0;
 	}
-
-	start_net();
 }


@@ -111,13 +108,12 @@ void init_systray_panel(void *p)
 	GSList *l;
 	int count = 0;
 	for (l = systray.list_icons; l ; l = l->next) {
-		if (((TrayWindow*)l->data)->hide)
-			continue;
-		count++;
+		if (!((TrayWindow*)l->data)->hide)
+			count++;
 	}
 	if (count == 0)
 		hide(&systray.area);
-	else
+	else 
 		show(&systray.area);
 	refresh_systray = 0;
 }
@@ -125,9 +121,8 @@ void init_systray_panel(void *p)

 void draw_systray(void *obj, cairo_t *c)
 {
-	if (systray_composited) {
-		if (render_background)
-			XFreePixmap(server.dsp, render_background);
+	if (FORCE_COMPOSITED_RENDERING || server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+		if (render_background) XFreePixmap(server.dsp, render_background);
 		render_background = XCreatePixmap(server.dsp, server.root_win, systray.area.width, systray.area.height, server.depth);
 		XCopyArea(server.dsp, systray.area.pix, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0);
 	}
@@ -151,9 +146,8 @@ int resize_systray(void *obj)
 		sysbar->icon_size = systray_max_icon_size;
 	count = 0;
 	for (l = systray.list_icons; l ; l = l->next) {
-		if (((TrayWindow*)l->data)->hide)
-			continue;
-		count++;
+		if (!((TrayWindow*)l->data)->hide)
+			count++;
 	}
 	//printf("count %d\n", count);

@@ -164,7 +158,8 @@ int resize_systray(void *obj)
 		sysbar->marging = height - (sysbar->icons_per_column-1)*(sysbar->icon_size+sysbar->area.paddingx) - sysbar->icon_size;
 		sysbar->icons_per_row = count / sysbar->icons_per_column + (count%sysbar->icons_per_column != 0);
 		systray.area.width = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (sysbar->icon_size * sysbar->icons_per_row) + ((sysbar->icons_per_row-1) * systray.area.paddingx);
-	} else {
+	}
+	else {
 		int width = sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
 		// here icons_per_row always higher than 0
 		sysbar->icons_per_row = (width+sysbar->area.paddingx) / (sysbar->icon_size+sysbar->area.paddingx);
@@ -189,46 +184,44 @@ void on_change_systray (void *obj)
 	if (panel_horizontal) {
 		posy = start;
 		posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr;
-	} else {
+	}
+	else {
 		posx = start;
 		posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr;
 	}

 	TrayWindow *traywin;
 	GSList *l;
-	for (i = 1, l = systray.list_icons; l ; i++, l = l->next) {
+	for (i=1, l = systray.list_icons; l ; i++, l = l->next) {
 		traywin = (TrayWindow*)l->data;
-		if (traywin->hide)
-			continue;
+		if (traywin->hide) continue;

 		traywin->y = posy;
 		traywin->x = posx;
-		// printf("systray %d %d : pos %d, %d\n", traywin->parent, traywin->win, posx, posy);
+		//printf("systray %d : %d,%d\n", i, posx, posy);
 		traywin->width = sysbar->icon_size;
 		traywin->height = sysbar->icon_size;
 		if (panel_horizontal) {
-			if (i % sysbar->icons_per_column) {
+			if (i % sysbar->icons_per_column)
 				posy += sysbar->icon_size + sysbar->area.paddingx;
-			} else {
+			else {
 				posy = start;
 				posx += (sysbar->icon_size + systray.area.paddingx);
 			}
-		} else {
-			if (i % sysbar->icons_per_row) {
+		}
+		else {
+			if (i % sysbar->icons_per_row)
 				posx += sysbar->icon_size + systray.area.paddingx;
-			} else {
+			else {
 				posx = start;
 				posy += (sysbar->icon_size + systray.area.paddingx);
 			}
 		}

 		// position and size the icon window
-		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);
-		}
+		XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, sysbar->icon_size, sysbar->icon_size);
+		XResizeWindow(server.dsp, traywin->tray_id, sysbar->icon_size, sysbar->icon_size);
 	}
-	refresh_systray = 1;
 }


@@ -242,10 +235,10 @@ void start_net()
 		if (!systray_enabled)
 			stop_net();
 		return;
-	} else {
+	}
+	else
 		if (!systray_enabled)
 			return;
-	}

 	Window win = XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN);

@@ -280,7 +273,7 @@ void start_net()
 	long orient = 0;
 	XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 1);
 	VisualID vid;
-	if (systray_composited)
+	if (server.visual32 && (FORCE_COMPOSITED_RENDERING || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0))
 		vid = XVisualIDFromVisual(server.visual32);
 	else
 		vid = XVisualIDFromVisual(server.visual);
@@ -330,9 +323,10 @@ void stop_net()
 gboolean error;
 int window_error_handler(Display *d, XErrorEvent *e)
 {
+	d=d;e=e;
 	error = TRUE;
 	if (e->error_code != BadWindow) {
-		printf("systray: error code %d\n", e->error_code);
+		printf("error_handler %d\n", e->error_code);
 	}
 	return 0;
 }
@@ -342,201 +336,70 @@ static gint compare_traywindows(gconstpointer a, gconstpointer b)
 {
 	const TrayWindow * traywin_a = (TrayWindow*)a;
 	const TrayWindow * traywin_b = (TrayWindow*)b;
+	XTextProperty name_a, name_b;

-	if (traywin_a->empty && !traywin_b->empty)
-		return 1 * (systray.sort == SYSTRAY_SORT_RIGHT2LEFT ? -1 : 1);
-	if (!traywin_a->empty && traywin_b->empty)
-		return -1 * (systray.sort == SYSTRAY_SORT_RIGHT2LEFT ? -1 : 1);
-
-	if (systray.sort == SYSTRAY_SORT_ASCENDING ||
-		systray.sort == SYSTRAY_SORT_DESCENDING) {
-		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(XGetWMName(server.dsp, traywin_a->tray_id, &name_a) == 0) {
+		return -1;
 	}
-
-	if (systray.sort == SYSTRAY_SORT_LEFT2RIGHT ||
-		systray.sort == SYSTRAY_SORT_RIGHT2LEFT) {
-		return (traywin_a->chrono - traywin_b->chrono) *
-				(systray.sort == SYSTRAY_SORT_LEFT2RIGHT ? 1 : -1);
+	else if(XGetWMName(server.dsp, traywin_b->tray_id, &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;
+		XFree(name_a.value);
+		XFree(name_b.value);
+		return retval;
 	}
-
-	return 0;
 }


-gboolean add_icon(Window win)
+gboolean add_icon(Window id)
 {
 	TrayWindow *traywin;
+	XErrorHandler old;
 	Panel *panel = systray.area.panel;
 	int hide = 0;

-	// Get the process ID of the application that created the window
-	int pid = 0;
-	{
-		Atom actual_type;
-		int actual_format;
-		unsigned long nitems;
-		unsigned long bytes_after;
-		unsigned char *prop = 0;
-		int ret = XGetWindowProperty(server.dsp, win, server.atom._NET_WM_PID, 0, 1024, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop);
-		if (ret == Success && prop) {
-			pid = prop[1] * 256;
-			pid += prop[0];
-		}
-	}
-
-	// Check if the application leaves behind empty icons
 	GSList *l;
-	int num_empty_same_pid = 0;
 	for (l = systray.list_icons; l; l = l->next) {
-		if (((TrayWindow*)l->data)->win == win)
+		if (((TrayWindow*)l->data)->tray_id == id)
 			return FALSE;
-		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
-	const int max_num_empty_same_pid = 0;
-	if (num_empty_same_pid > max_num_empty_same_pid) {
-		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, "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
+	error = FALSE;
 	XWindowAttributes attr;
-	if (XGetWindowAttributes(server.dsp, win, &attr) == False)
-		return FALSE;
+	if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE;
 	unsigned long mask = 0;
 	XSetWindowAttributes set_attr;
 	Visual* visual = server.visual;
 	//printf("icon with depth: %d, width %d, height %d\n", attr.depth, attr.width, attr.height);
-	if (systray_composited || attr.depth != server.depth) {
+	//printf("icon with depth: %d\n", attr.depth);
+	if (attr.depth != server.depth || FORCE_COMPOSITED_RENDERING || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
 		visual = attr.visual;
 		set_attr.colormap = attr.colormap;
 		set_attr.background_pixel = 0;
 		set_attr.border_pixel = 0;
 		mask = CWColormap|CWBackPixel|CWBorderPixel;
-	} else {
+	}
+	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
-	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->chrono = chrono;
-	chrono++;
-
-	if (systray.area.on_screen == 0)
-		show(&systray.area);
-
-	if (systray.sort == SYSTRAY_SORT_RIGHT2LEFT)
-		systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
-	else
-		systray.list_icons = g_slist_append(systray.list_icons, traywin);
-	systray.list_icons = g_slist_sort(systray.list_icons, compare_traywindows);
-	// printf("add_icon win %lx, %d\n", win, g_slist_length(systray.list_icons));
-
-	// Resize and redraw the systray
-	systray.area.resize = 1;
-	systray.area.redraw = 1;
-	panel->area.resize = 1;
-	panel_refresh = 1;
-	return TRUE;
-}
-
-gboolean reparent_icon(TrayWindow *traywin)
-{
-	if (traywin->reparented)
-		return TRUE;
-
-	Panel* panel = systray.area.panel;
-
-	// Reparent
-	XSync(server.dsp, False);
-	error = FALSE;
-	XErrorHandler old = XSetErrorHandler(window_error_handler);
-	XReparentWindow(server.dsp, traywin->win, traywin->parent, 0, 0);
-	XSync(server.dsp, False);
-	XSetErrorHandler(old);
-	if (error != FALSE) {
-		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;
-	}
-
-	// Watch for the icon trying to resize itself / closing again
-	XSync(server.dsp, False);
-	error = FALSE;
+	Window parent_window;
+	parent_window = XCreateWindow(server.dsp, panel->main_win, 0, 0, 30, 30, 0, attr.depth, InputOutput, visual, mask, &set_attr);
 	old = XSetErrorHandler(window_error_handler);
-	XSelectInput(server.dsp, traywin->win, StructureNotifyMask);
+	XReparentWindow(server.dsp, id, parent_window, 0, 0);
+	// watch for the icon trying to resize itself / closing again!
+	XSelectInput(server.dsp, id, StructureNotifyMask);
 	XSync(server.dsp, False);
 	XSetErrorHandler(old);
 	if (error != FALSE) {
-		printf("systray %d: cannot embed icon for window %lu parent %lu pid %d\n", __LINE__, traywin->win, traywin->parent, traywin->pid);
-		remove_icon(traywin);
+		fprintf(stderr, "tint2 : not icon_swallow\n");
+		XDestroyWindow(server.dsp, parent_window);
 		return FALSE;
 	}

-	traywin->reparented = 1;
-
-	// Embed into parent
-	{
-		XEvent e;
-		e.xclient.type = ClientMessage;
-		e.xclient.serial = 0;
-		e.xclient.send_event = True;
-		e.xclient.message_type = server.atom._XEMBED;
-		e.xclient.window = traywin->win;
-		e.xclient.format = 32;
-		e.xclient.data.l[0] = CurrentTime;
-		e.xclient.data.l[1] = XEMBED_EMBEDDED_NOTIFY;
-		e.xclient.data.l[2] = 0;
-		e.xclient.data.l[3] = traywin->parent;
-		e.xclient.data.l[4] = 0;
-		XSync(server.dsp, False);
-		error = FALSE;
-		XErrorHandler old = XSetErrorHandler(window_error_handler);
-		XSendEvent(server.dsp, traywin->win, False, 0xFFFFFF, &e);
-		XSync(server.dsp, False);
-		XSetErrorHandler(old);
-		if (error != FALSE) {
-			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;
@@ -544,7 +407,7 @@ gboolean reparent_icon(TrayWindow *traywin)
 		unsigned char *data = 0;
 		int ret;

-		ret = XGetWindowProperty(server.dsp, traywin->win, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data);
+		ret = XGetWindowProperty(server.dsp, id, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data);
 		if (ret == Success) {
 			if (data) {
 				if (nbitem == 2) {
@@ -553,51 +416,84 @@ gboolean reparent_icon(TrayWindow *traywin)
 				}
 				XFree(data);
 			}
-		} else {
+		}
+		else {
 			fprintf(stderr, "tint2 : xembed error\n");
-			remove_icon(traywin);
+			XDestroyWindow(server.dsp, parent_window);
 			return FALSE;
 		}
 	}
-
-	// Redirect rendering when using compositing
-	if (systray_composited) {
-		traywin->damage = XDamageCreate(server.dsp, traywin->parent, XDamageReportRawRectangles);
-		XCompositeRedirectWindow(server.dsp, traywin->parent, CompositeRedirectManual);
+	{
+		XEvent e;
+		e.xclient.type = ClientMessage;
+		e.xclient.serial = 0;
+		e.xclient.send_event = True;
+		e.xclient.message_type = server.atom._XEMBED;
+		e.xclient.window = id;
+		e.xclient.format = 32;
+		e.xclient.data.l[0] = CurrentTime;
+		e.xclient.data.l[1] = XEMBED_EMBEDDED_NOTIFY;
+		e.xclient.data.l[2] = 0;
+		e.xclient.data.l[3] = parent_window;
+		e.xclient.data.l[4] = 0;
+		XSendEvent(server.dsp, id, False, 0xFFFFFF, &e);
 	}

-	// Make the icon visible
+	traywin = g_new0(TrayWindow, 1);
+	traywin->id = parent_window;
+	traywin->tray_id = id;
+	traywin->hide = hide;
+	traywin->depth = attr.depth;
+	traywin->damage = 0;
+
+	if (systray.area.on_screen == 0)
+		show(&systray.area);
+
+	if (systray.sort == 3)
+		systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
+	else if (systray.sort == 2)
+		systray.list_icons = g_slist_append(systray.list_icons, traywin);
+	else
+		systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows);
+	//printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons));
+
+	if (FORCE_COMPOSITED_RENDERING || server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+		traywin->damage = XDamageCreate(server.dsp, traywin->id, XDamageReportRawRectangles);
+		XCompositeRedirectWindow(server.dsp, traywin->id, CompositeRedirectManual);
+	}
+
+	// show the window
 	if (!traywin->hide)
-		XMapWindow(server.dsp, traywin->win);
+		XMapWindow(server.dsp, traywin->tray_id);
 	if (!traywin->hide && !panel->is_hidden)
-		XMapRaised(server.dsp, traywin->parent);
-
-	XMoveResizeWindow(server.dsp, traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height);
-	XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height);
-
-	XFlush(server.dsp);
+		XMapRaised(server.dsp, traywin->id);

+	// changed in systray
+	systray.area.resize = 1;
+	panel_refresh = 1;
 	return TRUE;
 }

+
 void remove_icon(TrayWindow *traywin)
 {
+	XErrorHandler old;
+
 	// remove from our list
 	systray.list_icons = g_slist_remove(systray.list_icons, traywin);
-	printf("remove_icon: %lu\n", traywin->win);
+	//printf("remove_icon id %lx, %d\n", traywin->id);

-	XSelectInput(server.dsp, traywin->win, NoEventMask);
+	XSelectInput(server.dsp, traywin->tray_id, NoEventMask);
 	if (traywin->damage)
 		XDamageDestroy(server.dsp, traywin->damage);

 	// reparent to root
-	XSync(server.dsp, False);
 	error = FALSE;
-	XErrorHandler old = XSetErrorHandler(window_error_handler);
+	old = XSetErrorHandler(window_error_handler);
 	if (!traywin->hide)
-		XUnmapWindow(server.dsp, traywin->win);
-	XReparentWindow(server.dsp, traywin->win, server.root_win, 0, 0);
-	XDestroyWindow(server.dsp, traywin->parent);
+		XUnmapWindow(server.dsp, traywin->tray_id);
+	XReparentWindow(server.dsp, traywin->tray_id, server.root_win, 0, 0);
+	XDestroyWindow(server.dsp, traywin->id);
 	XSync(server.dsp, False);
 	XSetErrorHandler(old);
 	stop_timeout(traywin->render_timeout);
@@ -607,13 +503,12 @@ void remove_icon(TrayWindow *traywin)
 	int count = 0;
 	GSList *l;
 	for (l = systray.list_icons; l; l = l->next) {
-		if (((TrayWindow*)l->data)->hide)
-			continue;
-		count++;
+		if (!((TrayWindow*)l->data)->hide)
+			count++;
 	}
 	if (count == 0)
 		hide(&systray.area);
-
+		
 	// changed in systray
 	systray.area.resize = 1;
 	panel_refresh = 1;
@@ -623,119 +518,41 @@ void remove_icon(TrayWindow *traywin)
 void net_message(XClientMessageEvent *e)
 {
 	unsigned long opcode;
-	Window win;
+	Window id;

 	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_REQUEST_DOCK:
+			id = e->data.l[2];
+			if (id) add_icon(id);
+			break;

-	case SYSTEM_TRAY_BEGIN_MESSAGE:
-	case SYSTEM_TRAY_CANCEL_MESSAGE:
-		// we don't show baloons messages.
-		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;
+		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;
 	}
 }

-Display *display = NULL;
-XImage *tintXGetImage(Window win)
-{
-	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)
+void systray_render_icon_now(void* t)
 {
 	// we end up in this function only in real transparency mode or if systray_task_asb != 100 0 0
 	// 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;
-
-	// 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, 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;
-
+	traywin->render_timeout = 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(50, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
+		systray_render_icon(traywin);
 		return;
 	}

-	if (traywin->render_timeout) {
-		stop_timeout(traywin->render_timeout);
-		traywin->render_timeout = NULL;
-	}
-
-	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);
-			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
 	// mask out all pixel with the same rgb value
@@ -744,46 +561,22 @@ void systray_render_icon_composited(void* t)
 	// Very ugly hack, but somehow imlib2 is not able to get the image from the traywindow itself,
 	// so we first render the tray window onto a pixmap, and then we tell imlib2 to use this pixmap as
 	// 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;
-	}
-	XRenderPictFormat *f;
-	if (traywin->depth == 24) {
+	Pixmap tmp_pmap = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, 32);
+	XRenderPictFormat* f;
+	if (traywin->depth == 24)
 		f = XRenderFindStandardFormat(server.dsp, PictStandardRGB24);
-	} else if (traywin->depth == 32) {
+	else if (traywin->depth == 32)
 		f = XRenderFindStandardFormat(server.dsp, PictStandardARGB32);
-	} else {
+	else {
 		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;
-	}
-
-	XSync(server.dsp, False);
-	error = FALSE;
-	XErrorHandler old = XSetErrorHandler(window_error_handler);
-
+	Picture pict_image;
 	//if (server.real_transparency)
-	//Picture pict_image = XRenderCreatePicture(server.dsp, traywin->parent, f, 0, 0);
+		//pict_image = XRenderCreatePicture(server.dsp, traywin->id, f, 0, 0);
 	// reverted Rev 407 because here it's breaking alls icon with systray + xcompmgr
-	Picture pict_image = XRenderCreatePicture(server.dsp, traywin->win, f, 0, 0);
-	if (!pict_image) {
-		XFreePixmap(server.dsp, tmp_pmap);
-		XSetErrorHandler(old);
-		goto on_error;
-	}
+	pict_image = XRenderCreatePicture(server.dsp, traywin->tray_id, f, 0, 0);
 	Picture pict_drawable = XRenderCreatePicture(server.dsp, tmp_pmap, XRenderFindVisualFormat(server.dsp, server.visual32), 0, 0);
-	if (!pict_drawable) {
-		XRenderFreePicture(server.dsp, pict_image);
-		XFreePixmap(server.dsp, tmp_pmap);
-		XSetErrorHandler(old);
-		goto on_error;
-	}
 	XRenderComposite(server.dsp, PictOpSrc, pict_image, None, pict_drawable, 0, 0, 0, 0, 0, 0, traywin->width, traywin->height);
 	XRenderFreePicture(server.dsp, pict_image);
 	XRenderFreePicture(server.dsp, pict_drawable);
@@ -793,17 +586,12 @@ void systray_render_icon_composited(void* t)
 	imlib_context_set_colormap(server.colormap32);
 	imlib_context_set_drawable(tmp_pmap);
 	Imlib_Image image = imlib_create_image_from_drawable(0, 0, 0, traywin->width, traywin->height, 1);
-	if (!image) {
-		imlib_context_set_visual(server.visual);
-		imlib_context_set_colormap(server.colormap);
-		XFreePixmap(server.dsp, tmp_pmap);
-		XSetErrorHandler(old);
-		goto on_error;
-	}
+	if (image == 0)
+		return;

 	imlib_context_set_image(image);
 	//if (traywin->depth == 24)
-	//imlib_save_image("/home/thil77/test.jpg");
+		//imlib_save_image("/home/thil77/test.jpg");
 	imlib_image_set_has_alpha(1);
 	DATA32* data = imlib_image_get_data();
 	if (traywin->depth == 24) {
@@ -823,40 +611,21 @@ 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;
-
-	return;
-
-on_error:
-	printf("systray %d: rendering error for icon %lu pid %d\n", __LINE__, traywin->win, traywin->pid);
-	return;
-
-on_systray_error:
-	printf("systray %d: rendering error for icon %lu pid %d. Disabling compositing and restarting systray...\n", __LINE__, traywin->win, traywin->pid);
-	systray_composited = 0;
-	stop_net();
-	start_net();
-	return;
 }


 void systray_render_icon(TrayWindow* traywin)
 {
-	if (!reparent_icon(traywin))
-		return;
-
-	if (systray_composited) {
+	if (FORCE_COMPOSITED_RENDERING || server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+		// wine tray icons update whenever mouse is over them, so we limit the updates to 50 ms
 		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);
-		XClearArea(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height, True);
+			traywin->render_timeout = add_timeout(50, 0, systray_render_icon_now, traywin, &traywin->render_timeout);
+	}
+	else {
+		//			Pixmap pix = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, server.depth);
+		//			XCopyArea(server.dsp, panel->temp_pmap, pix, server.gc, traywin->x, traywin->y, traywin->width, traywin->height, 0, 0);
+		//			XSetWindowBackgroundPixmap(server.dsp, traywin->id, pix);
+		XClearArea(server.dsp, traywin->tray_id, 0, 0, traywin->width, traywin->height, True);
 	}
 }

@@ -867,8 +636,7 @@ void refresh_systray_icon()
 	GSList *l;
 	for (l = systray.list_icons; l ; l = l->next) {
 		traywin = (TrayWindow*)l->data;
-		if (traywin->hide)
-			continue;
+		if (traywin->hide) continue;
 		systray_render_icon(traywin);
 	}
 }
--- a/src/systray/systraybar.h
+++ b/src/systray/systraybar.h
@@ -20,7 +20,6 @@
 // Flags for _XEMBED_INFO
 #define XEMBED_MAPPED		(1 << 0)

-enum { SYSTRAY_SORT_ASCENDING, SYSTRAY_SORT_DESCENDING, SYSTRAY_SORT_LEFT2RIGHT, SYSTRAY_SORT_RIGHT2LEFT };

 typedef struct {
 	// always start with area
@@ -35,8 +34,8 @@ typedef struct {

 typedef struct
 {
-	Window parent;
-	Window win;
+	Window id;
+	Window tray_id;
 	int x, y;
 	int width, height;
 	// TODO: manage icon's show/hide
@@ -44,11 +43,6 @@ typedef struct
 	int depth;
 	Damage damage;
 	timeout* render_timeout;
-	int empty;
-	int pid;
-	int chrono;
-    struct timespec time_last_render;
-	int reparented;
 } TrayWindow;


--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -50,9 +50,6 @@ Task *add_task (Window win)
 	if (!win) return 0;
 	if (window_is_hidden(win)) return 0;

-	XSelectInput(server.dsp, win, PropertyChangeMask|StructureNotifyMask);
-	XFlush(server.dsp);
-
 	int monitor;
 	if (nb_panel > 1) {
 		monitor = window_get_monitor (win);
@@ -78,7 +75,8 @@ Task *add_task (Window win)
 	get_title(&new_tsk);
 	get_icon(&new_tsk);

-	//printf("new task %s win %u: desktop %d, monitor %d\n", new_tsk.title, win, new_tsk.desktop, monitor);
+	//printf("task %s : desktop %d, monitor %d\n", new_tsk->title, desktop, monitor);
+	XSelectInput (server.dsp, new_tsk.win, PropertyChangeMask|StructureNotifyMask);

 	GPtrArray* task_group = g_ptr_array_new();
 	Taskbar *tskbar;
@@ -111,7 +109,7 @@ Task *add_task (Window win)
 		}
 		new_tsk2->icon_width = new_tsk.icon_width;
 		new_tsk2->icon_height = new_tsk.icon_height;
-		tskbar->area.list = g_list_append(tskbar->area.list, new_tsk2);
+		tskbar->area.list = g_slist_append(tskbar->area.list, new_tsk2);
 		tskbar->area.resize = 1;
 		g_ptr_array_add(task_group, new_tsk2);
 		//printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
@@ -169,7 +167,7 @@ void remove_task (Task *tsk)
 	for (i=0; i<task_group->len; ++i) {
 		tsk2 = g_ptr_array_index(task_group, i);
 		tskbar = tsk2->area.parent;
-		tskbar->area.list = g_list_remove(tskbar->area.list, tsk2);
+		tskbar->area.list = g_slist_remove(tskbar->area.list, tsk2);
 		tskbar->area.resize = 1;
 		if (tsk2 == task_active) task_active = 0;
 		if (tsk2 == task_drag) task_drag = 0;
@@ -424,13 +422,15 @@ Task *find_active_task(Task *current_task, Task *active_task)
 	if (active_task == NULL)
 		return current_task;

+	GSList *l0;
+	Task *tsk;
 	Taskbar* tskbar = current_task->area.parent;

-	GList *l0 = tskbar->area.list;
+	l0 = tskbar->area.list;
 	if (taskbarname_enabled)
 		l0 = l0->next;
 	for (; l0 ; l0 = l0->next) {
-		Task *tsk = l0->data;
+		tsk = l0->data;
 		if (tsk->win == active_task->win)
 			return tsk;
 	}
@@ -443,13 +443,15 @@ Task *next_task(Task *tsk)
 	if (tsk == 0)
 		return 0;

+	GSList *l0, *lfirst_tsk;
+	Task *tsk1;
 	Taskbar* tskbar = tsk->area.parent;

-	GList *l0 = tskbar->area.list;
+	l0 = tskbar->area.list;
 	if (taskbarname_enabled) l0 = l0->next;
-	GList *lfirst_tsk = l0;
+	lfirst_tsk = l0;
 	for (; l0 ; l0 = l0->next) {
-		Task *tsk1 = l0->data;
+		tsk1 = l0->data;
 		if (tsk1 == tsk) {
 			if (l0->next == 0) l0 = lfirst_tsk;
 			else l0 = l0->next;
@@ -465,18 +467,19 @@ Task *prev_task(Task *tsk)
 	if (tsk == 0)
 		return 0;

+	GSList *l0, *lfirst_tsk;
 	Task *tsk1, *tsk2;
 	Taskbar* tskbar = tsk->area.parent;

 	tsk2 = 0;
-	GList *l0 = tskbar->area.list;
+	l0 = tskbar->area.list;
 	if (taskbarname_enabled) l0 = l0->next;
-	GList *lfirst_tsk = l0;
+	lfirst_tsk = l0;
 	for (; l0 ; l0 = l0->next) {
 		tsk1 = l0->data;
 		if (tsk1 == tsk) {
 			if (l0 == lfirst_tsk) {
-				l0 = g_list_last ( l0 );
+				l0 = g_slist_last ( l0 );
 				tsk2 = l0->data;
 			}
 			return tsk2;
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -47,7 +47,6 @@ int taskbar_distribute_size;
 int hide_inactive_tasks;
 int hide_task_diff_monitor;
 int taskbar_sort_method;
-int taskbar_alignment;

 guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
 gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
@@ -64,7 +63,6 @@ void default_taskbar()
 	hide_inactive_tasks = 0;
 	hide_task_diff_monitor = 0;
 	taskbar_sort_method = TASKBAR_NOSORT;
-	taskbar_alignment = ALIGN_LEFT;
 	default_taskbarname();
 }

@@ -99,7 +97,7 @@ void cleanup_taskbar()
 			}
 			free_area(&tskbar->area);
 			// remove taskbar from the panel
-			panel->area.list = g_list_remove(panel->area.list, tskbar);
+			panel->area.list = g_slist_remove(panel->area.list, tskbar);
 		}
 		if (panel->taskbar) {
 			free(panel->taskbar);
@@ -155,7 +153,6 @@ void init_taskbar_panel(void *p)
 	panel->g_taskbar.area.parent = panel;
 	panel->g_taskbar.area.panel = panel;
 	panel->g_taskbar.area.size_mode = SIZE_BY_LAYOUT;
-	panel->g_taskbar.area.alignment = taskbar_alignment;
 	panel->g_taskbar.area._resize = resize_taskbar;
 	panel->g_taskbar.area._draw_foreground = draw_taskbar;
 	panel->g_taskbar.area._on_change_layout = on_change_taskbar;
@@ -337,7 +334,7 @@ int resize_taskbar(void *obj)
 		resize_by_layout(obj, panel->g_task.maximum_width);
 		
 		text_width = panel->g_task.maximum_width;
-		GList *l = taskbar->area.list;
+		GSList *l = taskbar->area.list;
 		if (taskbarname_enabled) l = l->next;
 		for (; l != NULL; l = l->next) {
 			if (((Task *)l->data)->area.on_screen) {
@@ -391,7 +388,7 @@ void set_taskbar_state(Taskbar *tskbar, int state)
 		if (taskbarname_enabled && tskbar->bar_name.state_pix[state] == 0)
 			tskbar->bar_name.area.redraw = 1;
 		if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
-			GList *l = tskbar->area.list;
+			GSList *l = tskbar->area.list;
 			if (taskbarname_enabled) l = l->next;
 			for ( ; l ; l = l->next)
 				set_task_redraw(l->data);
@@ -514,7 +511,7 @@ int taskbar_needs_sort(Taskbar *taskbar)
 	if (taskbar_sort_method == TASKBAR_NOSORT)
 		return 0;

-	GList *i, *j;
+	GSList *i, *j;
 	for (i = taskbar->area.list, j = i ? i->next : NULL; i && j; i = i->next, j = j->next) {
 		if (compare_tasks(i->data, j->data, taskbar) > 0) {
 			return 1;
@@ -531,7 +528,7 @@ void sort_tasks(Taskbar *taskbar)
 	if (!taskbar_needs_sort(taskbar)) {
 		return;
 	}
-	taskbar->area.list = g_list_sort_with_data(taskbar->area.list, (GCompareDataFunc)compare_tasks, taskbar);
+	taskbar->area.list = g_slist_sort_with_data(taskbar->area.list, (GCompareDataFunc)compare_tasks, taskbar);
 	taskbar->area.resize = 1;
 	panel_refresh = 1;
 	((Panel*)taskbar->area.panel)->area.resize = 1;
--- a/src/taskbar/taskbar.h
+++ b/src/taskbar/taskbar.h
@@ -21,7 +21,6 @@ extern int hide_inactive_tasks;
 extern int hide_task_diff_monitor;
 enum { TASKBAR_NOSORT, TASKBAR_SORT_CENTER, TASKBAR_SORT_TITLE };
 extern int taskbar_sort_method;
-extern int taskbar_alignment;

 typedef struct {
 	// always start with area
--- a/src/taskbar/taskbarname.c
+++ b/src/taskbar/taskbarname.c
@@ -76,7 +76,7 @@ void init_taskbarname_panel(void *p)
 			tskbar->bar_name.name = g_strdup_printf("%d", j+1);
 		
 		// append the name at the beginning of taskbar
-		tskbar->area.list = g_list_append(tskbar->area.list, &tskbar->bar_name);
+		tskbar->area.list = g_slist_append(tskbar->area.list, &tskbar->bar_name);
 	}

 	for (l=list ; l ; l = l->next)
@@ -103,7 +103,7 @@ void cleanup_taskbarname()
 					XFreePixmap(server.dsp, tskbar->bar_name.state_pix[k]);
 				tskbar->bar_name.state_pix[k] = 0;
 			}
-			tskbar->area.list = g_list_remove(tskbar->area.list, &tskbar->bar_name);
+			tskbar->area.list = g_slist_remove(tskbar->area.list, &tskbar->bar_name);
 		}
 	}

--- a/src/tint.c
+++ b/src/tint.c
@@ -117,12 +117,12 @@ void init (int argc, char *argv[])
 	// BSD does not support pselect(), therefore we have to use select and hope that we do not
 	// end up in a race condition there (see 'man select()' on a linux machine for more information)
 	// block all signals, such that no race conditions occur before pselect in our main loop
-	//	sigset_t block_mask;
-	//	sigaddset(&block_mask, SIGINT);
-	//	sigaddset(&block_mask, SIGTERM);
-	//	sigaddset(&block_mask, SIGHUP);
-	//	sigaddset(&block_mask, SIGUSR1);
-	//	sigprocmask(SIG_BLOCK, &block_mask, 0);
+//	sigset_t block_mask;
+//	sigaddset(&block_mask, SIGINT);
+//	sigaddset(&block_mask, SIGTERM);
+//	sigaddset(&block_mask, SIGHUP);
+//	sigaddset(&block_mask, SIGUSR1);
+//	sigprocmask(SIG_BLOCK, &block_mask, 0);
 }

 static int sn_pipe_valid = 0;
@@ -241,7 +241,7 @@ void init_X11_post_config()

 	/* Catch events */
 	XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
-
+	
 	// load default icon
 	gchar *path;
 	const gchar * const *data_dirs;
@@ -323,60 +323,60 @@ void window_action (Task *tsk, int action)
 	if (!tsk) return;
 	int desk;
 	switch (action) {
-	case CLOSE:
-		set_close (tsk->win);
-		break;
-	case TOGGLE:
-		set_active(tsk->win);
-		break;
-	case ICONIFY:
-		XIconifyWindow (server.dsp, tsk->win, server.screen);
-		break;
-	case TOGGLE_ICONIFY:
-		if (task_active && tsk->win == task_active->win)
+		case CLOSE:
+			set_close (tsk->win);
+			break;
+		case TOGGLE:
+			set_active(tsk->win);
+			break;
+		case ICONIFY:
 			XIconifyWindow (server.dsp, tsk->win, server.screen);
-		else
-			set_active (tsk->win);
-		break;
-	case SHADE:
-		window_toggle_shade (tsk->win);
-		break;
-	case MAXIMIZE_RESTORE:
-		window_maximize_restore (tsk->win);
-		break;
-	case MAXIMIZE:
-		window_maximize_restore (tsk->win);
-		break;
-	case RESTORE:
-		window_maximize_restore (tsk->win);
-		break;
-	case DESKTOP_LEFT:
-		if ( tsk->desktop == 0 ) break;
-		desk = tsk->desktop - 1;
-		windows_set_desktop(tsk->win, desk);
-		if (desk == server.desktop)
-			set_active(tsk->win);
-		break;
-	case DESKTOP_RIGHT:
-		if (tsk->desktop == server.nb_desktop ) break;
-		desk = tsk->desktop + 1;
-		windows_set_desktop(tsk->win, desk);
-		if (desk == server.desktop)
-			set_active(tsk->win);
-		break;
-	case NEXT_TASK:
-	{
-		Task *tsk1;
-		tsk1 = next_task(find_active_task(tsk, task_active));
-		set_active(tsk1->win);
-	}
-		break;
-	case PREV_TASK:
-	{
-		Task *tsk1;
-		tsk1 = prev_task(find_active_task(tsk, task_active));
-		set_active(tsk1->win);
-	}
+			break;
+		case TOGGLE_ICONIFY:
+			if (task_active && tsk->win == task_active->win)
+				XIconifyWindow (server.dsp, tsk->win, server.screen);
+			else
+				set_active (tsk->win);
+			break;
+		case SHADE:
+			window_toggle_shade (tsk->win);
+			break;
+		case MAXIMIZE_RESTORE:
+			window_maximize_restore (tsk->win);
+			break;
+		case MAXIMIZE:
+			window_maximize_restore (tsk->win);
+			break;
+		case RESTORE:
+			window_maximize_restore (tsk->win);
+			break;
+		case DESKTOP_LEFT:
+			if ( tsk->desktop == 0 ) break;
+			desk = tsk->desktop - 1;
+			windows_set_desktop(tsk->win, desk);
+			if (desk == server.desktop)
+				set_active(tsk->win);
+			break;
+		case DESKTOP_RIGHT:
+			if (tsk->desktop == server.nb_desktop ) break;
+			desk = tsk->desktop + 1;
+			windows_set_desktop(tsk->win, desk);
+			if (desk == server.desktop)
+				set_active(tsk->win);
+			break;
+		case NEXT_TASK:
+			{
+				Task *tsk1;
+				tsk1 = next_task(find_active_task(tsk, task_active));
+				set_active(tsk1->win);
+			}
+			break;
+		case PREV_TASK:
+			{
+				Task *tsk1;
+				tsk1 = prev_task(find_active_task(tsk, task_active));
+				set_active(tsk1->win);
+			}
 	}
 }

@@ -386,10 +386,10 @@ int tint2_handles_click(Panel* panel, XButtonEvent* e)
 	Task* task = click_task(panel, e->x, e->y);
 	if (task) {
 		if(   (e->button == 1 && mouse_left != 0)
-			  || (e->button == 2 && mouse_middle != 0)
-			  || (e->button == 3 && mouse_right != 0)
-			  || (e->button == 4 && mouse_scroll_up != 0)
-			  || (e->button == 5 && mouse_scroll_down !=0) )
+			 || (e->button == 2 && mouse_middle != 0)
+			 || (e->button == 3 && mouse_right != 0)
+			 || (e->button == 4 && mouse_scroll_up != 0)
+			 || (e->button == 5 && mouse_scroll_down !=0) )
 		{
 			return 1;
 		}
@@ -470,8 +470,8 @@ void event_button_motion_notify (XEvent *e)
 		} else {
 			// Swap the task_drag with the task on the event's location (if they differ)
 			if(event_task && event_task != task_drag) {
-				GList * drag_iter = g_list_find(event_taskbar->area.list, task_drag);
-				GList * task_iter = g_list_find(event_taskbar->area.list, event_task);
+				GSList * drag_iter = g_slist_find(event_taskbar->area.list, task_drag);
+				GSList * task_iter = g_slist_find(event_taskbar->area.list, event_task);
 				if(drag_iter && task_iter) {
 					gpointer temp = task_iter->data;
 					task_iter->data = drag_iter->data;
@@ -488,14 +488,14 @@ void event_button_motion_notify (XEvent *e)
 			return;

 		Taskbar * drag_taskbar = (Taskbar*)task_drag->area.parent;
-		drag_taskbar->area.list = g_list_remove(drag_taskbar->area.list, task_drag);
+		drag_taskbar->area.list = g_slist_remove(drag_taskbar->area.list, task_drag);

 		if(event_taskbar->area.posx > drag_taskbar->area.posx || event_taskbar->area.posy > drag_taskbar->area.posy) {
 			int i = (taskbarname_enabled) ? 1 : 0;
-			event_taskbar->area.list = g_list_insert(event_taskbar->area.list, task_drag, i);
+			event_taskbar->area.list = g_slist_insert(event_taskbar->area.list, task_drag, i);
 		}
 		else
-			event_taskbar->area.list = g_list_append(event_taskbar->area.list, task_drag);
+			event_taskbar->area.list = g_slist_append(event_taskbar->area.list, task_drag);

 		// Move task to other desktop (but avoid the 'Window desktop changed' code in 'event_property_notify')
 		task_drag->area.parent = event_taskbar;
@@ -530,27 +530,27 @@ void event_button_release (XEvent *e)

 	int action = TOGGLE_ICONIFY;
 	switch (e->xbutton.button) {
-	case 1:
-		action = mouse_left;
-		break;
-	case 2:
-		action = mouse_middle;
-		break;
-	case 3:
-		action = mouse_right;
-		break;
-	case 4:
-		action = mouse_scroll_up;
-		break;
-	case 5:
-		action = mouse_scroll_down;
-		break;
-	case 6:
-		action = mouse_tilt_left;
-		break;
-	case 7:
-		action = mouse_tilt_right;
-		break;
+		case 1:
+			action = mouse_left;
+			break;
+		case 2:
+			action = mouse_middle;
+			break;
+		case 3:
+			action = mouse_right;
+			break;
+		case 4:
+			action = mouse_scroll_up;
+			break;
+		case 5:
+			action = mouse_scroll_down;
+			break;
+		case 6:
+			action = mouse_tilt_left;
+			break;
+		case 7:
+			action = mouse_tilt_right;
+			break;
 	}

 	if ( click_clock(panel, e->xbutton.x, e->xbutton.y)) {
@@ -677,9 +677,10 @@ void event_property_notify (XEvent *e)
 				// check ALLDESKTOP task => resize taskbar
 				Taskbar *tskbar;
 				Task *tsk;
+				GSList *l;
 				if (server.nb_desktop > old_desktop) {
 					tskbar = &panel->taskbar[old_desktop];
-					GList *l = tskbar->area.list;
+					l = tskbar->area.list;
 					if (taskbarname_enabled) l = l->next;
 					for (; l ; l = l->next) {
 						tsk = l->data;
@@ -693,7 +694,7 @@ void event_property_notify (XEvent *e)
 					}
 				}
 				tskbar = &panel->taskbar[server.desktop];
-				GList *l = tskbar->area.list;
+				l = tskbar->area.list;
 				if (taskbarname_enabled) l = l->next;
 				for (; l ; l = l->next) {
 					tsk = l->data;
@@ -726,7 +727,6 @@ void event_property_notify (XEvent *e)
 	}
 	else {
 		tsk = task_get_task (win);
-		//printf("change win = %u, task = %p\n", win, tsk);
 		if (!tsk) {
 			if (at != server.atom._NET_WM_STATE)
 				return;
@@ -830,13 +830,11 @@ void event_configure_notify (Window win)
 	GSList *l;
 	for (l = systray.list_icons; l ; l = l->next) {
 		traywin = (TrayWindow*)l->data;
-		if (traywin->win == win) {
+		if (traywin->tray_id == win) {
 			//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);
+			XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height);
+			XResizeWindow(server.dsp, traywin->tray_id, traywin->width, traywin->height);
 			panel_refresh = 1;
-			refresh_systray = 1;
 			return;
 		}
 	}
@@ -896,8 +894,8 @@ struct Property read_property(Display* disp, Window w, Atom property)
 		if (ret != 0)
 			XFree(ret);
 		XGetWindowProperty(disp, w, property, 0, read_bytes, False, AnyPropertyType,
-						   &actual_type, &actual_format, &nitems, &bytes_after,
-						   &ret);
+							&actual_type, &actual_format, &nitems, &bytes_after,
+							&ret);
 		read_bytes *= 2;
 	} while (bytes_after != 0);

@@ -1127,8 +1125,8 @@ start:
 	dnd_sent_request = 0;
 	dnd_launcher_exec = 0;

-	//	sigset_t empty_mask;
-	//	sigemptyset(&empty_mask);
+//	sigset_t empty_mask;
+//	sigemptyset(&empty_mask);

 	while (1) {
 		if (panel_refresh) {
@@ -1269,8 +1267,8 @@ start:
 						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);
+							if (((TrayWindow*)it->data)->tray_id == e.xany.window) {
+									remove_icon((TrayWindow*)it->data);
 								break;
 							}
 						}
@@ -1414,8 +1412,8 @@ start:
 							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);
+								if ( traywin->id == de->drawable ) {
+								systray_render_icon(traywin);
 									break;
 								}
 							}
--- a/src/tint2conf/CMakeLists.txt
+++ b/src/tint2conf/CMakeLists.txt
@@ -56,17 +56,13 @@ target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
                                 ${RSVG_LIBRARIES} )

 if ( NOT DATADIR )
-  set(DATADIR share)
+  set( DATADIR share )
 endif( NOT DATADIR )

 add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
-add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale\" )
-add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" )
 set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread" )
 set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )

-add_subdirectory(po)
-
 install( TARGETS tint2conf DESTINATION bin )
 install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
 install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -119,12 +119,26 @@ static const char *global_ui =
 	"  </popup>"
 	"</ui>";

+
+// define menubar and toolbar action
+static GtkActionEntry entries[] = {
+	{"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL},
+	{"ThemeAdd", GTK_STOCK_ADD, _("_Import theme..."), "<Control>N", _("Import theme"), G_CALLBACK(menuImport)},
+	{"ThemeDefault", GTK_STOCK_NEW, _("_Import default theme..."), NULL, _("Import default theme"), G_CALLBACK(menuImportDefault)},
+	{"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)},
+	{"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)},
+	{"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK(load_all_themes)},
+	{"HelpMenu", NULL, _("Help"), NULL, NULL, NULL},
+	{"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK(menuAbout)}
+};
+
+
 int main(int argc, char **argv)
 {
-	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
-	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-	textdomain(GETTEXT_PACKAGE);
-
 	GtkWidget *vBox = NULL, *scrollbar = NULL;
 	GtkActionGroup *actionGroup;

@@ -153,23 +167,6 @@ int main(int argc, char **argv)
 	gtk_container_add(GTK_CONTAINER(g_window), vBox);

 	actionGroup = gtk_action_group_new("menuActionGroup");
-
-	// Menubar and toolbar entries
-	GtkActionEntry entries[] = {
-		{"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL},
-		{"ThemeAdd", GTK_STOCK_ADD, _("_Import theme..."), "<Control>N", _("Import theme"), G_CALLBACK(menuImport)},
-		{"ThemeDefault", GTK_STOCK_NEW, _("_Import default theme..."), NULL, _("Import default theme"), G_CALLBACK(menuImportDefault)},
-		{"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)},
-		{"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)},
-		{"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK(load_all_themes)},
-		{"HelpMenu", NULL, _("Help"), NULL, NULL, NULL},
-		{"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK(menuAbout)}
-	};
-
 	gtk_action_group_add_actions(actionGroup, entries, G_N_ELEMENTS(entries), NULL);
 	globalUIManager = gtk_ui_manager_new();
 	gtk_ui_manager_insert_action_group(globalUIManager, actionGroup, 0);
--- a/src/tint2conf/main.h
+++ b/src/tint2conf/main.h
@@ -11,7 +11,6 @@
 #include <glib/gi18n-lib.h>
 #else
 #define _(String) String
-#define GETTEXT_PACKAGE "tint2conf"
 #endif

 #define SNAPSHOT_TICK 190
--- a/src/tint2conf/po/CMakeLists.txt
+++ b/src/tint2conf/po/CMakeLists.txt
@@ -1,20 +0,0 @@
-include(FindGettext)
-if (GETTEXT_FOUND)
-    set(GETTEXT_PACKAGE tint2conf)
-    file(GLOB POTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.po")
-    string(REPLACE ".po" " " LANGUAGES ${POTFILES})
-    message(STATUS "gettext found languages: ${LANGUAGES}")
-    string(REPLACE " " ";" LANGUAGES ${LANGUAGES})
-    if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.8")
-        GETTEXT_CREATE_TRANSLATIONS("${CMAKE_CURRENT_SOURCE_DIR}/tint2conf.pot" ALL ${POTFILES})
-    else()
-        foreach(LANG ${LANGUAGES})
-            GETTEXT_PROCESS_PO_FILES(${LANG} ALL PO_FILES ${LANG}.po)
-            install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
-                    DESTINATION "${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale/${LANG}/LC_MESSAGES"
-                    RENAME "${GETTEXT_PACKAGE}.mo")
-            endforeach ()
-    endif()
-else ()
-    message(STATUS "gettext not found")
-endif ()
--- a/src/tint2conf/po/fr.po
+++ b/src/tint2conf/po/fr.po
--- a/src/tint2conf/po/pl.po
+++ b/src/tint2conf/po/pl.po
--- a/src/tint2conf/po/tint2conf.pot
+++ b/src/tint2conf/po/tint2conf.pot
--- a/src/tint2conf/properties.c
+++ b/src/tint2conf/properties.c
--- a/src/tint2conf/properties.h
+++ b/src/tint2conf/properties.h
@@ -51,7 +51,7 @@ extern GtkWidget *taskbar_hide_inactive_tasks, *taskbar_hide_diff_monitor;
 extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color, *taskbar_name_font;
 extern GtkWidget *taskbar_active_background, *taskbar_inactive_background;
 extern GtkWidget *taskbar_name_active_background, *taskbar_name_inactive_background;
-extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment;
+extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order;

 // task
 extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down;
--- a/src/tint2conf/properties_rw.c
+++ b/src/tint2conf/properties_rw.c
@@ -272,16 +272,6 @@ void config_write_taskbar(FILE *fp)
 	}
 	fprintf(fp, "\n");

-	fprintf(fp, "task_align = ");
-	if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_alignment)) <= 0) {
-		fprintf(fp, "left");
-	} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_alignment)) == 1) {
-		fprintf(fp, "center");
-	} else {
-		fprintf(fp, "right");
-	}
-	fprintf(fp, "\n");
-
 	fprintf(fp, "\n");
 }

@@ -1008,16 +998,6 @@ void add_entry(char *key, char *value)
 		else
 			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
 	}
-	else if (strcmp(key, "task_align") == 0) {
-		if (strcmp(value, "left") == 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_sort_order), 1);
-		else if (strcmp(value, "right") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 2);
-		else
-			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);
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(taskbar_padding_x), atoi(value1));
--- a/src/tint2conf/tint2conf.desktop
+++ b/src/tint2conf/tint2conf.desktop
@@ -33,7 +33,7 @@ Name[nb]=Panelbehandler
 Name[nl]=Paneel Manager
 Name[nn]=Panelhandsamar
 Name[pa]=ਪੈਨਲ ਮੈਨੇਜਰ
-Name[pl]=Ustawienia panelu
+Name[pl]=Panel
 Name[pt]=Gestor do Painel
 Name[pt_BR]=Gerenciador do painel
 Name[ro]=Manager de panouri
--- a/src/util/area.c
+++ b/src/util/area.c
@@ -76,7 +76,7 @@ void init_rendering(void *obj, int pos)
 	Area *a = (Area*)obj;
 	
 	// initialize fixed position/size
-	GList *l;
+	GSList *l;
 	for (l = a->list; l ; l = l->next) {
 		Area *child = ((Area*)l->data);
 		if (panel_horizontal) {
@@ -102,7 +102,7 @@ void rendering(void *obj)
 	Panel *panel = (Panel*)obj;

 	size_by_content(&panel->area);
-	size_by_layout(&panel->area, 1);
+	size_by_layout(&panel->area, 0, 1);
 	
 	refresh(&panel->area);
 }
@@ -111,11 +111,10 @@ void rendering(void *obj)
 void size_by_content (Area *a)
 {
 	// don't resize hiden objects
-	if (!a->on_screen)
-		return;
+	if (!a->on_screen) return;

 	// children node are resized before its parent
-	GList *l;
+	GSList *l;
 	for (l = a->list; l ; l = l->next)
 		size_by_content(l->data);
 	
@@ -135,15 +134,14 @@ void size_by_content (Area *a)
 }


-void size_by_layout (Area *a, int level)
+void size_by_layout (Area *a, int pos, int level)
 {
 	// don't resize hiden objects
-	if (!a->on_screen)
-		return;
+	if (!a->on_screen) return;

 	// parent node is resized before its children
 	// calculate area's size
-	GList *l;
+	GSList *l;
 	if (a->resize && a->size_mode == SIZE_BY_LAYOUT) {
 		a->resize = 0;

@@ -158,103 +156,40 @@ void size_by_layout (Area *a, int level)
 		}
 	}

-	// update position of children
-	if (a->list) {
-		if (a->alignment == ALIGN_LEFT) {
-			int pos = (panel_horizontal ? a->posx : a->posy) + a->bg->border.width + a->paddingxlr;
-
-			for (l = a->list; l ; l = l->next) {
-				Area *child = ((Area*)l->data);
-				if (!child->on_screen)
-					continue;
-
-				if (panel_horizontal) {
-					if (pos != child->posx) {
-						// pos changed => redraw
-						child->posx = pos;
-						child->on_changed = 1;
-					}
-				} else {
-					if (pos != child->posy) {
-						// pos changed => redraw
-						child->posy = pos;
-						child->on_changed = 1;
-					}
-				}
-
-				size_by_layout(child, level+1);
-
-				pos += panel_horizontal ? child->width + a->paddingx : child->height + a->paddingx;
-			}
-		} else if (a->alignment == ALIGN_RIGHT) {
-			int pos = (panel_horizontal ? a->posx + a->width : a->posy + a->height) - a->bg->border.width - a->paddingxlr;
-
-			for (l = g_list_last(a->list); l ; l = l->prev) {
-				Area *child = ((Area*)l->data);
-				if (!child->on_screen)
-					continue;
-
-				pos -= panel_horizontal ? child->width : child->height;
-
-				if (panel_horizontal) {
-					if (pos != child->posx) {
-						// pos changed => redraw
-						child->posx = pos;
-						child->on_changed = 1;
-					}
-				} else {
-					if (pos != child->posy) {
-						// pos changed => redraw
-						child->posy = pos;
-						child->on_changed = 1;
-					}
-				}
-
-				size_by_layout(child, level+1);
-
-				pos -= a->paddingx;
-			}
-		} else if (a->alignment == ALIGN_CENTER) {
-
-			int children_size = 0;
-
-			for (l = a->list; l ; l = l->next) {
-				Area *child = ((Area*)l->data);
-				if (!child->on_screen)
-					continue;
-
-				children_size += panel_horizontal ? child->width : child->height;
-				children_size += (l == a->list) ? 0 : a->paddingx;
-			}
-
-			int pos = (panel_horizontal ? a->posx : a->posy) + a->bg->border.width + a->paddingxlr;
-			pos += ((panel_horizontal ? a->width : a->height) - children_size) / 2;
-
-			for (l = a->list; l ; l = l->next) {
-				Area *child = ((Area*)l->data);
-				if (!child->on_screen)
-					continue;
-
-				if (panel_horizontal) {
-					if (pos != child->posx) {
-						// pos changed => redraw
-						child->posx = pos;
-						child->on_changed = 1;
-					}
-				} else {
-					if (pos != child->posy) {
-						// pos changed => redraw
-						child->posy = pos;
-						child->on_changed = 1;
-					}
-				}
-
-				size_by_layout(child, level+1);
-
-				pos += panel_horizontal ? child->width + a->paddingx : child->height + a->paddingx;
+	// update position of childs
+	pos += a->paddingxlr + a->bg->border.width;
+	int i=0;
+	for (l = a->list; l ; l = l->next) {
+		Area *child = ((Area*)l->data);
+		if (!child->on_screen) continue;
+		i++;
+		
+		if (panel_horizontal) {
+			if (pos != child->posx) {
+				// pos changed => redraw
+				child->posx = pos;
+				child->on_changed = 1;
 			}
 		}
-	}
+		else {
+			if (pos != child->posy) {
+				// pos changed => redraw
+				child->posy = pos;
+				child->on_changed = 1;
+			}
+		}
+		
+		/*// position of each visible object
+		int k;
+		for (k=0 ; k < level ; k++) printf("  ");
+		printf("tree level %d, object %d, pos %d, %s\n", level, i, pos, (child->size_mode == SIZE_BY_LAYOUT) ? "SIZE_BY_LAYOUT" : "SIZE_BY_CONTENT");*/
+		size_by_layout(child, pos, level+1);
+		
+		if (panel_horizontal)
+			pos += child->width + a->paddingx;
+		else
+			pos += child->height + a->paddingx;
+	}	

 	if (a->on_changed) {
 		// pos/size changed
@@ -274,7 +209,7 @@ void refresh (Area *a)
 	if (a->redraw) {
 		a->redraw = 0;
 		// force redraw of child
-		//GList *l;
+		//GSList *l;
 		//for (l = a->list ; l ; l = l->next)
 			//((Area*)l->data)->redraw = 1;

@@ -287,7 +222,7 @@ void refresh (Area *a)
 	XCopyArea (server.dsp, a->pix, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);

 	// and then refresh child object
-	GList *l;
+	GSList *l;
 	for (l = a->list; l ; l = l->next)
 		refresh(l->data);
 }
@@ -301,7 +236,7 @@ int resize_by_layout(void *obj, int maximum_size)
 	if (panel_horizontal) {		
 		// detect free size for SIZE_BY_LAYOUT's Area
 		size = a->width - (2 * (a->paddingxlr + a->bg->border.width));
-		GList *l;
+		GSList *l;
 		for (l = a->list ; l ; l = l->next) {
 			child = (Area*)l->data;
 			if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
@@ -342,8 +277,9 @@ int resize_by_layout(void *obj, int maximum_size)
 	}
 	else {
 		// detect free size for SIZE_BY_LAYOUT's Area
+		// TODO the spacer should collapse when the other areas are overflowing
 		size = a->height - (2 * (a->paddingxlr + a->bg->border.width));
-		GList *l;
+		GSList *l;
 		for (l = a->list ; l ; l = l->next) {
 			child = (Area*)l->data;
 			if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
@@ -356,7 +292,7 @@ int resize_by_layout(void *obj, int maximum_size)
 		if (nb_by_content+nb_by_layout)
 			size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);

-		int height=0, modulo=0;
+		int height=0, modulo=0, old_height;
 		if (nb_by_layout) {
 			height = size / nb_by_layout;
 			modulo = size % nb_by_layout;
@@ -370,7 +306,7 @@ int resize_by_layout(void *obj, int maximum_size)
 		for (l = a->list ; l ; l = l->next) {
 			child = (Area*)l->data;
 			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
-				int old_height = child->height;
+				old_height = child->height;
 				child->height = height;
 				if (modulo) {
 					child->height++;
@@ -389,7 +325,7 @@ void set_redraw (Area *a)
 {
 	a->redraw = 1;

-	GList *l;
+	GSList *l;
 	for (l = a->list ; l ; l = l->next)
 		set_redraw(l->data);
 }
@@ -503,7 +439,7 @@ void remove_area (Area *a)
 {
 	Area *parent = (Area*)a->parent;

-	parent->list = g_list_remove(parent->list, a);
+	parent->list = g_slist_remove(parent->list, a);
 	set_redraw (parent);

 }
@@ -513,7 +449,7 @@ void add_area (Area *a)
 {
 	Area *parent = (Area*)a->parent;

-	parent->list = g_list_append(parent->list, a);
+	parent->list = g_slist_append(parent->list, a);
 	set_redraw (parent);

 }
@@ -524,18 +460,20 @@ void free_area (Area *a)
 	if (!a)
 		return;

-	GList *l0;
+	GSList *l0;
 	for (l0 = a->list; l0 ; l0 = l0->next)
 		free_area (l0->data);

 	if (a->list) {
-		g_list_free(a->list);
+		g_slist_free(a->list);
 		a->list = 0;
 	}
 	if (a->pix) {
 		XFreePixmap (server.dsp, a->pix);
 		a->pix = 0;
 	}
+	if (a->gc)
+		free(a);
 }


--- a/src/util/area.h
+++ b/src/util/area.h
@@ -51,7 +51,6 @@ typedef struct
 // SIZE_BY_LAYOUT objects : taskbar and task
 // SIZE_BY_CONTENT objects : clock, battery, launcher, systray
 enum { SIZE_BY_LAYOUT, SIZE_BY_CONTENT };
-enum { ALIGN_LEFT = 0, ALIGN_CENTER = 1, ALIGN_RIGHT = 2 };

 typedef struct {
 	// coordinate relative to panel window
@@ -62,19 +61,18 @@ typedef struct {
 	Background *bg;

 	// list of child : Area object
-	GList *list;
+	GSList *list;

 	// object visible on screen. 
 	// An object (like systray) could be enabled but hidden (because no tray icon).
 	int on_screen;
 	// way to calculate the size (SIZE_BY_CONTENT or SIZE_BY_LAYOUT)
 	int size_mode;
-
-	int alignment;
 	// need to calculate position and width
 	int resize;
 	// need redraw Pixmap
 	int redraw;
+	int gc;
 	// paddingxlr = horizontal padding left/right
 	// paddingx = horizontal padding between childs
 	int paddingxlr, paddingx, paddingy;
@@ -99,7 +97,7 @@ void init_rendering(void *obj, int pos);

 void rendering(void *obj);
 void size_by_content (Area *a);
-void size_by_layout (Area *a, int level);
+void size_by_layout (Area *a, int pos, int level);
 // draw background and foreground
 void refresh (Area *a);
 
--- a/src/util/timer.c
+++ b/src/util/timer.c
@@ -49,7 +49,9 @@ struct _timeout {

 void add_timeout_intern(int value_msec, int interval_msec, void(*_callback)(void*), void* arg, timeout* t);
 gint compare_timeouts(gconstpointer t1, gconstpointer t2);
+gint compare_timespecs(const struct timespec* t1, const struct timespec* t2);
 int timespec_subtract(struct timespec* result, struct timespec* x, struct timespec* y);
+struct timespec add_msec_to_timespec(struct timespec ts, int msec);


 int align_with_existing_timeouts(timeout* t);
--- a/src/util/timer.h
+++ b/src/util/timer.h
@@ -20,8 +20,6 @@
 #define TIMER_H

 #include <glib.h>
-#include <time.h>
-#include <sys/time.h>

 extern struct timeval next_timeout;

@@ -68,9 +66,4 @@ void update_next_timeout();
 /** Callback of all expired timeouts **/
 void callback_timeout_expired();

-/** Returns -1 if t1 < t2, 0 if t1 == t2, 1 if t1 > t2 **/
-gint compare_timespecs(const struct timespec* t1, const struct timespec* t2);
-
-struct timespec add_msec_to_timespec(struct timespec ts, int msec);
-
 #endif // TIMER_H
--- a/tint2.desktop
+++ b/tint2.desktop
@@ -54,7 +54,6 @@ Name[zh_CN]=面板 tint2
 Name[zh_TW]=面板 tint2
 Comment=Lightweight panel
 Comment[fr_FR]=Panel léger
-Comment[pl]=Lekki panel
 Exec=tint2
 Icon=taskbar
 Terminal=false