[Xfce4-commits] <xfce4-panel:master> Rename variable in tasklist.

[Nick Schermer]

Updating branch refs/heads/master
         to 66fa916a615e39d4c289a8a75a8086aa74bf116d (commit)
       from 85613f8e5d531a241abba05fe2df9d72bc1e14a8 (commit)

commit 66fa916a615e39d4c289a8a75a8086aa74bf116d
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 28 17:43:15 2010 +0200

    Rename variable in tasklist.

 plugins/tasklist/tasklist-widget.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index 7b9f689..8e33256 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -189,7 +189,7 @@ struct _XfceTasklistChild
   GtkWidget              *label;
 
   /* drag motion window activate */
-  guint                   motion_timeout;
+  guint                   motion_timeout_id;
   guint                   motion_timestamp;
 
   /* unique id for sorting by insert time,
@@ -1086,8 +1086,8 @@ xfce_tasklist_remove (GtkContainer *container,
 
           gtk_widget_unparent (child->button);
 
-          if (child->motion_timeout != 0)
-            g_source_remove (child->motion_timeout);
+          if (child->motion_timeout_id != 0)
+            g_source_remove (child->motion_timeout_id);
 
           g_slice_free (XfceTasklistChild, child);
 
@@ -1600,7 +1600,7 @@ xfce_tasklist_child_drag_motion_timeout_destroyed (gpointer data)
 {
   XfceTasklistChild *child = data;
 
-  child->motion_timeout = 0;
+  child->motion_timeout_id = 0;
   child->motion_timestamp = 0;
 }
 
@@ -1616,12 +1616,12 @@ xfce_tasklist_child_drag_motion (XfceTasklistChild *child,
   panel_return_val_if_fail (XFCE_IS_TASKLIST (child->tasklist), FALSE);
 
   child->motion_timestamp = timestamp;
-  if (child->motion_timeout == 0
+  if (child->motion_timeout_id == 0
       && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (child->button)))
     {
-      child->motion_timeout = g_timeout_add_full (G_PRIORITY_LOW, DRAG_ACTIVATE_TIMEOUT,
-                                                  xfce_tasklist_child_drag_motion_timeout, child,
-                                                  xfce_tasklist_child_drag_motion_timeout_destroyed);
+      child->motion_timeout_id = g_timeout_add_full (G_PRIORITY_LOW, DRAG_ACTIVATE_TIMEOUT,
+                                                     xfce_tasklist_child_drag_motion_timeout, child,
+                                                     xfce_tasklist_child_drag_motion_timeout_destroyed);
     }
 
   /* keep emitting the signal */
@@ -1639,8 +1639,8 @@ xfce_tasklist_child_drag_leave (XfceTasklistChild *child,
 {
   panel_return_if_fail (XFCE_IS_TASKLIST (child->tasklist));
 
-  if (child->motion_timeout != 0)
-    g_source_remove (child->motion_timeout);
+  if (child->motion_timeout_id != 0)
+    g_source_remove (child->motion_timeout_id);
 }