aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ephy-dialog.c13
-rw-r--r--lib/widgets/ephy-location-entry.c5
2 files changed, 15 insertions, 3 deletions
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index 8b6baa2ca..2100eb1f6 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -105,6 +105,7 @@ struct EphyDialogPrivate
GtkWidget *container;
PropertyInfo *props;
gboolean modal;
+ gboolean has_default_size;
char *name;
int spin_item_id;
@@ -795,6 +796,7 @@ ephy_dialog_init (EphyDialog *dialog)
dialog->priv->spin_timer = NULL;
dialog->priv->name = NULL;
dialog->priv->initialized = FALSE;
+ dialog->priv->has_default_size = FALSE;
}
static void
@@ -1181,9 +1183,14 @@ impl_get_value (EphyDialog *dialog,
static void
setup_default_size (EphyDialog *dialog)
{
- ephy_state_add_window (dialog->priv->dialog,
- dialog->priv->name, -1, -1,
- EPHY_STATE_WINDOW_SAVE_SIZE);
+ if (!dialog->priv->has_default_size)
+ {
+ ephy_state_add_window (dialog->priv->dialog,
+ dialog->priv->name, -1, -1,
+ EPHY_STATE_WINDOW_SAVE_SIZE);
+ }
+
+ dialog->priv->has_default_size = TRUE;
}
static gint
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 7c79b9619..94c696ba8 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -379,6 +379,11 @@ insert_text_cb (GtkWidget *editable,
EphyLocationEntry *w)
{
EphyLocationEntryPrivate *p = w->priv;
+ GtkWidget *window;
+
+ window = gtk_widget_get_toplevel (editable);
+ g_return_if_fail (window != NULL);
+ if (!GTK_WINDOW (window)->has_focus) return;
if (p->going_to_site) return;