Index: libxfcegui4/netk-tasklist.c
===================================================================
--- libxfcegui4/netk-tasklist.c	(revision 22196)
+++ libxfcegui4/netk-tasklist.c	(working copy)
@@ -146,7 +146,6 @@
     NetkTasklistGroupingType grouping;
     gint grouping_limit;
 
-    guint activate_timeout_id;
     guint screen_connections[N_SCREEN_CONNECTIONS];
     guint idle_callback_tag;
     
@@ -221,9 +220,7 @@
 
 static void netk_tasklist_change_active_task (NetkTasklist * tasklist,
                                               NetkTask * active_task);
-#if 0  /* unused? */
-static gboolean netk_tasklist_change_active_timeout (gpointer data);
-#endif
+
 static void netk_tasklist_activate_task_window (NetkTask * task);
 
 static void netk_tasklist_update_icon_geometries (NetkTasklist * tasklist);
@@ -475,11 +472,6 @@
     g_hash_table_destroy (tasklist->priv->class_group_hash);
     tasklist->priv->class_group_hash = NULL;
 
-    if (tasklist->priv->activate_timeout_id != 0)
-    {
-        g_source_remove (tasklist->priv->activate_timeout_id);
-    }
-
     if (tasklist->priv->idle_callback_tag != 0)
     {
         g_source_remove (tasklist->priv->idle_callback_tag);
@@ -1504,7 +1496,7 @@
 {
     NetkWindow *active_window;
     NetkTask *active_task;
-
+    
     active_window = netk_screen_get_active_window (screen);
 
     active_task =
@@ -1662,20 +1654,6 @@
     *push_in = TRUE;
 }
 
-#if 0 /* unused? */
-static gboolean
-netk_tasklist_change_active_timeout (gpointer data)
-{
-    NetkTasklist *tasklist = NETK_TASKLIST (data);
-
-    tasklist->priv->activate_timeout_id = 0;
-
-    netk_tasklist_active_window_changed (tasklist->priv->screen, tasklist);
-
-    return FALSE;
-}
-#endif
-
 static void
 netk_task_menu_activated (GtkMenuItem * menu_item, gpointer data)
 {
@@ -1733,11 +1711,6 @@
         }
     }
 
-    if (tasklist->priv->activate_timeout_id)
-    {
-        g_source_remove (tasklist->priv->activate_timeout_id);
-    }
-    
     netk_tasklist_change_active_task (tasklist, task);
 }