gnome-control-center r8707 - trunk/capplets/network

[jensg svn gnome org]

Author: jensg
Date: Fri May 16 17:57:53 2008
New Revision: 8707
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8707&view=rev

Log:
2008-05-16  Jens Granseuer  <jensgr gmx net>

	* gnome-network-preferences.c: (get_hostname_from_uri),
	(extract_proxy_host), (main): drop gnome-vfs dependency (part of bug
	#524401)


Modified:
   trunk/capplets/network/ChangeLog
   trunk/capplets/network/gnome-network-preferences.c

Modified: trunk/capplets/network/gnome-network-preferences.c
==============================================================================
--- trunk/capplets/network/gnome-network-preferences.c	(original)
+++ trunk/capplets/network/gnome-network-preferences.c	Fri May 16 17:57:53 2008
@@ -24,10 +24,10 @@
 #  include <config.h>
 #endif
 
+#include <string.h>
 #include <libgnome/libgnome.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
 
 #include "capplet-util.h"
 #include "gconf-property-editor.h"
@@ -336,27 +336,58 @@
 	g_object_unref (client);
 }
 
+static gchar *
+get_hostname_from_uri (const gchar *uri)
+{
+	const gchar *start, *end;
+	gchar *host;
+
+	if (uri == NULL)
+		return NULL;
+
+	/* skip the scheme part */
+	start = strchr (uri, ':');
+	if (start == NULL)
+		return NULL;
+
+	/* forward until after the last '/' */
+	do {
+		++start;
+	} while (*start == '/');
+
+	if (*start == '\0')
+	  return NULL;
+
+	/* maybe we have a port? */
+	end = strchr (start, ':');
+	if (end == NULL)
+		end = strchr (start, '/');
+
+	if (end != NULL)
+		host = g_strndup (start, end - start);
+	else
+		host = g_strdup (start);
+
+	return host;
+}
+
 static GConfValue *
 extract_proxy_host (GConfPropertyEditor *peditor, const GConfValue *orig)
 {
-	char const  *entered_text = gconf_value_get_string (orig);
-	GConfValue  *res = NULL;
+	char const *entered_text = gconf_value_get_string (orig);
+	GConfValue *res = NULL;
 
 	if (entered_text != NULL) {
-		GnomeVFSURI *uri = gnome_vfs_uri_new (entered_text);
-		if (uri != NULL) {
-			char const  *host	  = gnome_vfs_uri_get_host_name (uri);
-			if (host != NULL) {
-				res = gconf_value_new (GCONF_VALUE_STRING);
-				gconf_value_set_string (res, host);
-			}
-			gnome_vfs_uri_unref (uri);
+		gchar *host = get_hostname_from_uri (entered_text);
+
+		if (host != NULL) {
+			res = gconf_value_new (GCONF_VALUE_STRING);
+			gconf_value_set_string (res, host);
+			g_free (host);
 		}
 	}
 
-	if (res != NULL)
-		return res;
-	return gconf_value_copy (orig);
+	return (res != NULL) ? res : gconf_value_copy (orig);
 }
 
 static void
@@ -538,8 +569,6 @@
 				      argc, argv, GNOME_PARAM_NONE);
 
 	client = gconf_client_get_default ();
-	gconf_client_add_dir (client, "/system/gnome-vfs",
-			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	gconf_client_add_dir (client, "/system/http_proxy",
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	gconf_client_add_dir (client, "/system/proxy",