network-manager-applet r936 - in trunk: . src/gconf-helpers

[dcbw svn gnome org]

Author: dcbw
Date: Thu Oct  9 14:09:22 2008
New Revision: 936
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=936&view=rev

Log:
2008-10-09  Dan Williams  <dcbw redhat com>

	* src/gconf-helpers/gconf-helpers.c
	  src/gconf-helpers/gconf-helpers.h
		- 'network' -> 'setting'; 'network' was left over from 0.6 when SSIDs
			were part of the GConf path



Modified:
   trunk/ChangeLog
   trunk/src/gconf-helpers/gconf-helpers.c
   trunk/src/gconf-helpers/gconf-helpers.h

Modified: trunk/src/gconf-helpers/gconf-helpers.c
==============================================================================
--- trunk/src/gconf-helpers/gconf-helpers.c	(original)
+++ trunk/src/gconf-helpers/gconf-helpers.c	Thu Oct  9 14:09:22 2008
@@ -66,20 +66,20 @@
 
 gboolean
 nm_gconf_get_int_helper (GConfClient *client,
-					const char *path,
-					const char *key,
-					const char *network,
-					int *value)
+                         const char *path,
+                         const char *key,
+                         const char *setting,
+                         int *value)
 {
 	char *		gc_key;
 	GConfValue *	gc_value;
 	gboolean		success = FALSE;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if ((gc_value = gconf_client_get (client, gc_key, NULL)))
 	{
 		if (gc_value->type == GCONF_VALUE_INT)
@@ -97,20 +97,20 @@
 
 gboolean
 nm_gconf_get_float_helper (GConfClient *client,
-					const char *path,
-					const char *key,
-					const char *network,
-					gfloat *value)
+                           const char *path,
+                           const char *key,
+                           const char *setting,
+                           gfloat *value)
 {
 	char *		gc_key;
 	GConfValue *	gc_value;
 	gboolean		success = FALSE;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if ((gc_value = gconf_client_get (client, gc_key, NULL)))
 	{
 		if (gc_value->type == GCONF_VALUE_FLOAT)
@@ -128,21 +128,21 @@
 
 gboolean
 nm_gconf_get_string_helper (GConfClient *client,
-					const char *path,
-					const char *key,
-					const char *network,
-					char **value)
+                            const char *path,
+                            const char *key,
+                            const char *setting,
+                            char **value)
 {
 	char *		gc_key;
 	GConfValue *	gc_value;
 	gboolean		success = FALSE;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 	g_return_val_if_fail (*value == NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if ((gc_value = gconf_client_get (client, gc_key, NULL)))
 	{
 		if (gc_value->type == GCONF_VALUE_STRING)
@@ -160,20 +160,20 @@
 
 gboolean
 nm_gconf_get_bool_helper (GConfClient *client,
-					const char *path,
-					const char *key,
-					const char *network,
-					gboolean *value)
+                          const char *path,
+                          const char *key,
+                          const char *setting,
+                          gboolean *value)
 {
 	char *		gc_key;
 	GConfValue *	gc_value;
 	gboolean		success = FALSE;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if ((gc_value = gconf_client_get (client, gc_key, NULL)))
 	{
 		if (gc_value->type == GCONF_VALUE_BOOL)
@@ -197,20 +197,20 @@
 
 gboolean
 nm_gconf_get_stringlist_helper (GConfClient *client,
-				const char *path,
-				const char *key,
-				const char *network,
-				GSList **value)
+                                const char *path,
+                                const char *key,
+                                const char *setting,
+                                GSList **value)
 {
 	char *gc_key;
 	GConfValue *gc_value;
 	gboolean success = FALSE;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!(gc_value = gconf_client_get (client, gc_key, NULL)))
 		goto out;
 
@@ -238,10 +238,10 @@
 
 gboolean
 nm_gconf_get_bytearray_helper (GConfClient *client,
-			       const char *path,
-			       const char *key,
-			       const char *network,
-			       GByteArray **value)
+                               const char *path,
+                               const char *key,
+                               const char *setting,
+                               GByteArray **value)
 {
 	char *gc_key;
 	GConfValue *gc_value;
@@ -249,10 +249,10 @@
 	gboolean success = FALSE;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!(gc_value = gconf_client_get (client, gc_key, NULL)))
 		goto out;
 
@@ -290,10 +290,10 @@
 
 gboolean
 nm_gconf_get_uint_array_helper (GConfClient *client,
-						  const char *path,
-						  const char *key,
-						  const char *network,
-						  GArray **value)
+                                const char *path,
+                                const char *key,
+                                const char *setting,
+                                GArray **value)
 {
 	char *gc_key;
 	GConfValue *gc_value;
@@ -301,10 +301,10 @@
 	gboolean success = FALSE;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!(gc_value = gconf_client_get (client, gc_key, NULL)))
 		goto out;
 
@@ -376,19 +376,19 @@
 
 gboolean
 nm_gconf_get_valuehash_helper (GConfClient *client,
-						 const char *path,
-						 const char *network,
-						 GHashTable **value)
+                               const char *path,
+                               const char *setting,
+                               GHashTable **value)
 {
 	char *gc_key;
 	GSList *gconf_entries;
 	GSList *iter;
 	int prefix_len;
 
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s", path, network);
+	gc_key = g_strdup_printf ("%s/%s", path, setting);
 	prefix_len = strlen (gc_key);
 	gconf_entries = gconf_client_all_entries (client, gc_key, NULL);
 	g_free (gc_key);
@@ -471,11 +471,11 @@
 
 gboolean
 nm_gconf_get_ip4_helper (GConfClient *client,
-						  const char *path,
-						  const char *key,
-						  const char *network,
-						  guint32 tuple_len,
-						  GPtrArray **value)
+                         const char *path,
+                         const char *key,
+                         const char *setting,
+                         guint32 tuple_len,
+                         GPtrArray **value)
 {
 	char *gc_key;
 	GConfValue *gc_value = NULL;
@@ -485,11 +485,11 @@
 	GArray *tuple = NULL;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 	g_return_val_if_fail (tuple_len > 0, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!(gc_value = gconf_client_get (client, gc_key, NULL)))
 		goto out;
 
@@ -534,15 +534,15 @@
 nm_gconf_set_int_helper (GConfClient *client,
                          const char *path,
                          const char *key,
-                         const char *network,
+                         const char *setting,
                          int value)
 {
 	char * gc_key;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;
@@ -556,15 +556,15 @@
 nm_gconf_set_float_helper (GConfClient *client,
                            const char *path,
                            const char *key,
-                           const char *network,
+                           const char *setting,
                            gfloat value)
 {
 	char * gc_key;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;
@@ -578,15 +578,15 @@
 nm_gconf_set_string_helper (GConfClient *client,
                             const char *path,
                             const char *key,
-                            const char *network,
+                            const char *setting,
                             const char *value)
 {
 	char * gc_key;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;
@@ -605,15 +605,15 @@
 nm_gconf_set_bool_helper (GConfClient *client,
                           const char *path,
                           const char *key,
-                          const char *network,
+                          const char *setting,
                           gboolean value)
 {
 	char * gc_key;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;
@@ -627,15 +627,15 @@
 nm_gconf_set_stringlist_helper (GConfClient *client,
                                 const char *path,
                                 const char *key,
-                                const char *network,
+                                const char *setting,
                                 GSList *value)
 {
 	char *gc_key;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;
@@ -650,20 +650,21 @@
 nm_gconf_set_bytearray_helper (GConfClient *client,
                                const char *path,
                                const char *key,
-                               const char *network,
+                               const char *setting,
                                GByteArray *value)
 {
 	char *gc_key;
 	int i;
 	GSList *list = NULL;
 
+	g_return_val_if_fail (path != NULL, FALSE);
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 
 	if (!value)
 		return TRUE;
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;
@@ -681,22 +682,22 @@
 
 gboolean
 nm_gconf_set_uint_array_helper (GConfClient *client,
-					  const char *path,
-					  const char *key,
-					  const char *network,
-					  GArray *value)
+                                const char *path,
+                                const char *key,
+                                const char *setting,
+                                GArray *value)
 {
 	char *gc_key;
 	int i;
 	GSList *list = NULL;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 
 	if (!value)
 		return TRUE;
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;
@@ -744,17 +745,17 @@
 
 gboolean
 nm_gconf_set_valuehash_helper (GConfClient *client,
-						 const char *path,
-						 const char *network,
-						 GHashTable *value)
+                               const char *path,
+                               const char *setting,
+                               GHashTable *value)
 {
 	char *gc_key;
 	WritePropertiesInfo info;
 
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s", path, network);
+	gc_key = g_strdup_printf ("%s/%s", path, setting);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;
@@ -791,16 +792,16 @@
 gboolean
 nm_gconf_set_stringhash_helper (GConfClient *client,
                                 const char *path,
-                                const char *network,
+                                const char *setting,
                                 GHashTable *value)
 {
 	char *gc_key;
 	WritePropertiesInfo info;
 
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	gc_key = g_strdup_printf ("%s/%s", path, network);
+	gc_key = g_strdup_printf ("%s/%s", path, setting);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;
@@ -817,11 +818,11 @@
 
 gboolean
 nm_gconf_set_ip4_helper (GConfClient *client,
-					  const char *path,
-					  const char *key,
-					  const char *network,
-					  guint32 tuple_len,
-					  GPtrArray *value)
+                         const char *path,
+                         const char *key,
+                         const char *setting,
+                         guint32 tuple_len,
+                         GPtrArray *value)
 {
 	char *gc_key;
 	int i;
@@ -829,13 +830,13 @@
 	gboolean success = FALSE;
 
 	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (network != NULL, FALSE);
+	g_return_val_if_fail (setting != NULL, FALSE);
 	g_return_val_if_fail (tuple_len > 0, FALSE);
 
 	if (!value)
 		return TRUE;
 
-	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
+	gc_key = g_strdup_printf ("%s/%s/%s", path, setting, key);
 	if (!gc_key) {
 		g_warning ("Not enough memory to create gconf path");
 		return FALSE;

Modified: trunk/src/gconf-helpers/gconf-helpers.h
==============================================================================
--- trunk/src/gconf-helpers/gconf-helpers.h	(original)
+++ trunk/src/gconf-helpers/gconf-helpers.h	Thu Oct  9 14:09:22 2008
@@ -55,49 +55,49 @@
 nm_gconf_get_int_helper (GConfClient *client,
 					const char *path,
 					const char *key,
-					const char *network,
+					const char *setting,
 					int *value);
 
 gboolean
 nm_gconf_get_float_helper (GConfClient *client,
 					const char *path,
 					const char *key,
-					const char *network,
+					const char *setting,
 					gfloat *value);
 
 gboolean
 nm_gconf_get_string_helper (GConfClient *client,
 					const char *path,
 					const char *key,
-					const char *network,
+					const char *setting,
 					char **value);
 
 gboolean
 nm_gconf_get_bool_helper (GConfClient *client,
 					const char *path,
 					const char *key,
-					const char *network,
+					const char *setting,
 					gboolean *value);
 
 gboolean
 nm_gconf_get_stringlist_helper (GConfClient *client,
 				const char *path,
 				const char *key,
-				const char *network,
+				const char *setting,
 				GSList **value);
 
 gboolean
 nm_gconf_get_bytearray_helper (GConfClient *client,
 			       const char *path,
 			       const char *key,
-			       const char *network,
+			       const char *setting,
 			       GByteArray **value);
 
 gboolean
 nm_gconf_get_uint_array_helper (GConfClient *client,
 				const char *path,
 				const char *key,
-				const char *network,
+				const char *setting,
 				GArray **value);
 
 
@@ -105,7 +105,7 @@
 gboolean
 nm_gconf_get_valuehash_helper (GConfClient *client,
 			       const char *path,
-			       const char *network,
+			       const char *setting,
 			       GHashTable **value);
 #endif
 
@@ -119,7 +119,7 @@
 nm_gconf_get_ip4_helper (GConfClient *client,
 						  const char *path,
 						  const char *key,
-						  const char *network,
+						  const char *setting,
 						  guint32 tuple_len,
 						  GPtrArray **value);
 
@@ -129,70 +129,70 @@
 nm_gconf_set_int_helper (GConfClient *client,
                          const char *path,
                          const char *key,
-                         const char *network,
+                         const char *setting,
                          int value);
 
 gboolean
 nm_gconf_set_float_helper (GConfClient *client,
                            const char *path,
                            const char *key,
-                           const char *network,
+                           const char *setting,
                            gfloat value);
 
 gboolean
 nm_gconf_set_string_helper (GConfClient *client,
                             const char *path,
                             const char *key,
-                            const char *network,
+                            const char *setting,
                             const char *value);
 
 gboolean
 nm_gconf_set_bool_helper (GConfClient *client,
                           const char *path,
                           const char *key,
-                          const char *network,
+                          const char *setting,
                           gboolean value);
 
 gboolean
 nm_gconf_set_stringlist_helper (GConfClient *client,
                                 const char *path,
                                 const char *key,
-                                const char *network,
+                                const char *setting,
                                 GSList *value);
 
 gboolean
 nm_gconf_set_bytearray_helper (GConfClient *client,
                                const char *path,
                                const char *key,
-                               const char *network,
+                               const char *setting,
                                GByteArray *value);
 
 gboolean
 nm_gconf_set_uint_array_helper (GConfClient *client,
 				const char *path,
 				const char *key,
-				const char *network,
+				const char *setting,
 				GArray *value);
 
 #if UNUSED
 gboolean
 nm_gconf_set_valuehash_helper (GConfClient *client,
 			       const char *path,
-			       const char *network,
+			       const char *setting,
 			       GHashTable *value);
 #endif
 
 gboolean
 nm_gconf_set_stringhash_helper (GConfClient *client,
                                 const char *path,
-                                const char *network,
+                                const char *setting,
                                 GHashTable *value);
 
 gboolean
 nm_gconf_set_ip4_helper (GConfClient *client,
 					  const char *path,
 					  const char *key,
-					  const char *network,
+					  const char *setting,
 					  guint32 tuple_len,
 					  GPtrArray *value);