epiphany r7981 - in trunk: . embed src src/bookmarks

[chpe svn gnome org]

Author: chpe
Date: Mon Feb 25 19:37:26 2008
New Revision: 7981
URL: http://svn.gnome.org/viewvc/epiphany?rev=7981&view=rev

Log:
Adapt to gio API change

Modified:
   trunk/configure.ac
   trunk/embed/ephy-history.c
   trunk/src/bookmarks/ephy-bookmark-action.c
   trunk/src/bookmarks/ephy-bookmarks-export.c
   trunk/src/popup-commands.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Feb 25 19:37:26 2008
@@ -98,7 +98,7 @@
 	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

Modified: trunk/embed/ephy-history.c
==============================================================================
--- trunk/embed/ephy-history.c	(original)
+++ trunk/embed/ephy-history.c	Mon Feb 25 19:37:26 2008
@@ -645,7 +645,7 @@
 
 	if (url)
 	{
-		scheme = g_uri_get_scheme (url);
+		scheme = g_uri_parse_scheme (url);
 		host_name = ephy_string_get_host_name (url);
 	}
 

Modified: trunk/src/bookmarks/ephy-bookmark-action.c
==============================================================================
--- trunk/src/bookmarks/ephy-bookmark-action.c	(original)
+++ trunk/src/bookmarks/ephy-bookmark-action.c	Mon Feb 25 19:37:26 2008
@@ -370,7 +370,7 @@
 		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 @@
 			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')

Modified: trunk/src/bookmarks/ephy-bookmarks-export.c
==============================================================================
--- trunk/src/bookmarks/ephy-bookmarks-export.c	(original)
+++ trunk/src/bookmarks/ephy-bookmarks-export.c	Mon Feb 25 19:37:26 2008
@@ -233,7 +233,7 @@
 			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 @@
 			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,

Modified: trunk/src/popup-commands.c
==============================================================================
--- trunk/src/popup-commands.c	(original)
+++ trunk/src/popup-commands.c	Mon Feb 25 19:37:26 2008
@@ -486,7 +486,7 @@
 	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)