[network-manager-applet/rm-userset: 2/4] gconf: remove applet settings service

[Dan Williams <dcbw src gnome org>]

commit 8be6c2f051c9fb2acff96272e21eac46bb17d638
Author: Dan Williams <dcbw redhat com>
Date:   Thu Dec 23 08:33:22 2010 -0600

    gconf: remove applet settings service
    
    No longer needed with the merge of user settings into NM itself.

 src/gconf-helpers/Makefile.am            |   16 +-
 src/gconf-helpers/gconf-helpers.c        |   21 +-
 src/gconf-helpers/gconf-helpers.h        |    2 -
 src/gconf-helpers/nma-gconf-connection.c | 1053 ------------------------------
 src/gconf-helpers/nma-gconf-connection.h |   82 ---
 src/gconf-helpers/nma-gconf-settings.c   |  452 -------------
 src/gconf-helpers/nma-gconf-settings.h   |   64 --
 7 files changed, 16 insertions(+), 1674 deletions(-)
---
diff --git a/src/gconf-helpers/Makefile.am b/src/gconf-helpers/Makefile.am
index 3ec3489..9ee8904 100644
--- a/src/gconf-helpers/Makefile.am
+++ b/src/gconf-helpers/Makefile.am
@@ -1,26 +1,20 @@
 noinst_LTLIBRARIES = libgconf-helpers.la
 
-libgconf_helpers_la_SOURCES =	\
-	gconf-helpers.h		\
-	gconf-helpers.c		\
-	gconf-upgrade.h		\
-	gconf-upgrade.c		\
-	nma-gconf-connection.h	\
-	nma-gconf-connection.c	\
-	nma-gconf-settings.h	\
-	nma-gconf-settings.c
+libgconf_helpers_la_SOURCES = \
+	gconf-helpers.h \
+	gconf-helpers.c \
+	gconf-upgrade.h \
+	gconf-upgrade.c
 
 libgconf_helpers_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(NMA_CFLAGS) \
 	$(DISABLE_DEPRECATED) \
 	-I${top_srcdir}/src \
-	-I${top_builddir}/src/marshallers \
 	-I${top_srcdir}/src/utils
 
 libgconf_helpers_la_LIBADD = \
 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
-	${top_builddir}/src/marshallers/libmarshallers.la \
 	${top_builddir}/src/utils/libutils.la
 
diff --git a/src/gconf-helpers/gconf-helpers.c b/src/gconf-helpers/gconf-helpers.c
index 2e0db07..a2d7620 100644
--- a/src/gconf-helpers/gconf-helpers.c
+++ b/src/gconf-helpers/gconf-helpers.c
@@ -21,6 +21,7 @@
  */
 
 #include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <net/ethernet.h>
@@ -45,12 +46,10 @@
 #include <nm-setting-vpn.h>
 #include <nm-setting-ip4-config.h>
 #include <nm-utils.h>
-#include <nm-settings-interface.h>
 
 #include "gconf-helpers.h"
 #include "gconf-upgrade.h"
 #include "utils.h"
-#include "applet.h"
 
 #define S390_OPT_KEY_PREFIX "s390-opt-"
 
@@ -68,6 +67,8 @@
 #define DBUS_TYPE_G_IP6_ROUTE               (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, G_TYPE_INVALID))
 #define DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE      (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ROUTE))
 
+#define APPLET_PREFS_PATH "/apps/nm-applet"
+
 const char *applet_8021x_cert_keys[] = {
 	"ca-cert",
 	"client-cert",
@@ -2129,7 +2130,7 @@ write_secret_file (const char *path,
 
 	tmppath = g_malloc0 (strlen (path) + 10);
 	if (!tmppath) {
-		g_set_error (error, NM_SETTINGS_INTERFACE_ERROR, 0,
+		g_set_error (error, 0, 0,
 		             "Could not allocate memory for temporary file for '%s'",
 		             path);
 		return FALSE;
@@ -2141,7 +2142,7 @@ write_secret_file (const char *path,
 	errno = 0;
 	fd = mkstemp (tmppath);
 	if (fd < 0) {
-		g_set_error (error, NM_SETTINGS_INTERFACE_ERROR, 0,
+		g_set_error (error, 0, 0,
 		             "Could not create temporary file for '%s': %d",
 		             path, errno);
 		goto out;
@@ -2152,7 +2153,7 @@ write_secret_file (const char *path,
 	if (fchmod (fd, S_IRUSR | S_IWUSR)) {
 		close (fd);
 		unlink (tmppath);
-		g_set_error (error, NM_SETTINGS_INTERFACE_ERROR, 0,
+		g_set_error (error, 0, 0,
 		             "Could not set permissions for temporary file '%s': %d",
 		             path, errno);
 		goto out;
@@ -2163,7 +2164,7 @@ write_secret_file (const char *path,
 	if (written != len) {
 		close (fd);
 		unlink (tmppath);
-		g_set_error (error, NM_SETTINGS_INTERFACE_ERROR, 0,
+		g_set_error (error, 0, 0,
 		             "Could not write temporary file for '%s': %d",
 		             path, errno);
 		goto out;
@@ -2174,7 +2175,7 @@ write_secret_file (const char *path,
 	errno = 0;
 	if (rename (tmppath, path)) {
 		unlink (tmppath);
-		g_set_error (error, NM_SETTINGS_INTERFACE_ERROR, 0,
+		g_set_error (error, 0, 0,
 		             "Could not rename temporary file to '%s': %d",
 		             path, errno);
 		goto out;
@@ -2378,7 +2379,7 @@ write_object (GConfClient *client,
 
 		new_file = generate_cert_path (id, objtype->suffix);
 		if (!new_file) {
-			g_set_error (error, NM_SETTINGS_INTERFACE_ERROR, 0,
+			g_set_error (error, 0, 0,
 			             "Could not create file path for %s / %s",
 			             setting_name, objtype->setting_key);
 			return FALSE;
@@ -2393,7 +2394,7 @@ write_object (GConfClient *client,
 			nm_gconf_set_string_helper (client, dir, objtype->setting_key, setting_name, new_file);
 			return TRUE;
 		} else {
-			g_set_error (error, NM_SETTINGS_INTERFACE_ERROR, 0,
+			g_set_error (error, 0, 0,
 			             "Could not write certificate/key for %s / %s: %s",
 			             setting_name, objtype->setting_key,
 			             (write_error && write_error->message) ? write_error->message : "(unknown)");
@@ -2493,7 +2494,7 @@ write_one_certificate (GConfClient *client,
 	}
 
 	if (!handled) {
-		g_set_error (error, NM_SETTINGS_INTERFACE_ERROR, 0,
+		g_set_error (error, 0, 0,
 		             "Unhandled certificate/private-key item '%s'",
 		             key);
 	}
diff --git a/src/gconf-helpers/gconf-helpers.h b/src/gconf-helpers/gconf-helpers.h
index edece41..3297645 100644
--- a/src/gconf-helpers/gconf-helpers.h
+++ b/src/gconf-helpers/gconf-helpers.h
@@ -27,8 +27,6 @@
 #include <glib.h>
 #include <nm-connection.h>
 
-#include "nma-gconf-connection.h"
-
 #define GCONF_PATH_CONNECTIONS "/system/networking/connections"
 
 /* The stamp is a mechanism for determining which applet version last