Don't deactivate the toolbar when another item in the same toolbar gains

2004-11-01  Christian Persch  <chpe@cvs.gnome.org>

	* lib/widgets/ephy-location-entry.c: (ephy_location_entry_init),
	(ephy_location_entry_activate):
	* src/ephy-location-action.c: (ephy_location_action_class_init):
	* src/ephy-window.c: (ephy_window_init):
	* src/toolbar.c: (toolbar_class_init), (toolbar_finalize),
	(maybe_finish_activation_cb), (toolbar_activate_location),
	(toolbar_update_zoom), (toolbar_new):
	* src/toolbar.h:

	Don't deactivate the toolbar when another item in the same toolbar
	gains focus. Fixes bug #155650.

1 files changed, 1 insertions, 35 deletions

diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 6a491b82d..451efb507 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -46,7 +46,6 @@ struct _EphyLocationEntryPrivate
 	GtkWidget *entry;
 	char *before_completion;
 	gboolean user_changed;
-	GtkWidget *shown_widget;
 
 	guint text_col;
 	guint action_col;
@@ -161,24 +160,6 @@ ephy_location_entry_class_init (EphyLocationEntryClass *klass)
 }
 
 static void
-ephy_location_entry_activation_finished (EphyLocationEntry *entry)
-{
-	if (entry->priv->shown_widget)
-	{
-		gtk_widget_hide (entry->priv->shown_widget);
-		entry->priv->shown_widget = NULL;
-	}
-}
-
-static gboolean
-location_focus_out_cb (GtkWidget *leidget, GdkEventFocus *event, EphyLocationEntry *le)
-{
-	ephy_location_entry_activation_finished (le);
-
-	return FALSE;
-}
-
-static void
 editable_changed_cb (GtkEditable *editable, EphyLocationEntry *e)
 {
 	EphyLocationEntryPrivate *p = e->priv;
@@ -381,15 +362,10 @@ ephy_location_entry_init (EphyLocationEntry *le)
 	le->priv = p;
 
 	p->user_changed = TRUE;
-	p->shown_widget = NULL;
 
 	ephy_location_entry_construct_contents (le);
 
 	gtk_tool_item_set_expand (GTK_TOOL_ITEM (le), TRUE);
-
-	g_signal_connect (le->priv->entry,
-	       		  "focus_out_event",
-                          G_CALLBACK (location_focus_out_cb), le);
 }
 
 GtkWidget *
@@ -479,17 +455,7 @@ ephy_location_entry_get_location (EphyLocationEntry *le)
 void
 ephy_location_entry_activate (EphyLocationEntry *le)
 {
-	GtkWidget *toplevel, *widget;
-
-	for (widget = GTK_WIDGET (le); widget != NULL; widget = widget->parent)
-	{
-		if (!GTK_WIDGET_VISIBLE (widget))
-		{
-			le->priv->shown_widget = widget;
-			gtk_widget_show (le->priv->shown_widget);
-			break;
-		}
-	}
+	GtkWidget *toplevel;
 
 	toplevel = gtk_widget_get_toplevel (le->priv->entry);