diff options
| author | Xan Lopez <xlopez@igalia.com> | 2011-06-29 05:03:17 +0800 |
|---|---|---|
| committer | Xan Lopez <xlopez@igalia.com> | 2011-06-29 20:53:01 +0800 |
| commit | 61b4a15531501833926b33a77f0416efc772a897 (patch) | |
| tree | bc13c99027cad6c9b9fb84ed52e084e530e78d4b /src | |
| parent | f939f5ce3406a77b500e821815352d22ff410ab7 (diff) | |
| download | gsoc2013-epiphany-61b4a15531501833926b33a77f0416efc772a897.tar gsoc2013-epiphany-61b4a15531501833926b33a77f0416efc772a897.tar.gz gsoc2013-epiphany-61b4a15531501833926b33a77f0416efc772a897.tar.bz2 gsoc2013-epiphany-61b4a15531501833926b33a77f0416efc772a897.tar.lz gsoc2013-epiphany-61b4a15531501833926b33a77f0416efc772a897.tar.xz gsoc2013-epiphany-61b4a15531501833926b33a77f0416efc772a897.tar.zst gsoc2013-epiphany-61b4a15531501833926b33a77f0416efc772a897.zip | |
ephy-window: do not assume there's always a location entry
It won't be the case in web app mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-window.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index cd03516cf..67bd63e39 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1713,6 +1713,7 @@ sync_tab_load_progress (EphyWebView *view, GParamSpec *pspec, EphyWindow *window gboolean switching_tab = pspec == NULL; if (window->priv->closing) return; + if (!window->priv->entry) return; if (window->priv->clear_progress_timeout_id) { @@ -3831,10 +3832,13 @@ ephy_window_constructor (GType type, action = gtk_action_group_get_action (toolbar_action_group, "Location"); proxies = gtk_action_get_proxies (action); - proxy = GTK_WIDGET (proxies->data); - priv->entry = ephy_location_entry_get_entry (EPHY_LOCATION_ENTRY (proxy)); - gtk_window_set_application (GTK_WINDOW (window), + if (proxies) + { + proxy = GTK_WIDGET (proxies->data); + priv->entry = ephy_location_entry_get_entry (EPHY_LOCATION_ENTRY (proxy)); + gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (ephy_shell_get_application (ephy_shell_get_default ()))); + } return object; } |