aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2003-03-25 08:29:25 +0800
committerXan Lopez <xan@src.gnome.org>2003-03-25 08:29:25 +0800
commitc5f06422616bdbdcddf177d73484d2ea188c7300 (patch)
treee596b59d49ad1e8261732e9466ccca7913bbbef1
parent674c6c88ec079fe16688296835fdc6da0820832f (diff)
downloadgsoc2013-epiphany-c5f06422616bdbdcddf177d73484d2ea188c7300.tar
gsoc2013-epiphany-c5f06422616bdbdcddf177d73484d2ea188c7300.tar.gz
gsoc2013-epiphany-c5f06422616bdbdcddf177d73484d2ea188c7300.tar.bz2
gsoc2013-epiphany-c5f06422616bdbdcddf177d73484d2ea188c7300.tar.lz
gsoc2013-epiphany-c5f06422616bdbdcddf177d73484d2ea188c7300.tar.xz
gsoc2013-epiphany-c5f06422616bdbdcddf177d73484d2ea188c7300.tar.zst
gsoc2013-epiphany-c5f06422616bdbdcddf177d73484d2ea188c7300.zip
Missing bits from old commit.
Missing bits from old commit.
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-window.c15
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 911f4c092..09cb6f7bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-25 Xan Lopez <xan@masilla.org>
+
+ * src/ephy-window.c: (ephy_window_selection_received_cb):
+
+ Missing bits from old commit, don't know how the hell I missed this.
+
2003-03-25 Marco Pesenti Gritti <marco@it.gnome.org>
* TODO:
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 649c9ded3..c66d1f6ed 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -367,13 +367,24 @@ ephy_window_selection_received_cb (GtkWidget *widget,
guint time, EphyWindow *window)
{
EphyTab *tab;
+ const char *location;
if (selection_data->length <= 0 || selection_data->data == NULL)
return;
tab = ephy_window_get_active_tab (window);
- ephy_shell_new_tab (ephy_shell, window, tab,
- selection_data->data, 0);
+ location = ephy_tab_get_location(tab);
+
+ /* If this tab is not empty... */
+ if (location != NULL && strcmp (location, "about:blank") != 0)
+ {
+ ephy_shell_new_tab (ephy_shell, window, tab,
+ selection_data->data, 0);
+ }
+ else
+ {
+ ephy_embed_load_url (ephy_tab_get_embed (tab), selection_data->data);
+ }
}
static void