aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-window.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-08-13 20:58:33 +0800
committerChristian Persch <chpe@src.gnome.org>2005-08-13 20:58:33 +0800
commit6588a12505f8f630fb57435bbafad59fdad6fb98 (patch)
tree4233b5c92800020f5932d11e8b1bd6e99a7bbf49 /src/ephy-window.c
parentb82f2dd097a4f804c07fd6c7874107e585de0848 (diff)
downloadgsoc2013-epiphany-6588a12505f8f630fb57435bbafad59fdad6fb98.tar
gsoc2013-epiphany-6588a12505f8f630fb57435bbafad59fdad6fb98.tar.gz
gsoc2013-epiphany-6588a12505f8f630fb57435bbafad59fdad6fb98.tar.bz2
gsoc2013-epiphany-6588a12505f8f630fb57435bbafad59fdad6fb98.tar.lz
gsoc2013-epiphany-6588a12505f8f630fb57435bbafad59fdad6fb98.tar.xz
gsoc2013-epiphany-6588a12505f8f630fb57435bbafad59fdad6fb98.tar.zst
gsoc2013-epiphany-6588a12505f8f630fb57435bbafad59fdad6fb98.zip
Backport of focus fix from HEAD. Fixes bug #105153.
2005-08-13 Christian Persch <chpe@cvs.gnome.org> * configure.ac: * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyBrowser.h: * embed/mozilla/mozilla-embed.cpp: * src/ephy-shell.c: (url_is_empty), (load_homepage), (ephy_shell_new_tab_full): * src/ephy-window.c: (ephy_window_open_link): Backport of focus fix from HEAD. Fixes bug #105153.
Diffstat (limited to 'src/ephy-window.c')
-rw-r--r--src/ephy-window.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 1a1a07a7d..c30cccf9b 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2537,6 +2537,7 @@ ephy_window_open_link (EphyLink *link,
EphyLinkFlags flags)
{
EphyWindow *window = EPHY_WINDOW (link);
+ EphyWindowPrivate *priv = window->priv;
EphyTab *new_tab;
g_return_val_if_fail (address != NULL, NULL);
@@ -2578,7 +2579,15 @@ ephy_window_open_link (EphyLink *link,
embed = ephy_tab_get_embed (tab);
ephy_embed_load_url (embed, address);
- ephy_embed_activate (embed);
+
+ if (address == NULL || address[0] == '\0' || strcmp (address, "about:blank") == 0)
+ {
+ ephy_toolbar_activate_location (priv->toolbar);
+ }
+ else
+ {
+ ephy_embed_activate (embed);
+ }
new_tab = tab;
}