moved initial values in function default_xxx

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

src/taskbar/task.c

@@ -35,8 +35,8 @@
 #include "tooltip.h"
 #include "timer.h"
 
-static timeout* urgent_timeout = 0;
-static GSList* urgent_list = 0;
+timeout* urgent_timeout;
+GSList* urgent_list;
 
 const char* task_get_tooltip(void* obj)
 {
@@ -325,7 +325,7 @@ void draw_task_icon (Task *tsk, int text_width)
 
 	// Render
 	imlib_context_set_image (tsk->icon[tsk->current_state]);
-	if (real_transparency) {
+	if (server.real_transparency) {
 		render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy, imlib_image_get_width(), imlib_image_get_height() );
 	}
 	else {

src/taskbar/task.h

@@ -11,9 +11,12 @@
 #include <pango/pangocairo.h>
 #include <Imlib2.h>
 #include "common.h"
+#include "timer.h"
 
 
 enum { TASK_NORMAL, TASK_ACTIVE, TASK_ICONIFIED, TASK_URGENT, TASK_STATE_COUNT };
+extern timeout* urgent_timeout;
+extern GSList* urgent_list;
 
 // --------------------------------------------------
 // global task parameter

src/taskbar/taskbar.c

@@ -37,7 +37,7 @@
    element. However for omnipresent windows (windows which are visible in every taskbar) the array
    contains to every Task* on each panel a pointer (i.e. GPtrArray.len == server.nb_desktop)
 */
-GHashTable* win_to_task_table = 0;
+GHashTable* win_to_task_table;
 
 guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
 gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
@@ -171,6 +171,13 @@ void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data)
 	remove_task(task_get_task(*(Window*)key));
 }
 
+void default_taskbar()
+{
+	win_to_task_table = 0;
+	urgent_timeout = 0;
+	urgent_list = 0;
+}
+
 void cleanup_taskbar()
 {
 	Panel *panel;

src/taskbar/taskbar.h

@@ -33,11 +33,14 @@ typedef struct {
 	int use_active;
 } Global_taskbar;
 
-void init_taskbar();
 
-// freed memory and set default values
+// default values
+void default_taskbar();
+// freed memory
 void cleanup_taskbar();
 
+void init_taskbar();
+
 Task *task_get_task (Window win);
 GPtrArray* task_get_tasks(Window win);
 void task_refresh_tasklist ();