X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Ftint.c;h=b975fecf50a987dde7dc7af203efd3b806aaa630;hp=2f5edc6f0991cf429611982a31808646399dbca9;hb=275fa7c8678c39a1c1f7437de12aac0144f61a85;hpb=63bbffa4af17926ba2d52728883988eae402b07a

diff --git a/src/tint.c b/src/tint.c
index 2f5edc6..b975fec 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -156,7 +156,6 @@ void init_X11()
 
 void cleanup()
 {
-	cleanup_timeout();
 	cleanup_systray();
 	cleanup_tooltip();
 	cleanup_clock();
@@ -174,6 +173,7 @@ void cleanup()
 	imlib_context_disconnect_display();
 
 	cleanup_server();
+	cleanup_timeout();
 	if (server.dsp) XCloseDisplay(server.dsp);
 }
 
@@ -485,6 +485,11 @@ void event_property_notify (XEvent *e)
 			server.got_root_win = 1;
 		}
 
+		// Change name of desktops
+		else if (at == server.atom._NET_DESKTOP_NAMES) {
+			printf("_NET_DESKTOP_NAMES\n");
+			panel_refresh = 1;
+		}
 		// Change number of desktops
 		else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
 			if (!taskbar_enabled) return;
@@ -508,17 +513,8 @@ void event_property_notify (XEvent *e)
 			server.desktop = server_get_current_desktop ();
 			for (i=0 ; i < nb_panel ; i++) {
 				Panel *panel = &panel1[i];
-				if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.bg != panel->g_taskbar.bg_active) {
-					// redraw both taskbar
-					if (server.nb_desktop > old_desktop) {
-						// can happen if last desktop is deleted and we've been on the last desktop
-						panel->taskbar[old_desktop].area.bg = panel->g_taskbar.bg;
-						panel->taskbar[old_desktop].area.resize = 1;
-					}
-					panel->taskbar[server.desktop].area.bg = panel->g_taskbar.bg_active;
-					panel->taskbar[server.desktop].area.resize = 1;
-					panel_refresh = 1;
-				}
+				set_taskbar_state(&panel->taskbar[old_desktop], TASKBAR_NORMAL);
+				set_taskbar_state(&panel->taskbar[server.desktop], TASKBAR_ACTIVE);
 				// check ALLDESKTOP task => resize taskbar
 				Taskbar *tskbar;
 				Task *tsk;