remove variables in_dnd and leaving_dnd

Mon Nov 24 02:34:00 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c: remove variables in_dnd and leaving_dnd

diff --git a/ChangeLog b/ChangeLog
index 68aea0ae0d1cc8e8cb971865a66eede366494216..f64b5936bb2a52ae4d54582a693026de46d166c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 24 02:34:00 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c: remove variables in_dnd and leaving_dnd
+
 Mon Nov 24 02:19:33 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c: remove variable

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 68aea0ae0d1cc8e8cb971865a66eede366494216..f64b5936bb2a52ae4d54582a693026de46d166c6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Mon Nov 24 02:34:00 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c: remove variables in_dnd and leaving_dnd
+
 Mon Nov 24 02:19:33 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c: remove variable

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 68aea0ae0d1cc8e8cb971865a66eede366494216..f64b5936bb2a52ae4d54582a693026de46d166c6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Mon Nov 24 02:34:00 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c: remove variables in_dnd and leaving_dnd
+
 Mon Nov 24 02:19:33 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c: remove variable

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 68aea0ae0d1cc8e8cb971865a66eede366494216..f64b5936bb2a52ae4d54582a693026de46d166c6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Mon Nov 24 02:34:00 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c: remove variables in_dnd and leaving_dnd
+
 Mon Nov 24 02:19:33 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c: remove variable

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 68aea0ae0d1cc8e8cb971865a66eede366494216..f64b5936bb2a52ae4d54582a693026de46d166c6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Mon Nov 24 02:34:00 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c: remove variables in_dnd and leaving_dnd
+
 Mon Nov 24 02:19:33 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c: remove variable

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 424058f32efbb6ea45a5a598a2422bd316551348..a309ea1337780b337e75b14d6151843d89f9f6fa 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -224,8 +224,6 @@ struct _GtkToolbarPrivate
   GtkSettings *settings;
   int        idle_id;
   gboolean   need_sync;
-  gboolean   leaving_dnd;
-  gboolean   in_dnd;
   GtkToolItem *highlight_tool_item;
   gint      max_homogeneous_pixels;
 
@@ -1082,12 +1080,6 @@ slide_idle_handler (gpointer data)
     }
 
   priv->is_sliding = FALSE;
-  if (priv->leaving_dnd)
-    {
-      priv->in_dnd = FALSE;
-      priv->leaving_dnd = FALSE;
-    }
-
   priv->idle_id = 0;
   
   return FALSE;
@@ -1192,8 +1184,6 @@ gtk_toolbar_stop_sliding (GtkToolbar *toolbar)
       GList *list;
       
       priv->is_sliding = FALSE;
-      priv->in_dnd = FALSE;
-      priv->leaving_dnd = FALSE;
       
       if (priv->idle_id)
        {
@@ -1963,7 +1953,6 @@ gtk_toolbar_set_drop_highlight_item (GtkToolbar  *toolbar,
 {
   ToolbarContent *content;
   GtkToolbarPrivate *priv;
-  GList *list;
   gint n_items;
   GtkRequisition requisition;
 
@@ -1976,20 +1965,15 @@ gtk_toolbar_set_drop_highlight_item (GtkToolbar  *toolbar,
 
   if (!tool_item)
     {
-      if (priv->in_dnd)
+      if (priv->highlight_tool_item)
        {
-         priv->leaving_dnd = TRUE;
-         reset_all_placeholders (toolbar);
-         gtk_toolbar_begin_sliding (toolbar);
-         
-         if (priv->highlight_tool_item)
-           {
-             gtk_widget_unparent (GTK_WIDGET (priv->highlight_tool_item));
-             g_object_unref (priv->highlight_tool_item);
-             priv->highlight_tool_item = NULL;
-           }
+         gtk_widget_unparent (GTK_WIDGET (priv->highlight_tool_item));
+         g_object_unref (priv->highlight_tool_item);
+         priv->highlight_tool_item = NULL;
        }
       
+      reset_all_placeholders (toolbar);
+      gtk_toolbar_begin_sliding (toolbar);
       return;
     }
 
@@ -2007,9 +1991,6 @@ gtk_toolbar_set_drop_highlight_item (GtkToolbar  *toolbar,
                             GTK_WIDGET (toolbar));
     }
 
-  priv->in_dnd = TRUE;
-  priv->leaving_dnd = FALSE;
-
   n_items = gtk_toolbar_get_n_items (toolbar);
   if (index < 0 || index > n_items)
     index = n_items;