File epiphany-extensions-epi35api.patch of Package epiphany-extensions
diff --git a/extensions/actions/ephy-actions-extension.c b/extensions/actions/ephy-actions-extension.c
index 3a0f02e..267244f 100644
--- a/extensions/actions/ephy-actions-extension.c
+++ b/extensions/actions/ephy-actions-extension.c
@@ -457,7 +457,7 @@ ephy_actions_extension_document_popup_cb (GtkAction *action,
{
guint context;
EphyEmbed *embed;
- char *url;
+ const char *url;
ActionData *action_data;
action_data = g_object_get_data (G_OBJECT (action), ACTION_DATA_KEY);
@@ -479,9 +479,8 @@ ephy_actions_extension_document_popup_cb (GtkAction *action,
}
embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
- url = ephy_web_view_get_location (ephy_embed_get_web_view (embed), TRUE);
+ url = ephy_web_view_get_address (ephy_embed_get_web_view (embed));
ephy_actions_extension_run_action (action, window, url);
- g_free (url);
}
static void
diff --git a/extensions/rss/rss-ui.c b/extensions/rss/rss-ui.c
index 43126e1..7695e02 100644
--- a/extensions/rss/rss-ui.c
+++ b/extensions/rss/rss-ui.c
@@ -431,15 +431,15 @@ rss_ui_populate_store (RssUI *dialog)
{
RssUIPrivate *priv = dialog->priv;
FeedSelectionDecision decision = { FALSE, FALSE, NULL };
- char *location;
+ const char *location;
if (priv->embed == NULL) return;
/* We start populating the list, and try to select as much as possible
* avoiding duplicate feeds
*/
- location = ephy_web_view_get_location
- (ephy_embed_get_web_view (priv->embed), TRUE);
+ location = ephy_web_view_get_address
+ (ephy_embed_get_web_view (priv->embed));
decision.hostname = g_strdup (ephy_string_get_host_name (location));
/* Fill the store, and select the appropriate feeds */
@@ -449,7 +449,6 @@ rss_ui_populate_store (RssUI *dialog)
(GtkTreeModelForeachFunc) rss_ui_select_feeds,
&decision);
- g_free (location);
g_free (decision.hostname);
}