aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-11-19 07:41:01 +0800
committerChristian Persch <chpe@src.gnome.org>2003-11-19 07:41:01 +0800
commit15cbf0f2d0ad71ed66edb1ca3d44d3beb96d49a0 (patch)
treee1e4668b9a725cd483f87ef3b82861724430b2d6 /src
parent87dbe3ba52b623a2fc97caef8b5d26527426057b (diff)
downloadgsoc2013-epiphany-15cbf0f2d0ad71ed66edb1ca3d44d3beb96d49a0.tar
gsoc2013-epiphany-15cbf0f2d0ad71ed66edb1ca3d44d3beb96d49a0.tar.gz
gsoc2013-epiphany-15cbf0f2d0ad71ed66edb1ca3d44d3beb96d49a0.tar.bz2
gsoc2013-epiphany-15cbf0f2d0ad71ed66edb1ca3d44d3beb96d49a0.tar.lz
gsoc2013-epiphany-15cbf0f2d0ad71ed66edb1ca3d44d3beb96d49a0.tar.xz
gsoc2013-epiphany-15cbf0f2d0ad71ed66edb1ca3d44d3beb96d49a0.tar.zst
gsoc2013-epiphany-15cbf0f2d0ad71ed66edb1ca3d44d3beb96d49a0.zip
Re-use some more signals from GtkMozEmbed; fix getter_Copies usage in
2003-11-19 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed.c: (ephy_embed_base_init), (ephy_embed_get_location), (ephy_embed_get_link_message), (ephy_embed_get_js_status): * embed/ephy-embed.h: * embed/mozilla/mozilla-embed.cpp: * src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init), (gnv_embed_link_message_cb): * src/ephy-nautilus-view.h: * src/ephy-tab.c: (ephy_tab_set_link_message), (ephy_tab_link_message_cb), (ephy_tab_init): Re-use some more signals from GtkMozEmbed; fix getter_Copies usage in mozilla-embed.cpp. Fixes bug #127335.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-nautilus-view.c11
-rw-r--r--src/ephy-tab.c11
2 files changed, 13 insertions, 9 deletions
diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c
index 2d2de8300..ad0cee8ca 100644
--- a/src/ephy-nautilus-view.c
+++ b/src/ephy-nautilus-view.c
@@ -170,7 +170,7 @@ ephy_nautilus_view_instance_init (EphyNautilusView *view)
view->priv = p;
view->priv->embed = ephy_embed_new (G_OBJECT (single));
- g_signal_connect (view->priv->embed, "ge_link_message",
+ g_signal_connect (view->priv->embed, "link_message",
G_CALLBACK (gnv_embed_link_message_cb),
view);
g_signal_connect (view->priv->embed, "ge_location",
@@ -347,12 +347,17 @@ gnv_embed_context_menu_cb (EphyEmbed *embed,
}
static void
-gnv_embed_link_message_cb (EphyEmbed *embed, const char *message, EphyNautilusView *view)
+gnv_embed_link_message_cb (EphyEmbed *embed, EphyNautilusView *view)
{
+ char *message;
+
g_return_if_fail (EPHY_IS_NAUTILUS_VIEW (view));
- g_return_if_fail (message != NULL);
+
+ message = ephy_embed_get_link_message (embed);
nautilus_view_report_status (NAUTILUS_VIEW (view), message);
+
+ g_free (message);
}
static void
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index a2c4f1c65..ac8859f69 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -107,7 +107,7 @@ static void ephy_tab_set_icon_address (EphyTab *tab,
static void ephy_tab_set_load_status (EphyTab *tab,
gboolean status);
static void ephy_tab_set_link_message (EphyTab *tab,
- const char *message);
+ char *message);
static void ephy_tab_set_load_percent (EphyTab *tab,
int percent);
static void ephy_tab_update_navigation_flags(EphyTab *tab);
@@ -445,12 +445,12 @@ ephy_tab_get_load_status (EphyTab *tab)
}
static void
-ephy_tab_set_link_message (EphyTab *tab, const char *message)
+ephy_tab_set_link_message (EphyTab *tab, char *message)
{
g_return_if_fail (EPHY_IS_TAB (tab));
g_free (tab->priv->link_message);
- tab->priv->link_message = g_strdup (message);
+ tab->priv->link_message = message;
g_object_notify (G_OBJECT (tab), "message");
}
@@ -583,10 +583,9 @@ ephy_tab_favicon_cb (EphyEmbed *embed,
static void
ephy_tab_link_message_cb (EphyEmbed *embed,
- const char *message,
EphyTab *tab)
{
- ephy_tab_set_link_message (tab, message);
+ ephy_tab_set_link_message (tab, ephy_embed_get_link_message (embed));
}
static void
@@ -1093,7 +1092,7 @@ ephy_tab_init (EphyTab *tab)
g_signal_connect (embed_widget, "destroy",
G_CALLBACK (ephy_tab_embed_destroy_cb),
tab);
- g_signal_connect (embed, "ge_link_message",
+ g_signal_connect (embed, "link_message",
G_CALLBACK (ephy_tab_link_message_cb),
tab);
g_signal_connect (embed, "ge_location",