aboutsummaryrefslogtreecommitdiffstats
path: root/src/window-commands.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-06-21 00:52:49 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-06-21 00:52:49 +0800
commit5d5fe667968ae5e9b4a4fe97ba36a06a7616d718 (patch)
treef0a28b1067282fdc4d7aed8aabc1a2ad39cd2bf2 /src/window-commands.c
parenta838f6d5ab82bac98a25fb3ce9cb2c0cd575146c (diff)
downloadgsoc2013-epiphany-5d5fe667968ae5e9b4a4fe97ba36a06a7616d718.tar
gsoc2013-epiphany-5d5fe667968ae5e9b4a4fe97ba36a06a7616d718.tar.gz
gsoc2013-epiphany-5d5fe667968ae5e9b4a4fe97ba36a06a7616d718.tar.bz2
gsoc2013-epiphany-5d5fe667968ae5e9b4a4fe97ba36a06a7616d718.tar.lz
gsoc2013-epiphany-5d5fe667968ae5e9b4a4fe97ba36a06a7616d718.tar.xz
gsoc2013-epiphany-5d5fe667968ae5e9b4a4fe97ba36a06a7616d718.tar.zst
gsoc2013-epiphany-5d5fe667968ae5e9b4a4fe97ba36a06a7616d718.zip
Set a title on NET_START (nicified url).
2003-06-20 Marco Pesenti Gritti <marco@it.gnome.org> * src/ephy-tab.c: (ephy_tab_net_state_cb), (ephy_tab_set_title): Set a title on NET_START (nicified url). * src/prefs-dialog.c: (prefs_homepage_current_button_clicked_cb): * src/session.c: (save_tab): * src/window-commands.c: (window_cmd_file_send_to), (window_cmd_file_bookmark_page): Use embed_get_location when we want the real location, tab can contain user changes.
Diffstat (limited to 'src/window-commands.c')
-rw-r--r--src/window-commands.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/window-commands.c b/src/window-commands.c
index a42849b51..84294dfc8 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -124,6 +124,7 @@ window_cmd_file_send_to (EggAction *action,
EphyTab *tab;
EphyEmbed *embed;
char *url;
+ char *embed_location;
char *location;
char *title;
@@ -133,7 +134,10 @@ window_cmd_file_send_to (EggAction *action,
embed = ephy_window_get_active_embed (window);
g_return_if_fail (embed != NULL);
- location = gnome_vfs_escape_string (ephy_tab_get_location (tab));
+ ephy_embed_get_location (embed, TRUE, &embed_location);
+ location = gnome_vfs_escape_string (embed_location);
+ g_free (embed_location);
+
if (ephy_embed_get_title (embed, &title) == G_OK)
{
char *tmp = gnome_vfs_escape_string (title);
@@ -279,13 +283,13 @@ window_cmd_go_bookmarks (EggAction *action,
void
window_cmd_file_bookmark_page (EggAction *action,
- EphyWindow *window)
+ EphyWindow *window)
{
EphyTab *tab;
EphyEmbed *embed;
EphyBookmarks *bookmarks;
GtkWidget *new_bookmark;
- const char *location;
+ char *location;
const char *icon;
char *title = NULL;
@@ -295,7 +299,8 @@ window_cmd_file_bookmark_page (EggAction *action,
embed = ephy_window_get_active_embed (window);
g_return_if_fail (embed != NULL);
- location = ephy_tab_get_location (tab);
+ ephy_embed_get_location (embed, TRUE, &location);
+
if (ephy_embed_get_title (embed, &title) != G_OK)
{
title = g_strdup (_("Untitled"));
@@ -317,6 +322,7 @@ window_cmd_file_bookmark_page (EggAction *action,
}
g_free (title);
+ g_free (location);
}
void