Author: olivier
Date: 2006-07-08 19:39:48 +0000 (Sat, 08 Jul 2006)
New Revision: 22298
Modified:
libxfcegui4/trunk/libxfcegui4/netk-tasklist.c
Log:
Small cleanup in libxfcegui4 (patch from Nick Schermer <[EMAIL PROTECTED]>, bug
#1952)
Modified: libxfcegui4/trunk/libxfcegui4/netk-tasklist.c
===================================================================
--- libxfcegui4/trunk/libxfcegui4/netk-tasklist.c 2006-07-08 19:19:29 UTC
(rev 22297)
+++ libxfcegui4/trunk/libxfcegui4/netk-tasklist.c 2006-07-08 19:39:48 UTC
(rev 22298)
@@ -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);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
