Revert r751 and add workaround for systray rendering artifacts

git-svn-id: http://tint2.googlecode.com/svn/trunk@755 121b4492-b84c-0410-8b4c-0d4edfb3f3cc

src/systray/systraybar.h

@@ -34,6 +34,7 @@ typedef struct {
 
 typedef struct
 {
+	Window id;
 	Window tray_id;
 	int x, y;
 	int width, height;
@@ -42,7 +43,6 @@ typedef struct
 	int depth;
 	Damage damage;
 	timeout* render_timeout;
-	int ignore_remaps;
 } TrayWindow;