aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--embed/ephy-history.c2
-rw-r--r--src/bookmarks/ephy-bookmark-action.c4
-rw-r--r--src/bookmarks/ephy-bookmarks-export.c4
-rw-r--r--src/popup-commands.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 375d99ace..84ec54998 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ if test "$enable_maintainer_mode" = "yes"; then
GECKO_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $GECKO_WARN_CXXFLAGS"
fi
-GLIB_REQUIRED=2.15.2
+GLIB_REQUIRED=2.15.6
GTK_REQUIRED=2.12.0
LIBXML_REQUIRED=2.6.12
LIBXSLT_REQUIRED=1.1.7
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 9a0327d94..bc8cb098e 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -645,7 +645,7 @@ internal_get_host (EphyHistory *eh, const char *url, gboolean create)
if (url)
{
- scheme = g_uri_get_scheme (url);
+ scheme = g_uri_parse_scheme (url);
host_name = ephy_string_get_host_name (url);
}
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 39a9833e7..d035964b5 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -370,7 +370,7 @@ ephy_bookmark_action_activate (EphyBookmarkAction *action,
char *scheme;
char *host_name;
- scheme = g_uri_get_scheme (location);
+ scheme = g_uri_parse_scheme (location);
host_name = ephy_string_get_host_name (location);
address = g_strconcat (scheme,
"://",
@@ -515,7 +515,7 @@ query_tooltip_cb (GtkWidget *proxy,
char *scheme;
char *host_name;
- scheme = g_uri_get_scheme (location);
+ scheme = g_uri_parse_scheme (location);
host_name = ephy_string_get_host_name (location);
if (title[0] == '\0')
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index fef48f6f3..351cf7ff3 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -233,7 +233,7 @@ write_rdf (EphyBookmarks *bookmarks,
char *scheme;
char *host_name;
- scheme = g_uri_get_scheme (url);
+ scheme = g_uri_parse_scheme (url);
host_name = ephy_string_get_host_name (url);
link = g_strconcat (scheme,
"://",
@@ -304,7 +304,7 @@ write_rdf (EphyBookmarks *bookmarks,
char *scheme;
char *host_name;
- scheme = g_uri_get_scheme (url);
+ scheme = g_uri_parse_scheme (url);
host_name = ephy_string_get_host_name (url);
link = g_strconcat (scheme,
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 330030a67..dbd9baf10 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -486,7 +486,7 @@ popup_cmd_open_image (GtkAction *action,
value = ephy_embed_event_get_property (event, "image");
address = g_value_get_string (value);
- scheme = g_uri_get_scheme (address);
+ scheme = g_uri_parse_scheme (address);
if (scheme == NULL) return;
if (strcmp (scheme, "file") == 0)