X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftask.c;h=df4bdbd2221af67b9b4987891deb05500a57df67;hb=b984f3f3b26d76ba6bf7488ac9737cd69413031c;hp=7a5212e794fe9191e8b240c93a11d80f07f2bf99;hpb=c75069e03de761de15a6d74a4df0d7dbe6672b6e;p=chaz%2Ftint2

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 7a5212e..df4bdbd 100644
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -3,7 +3,7 @@
 * Tint2 : task
 *
 * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -159,12 +159,12 @@ void remove_task (Task *tsk)
 }
 
 
-void get_title(Task *tsk)
+int get_title(Task *tsk)
 {
 	Panel *panel = tsk->area.panel;
 	char *title, *name;
 
-	if (!panel->g_task.text && !g_tooltip.enabled) return;
+	if (!panel->g_task.text && !g_tooltip.enabled) return 0;
 
 	name = server_get_property (tsk->win, server.atom._NET_WM_VISIBLE_NAME, server.atom.UTF8_STRING, 0);
 	if (!name || !strlen(name)) {
@@ -184,9 +184,16 @@ void get_title(Task *tsk)
 	else title[0] = 0;
 	strcat(title, name);
 	if (name) XFree (name);
-
-	if (tsk->title)
-		free(tsk->title);
+	
+	if (tsk->title) {
+		// check unecessary title change
+		if (strcmp(tsk->title, title) == 0) {
+			free(title);
+			return 0;
+		}
+		else
+			free(tsk->title);
+	} 
 
 	tsk->title = title;
 	GPtrArray* task_group = task_get_tasks(tsk->win);
@@ -198,7 +205,7 @@ void get_title(Task *tsk)
 			set_task_redraw(tsk2);
 		}
 	}
-	set_task_redraw(tsk);
+	return 1;
 }
 
 
@@ -303,7 +310,6 @@ void get_icon (Task *tsk)
 			set_task_redraw(tsk2);
 		}
 	}
-	set_task_redraw(tsk);
 }
 
 
@@ -408,7 +414,9 @@ Task *next_task(Task *tsk)
 	Task *tsk1;
 	Taskbar* tskbar = tsk->area.parent;
 
-	for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+	l0 = tskbar->area.list;
+	if (taskbarname_enabled) l0 = l0->next;
+	for (; l0 ; l0 = l0->next) {
 		tsk1 = l0->data;
 		if (tsk1 == tsk) {
 			if (l0->next == 0) l0 = tskbar->area.list;
@@ -430,7 +438,9 @@ Task *prev_task(Task *tsk)
 	Taskbar* tskbar = tsk->area.parent;
 
 	tsk2 = 0;
-	for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+	l0 = tskbar->area.list;
+	if (taskbarname_enabled) l0 = l0->next;
+	for (; l0 ; l0 = l0->next) {
 		tsk1 = l0->data;
 		if (tsk1 == tsk) {
 			if (l0 == tskbar->area.list) {