Commit 07d63711 authored by Soeren Sandmann's avatar Soeren Sandmann Committed by Søren Sandmann Pedersen

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
parent cc70808f
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
......
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
......
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
......
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
......
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
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment