krb5-auth-dialog r138 - in trunk: . src

[guidog svn gnome org]

Author: guidog
Date: Sat Apr  4 09:29:44 2009
New Revision: 138
URL: http://svn.gnome.org/viewvc/krb5-auth-dialog?rev=138&view=rev

Log:
split out gconf tool functions

Added:
   trunk/src/krb5-auth-gconf-tools.c
   trunk/src/krb5-auth-gconf-tools.h
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/krb5-auth-gconf.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Apr  4 09:29:44 2009
@@ -33,6 +33,8 @@
 	krb5-auth-pwdialog.h    \
 	krb5-auth-gconf.c	\
 	krb5-auth-gconf.h	\
+	krb5-auth-gconf-tools.c	\
+	krb5-auth-gconf-tools.h	\
 	krb5-auth-dbus.c	\
 	krb5-auth-dbus.h	\
 	dummy-strings.c

Added: trunk/src/krb5-auth-gconf-tools.c
==============================================================================
--- (empty file)
+++ trunk/src/krb5-auth-gconf-tools.c	Sat Apr  4 09:29:44 2009
@@ -0,0 +1,102 @@
+/* Krb5 Auth Applet -- Acquire and release kerberos tickets
+ *
+ * (C) 2008,2009 Guido Guenther <agx sigxcpu org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+
+#include <gconf/gconf-client.h>
+#include <krb5-auth-gconf-tools.h>
+
+gboolean
+ka_gconf_get_string (GConfClient* client,
+		     const char* key,
+		     char** value)
+{
+	GError*		error = NULL;
+	gboolean	success = FALSE;
+	GConfValue*	gc_value;
+
+	g_return_val_if_fail (key != NULL, FALSE);
+	g_return_val_if_fail (*value == NULL, FALSE);
+
+	if ((gc_value = gconf_client_get (client, key, &error))) {
+		if (gc_value->type == GCONF_VALUE_STRING) {
+			*value = g_strdup (gconf_value_get_string (gc_value));
+			success = TRUE;
+		} else if (error) {
+				g_print (error->message);
+				g_error_free (error);
+		}
+		gconf_value_free (gc_value);
+	}
+	return success;
+}
+
+
+gboolean
+ka_gconf_get_int (GConfClient* client,
+		    const char* key,
+		    int* value)
+{
+	GError*		error = NULL;
+	gboolean	success = FALSE;
+	GConfValue*	gc_value;
+
+	g_return_val_if_fail (key != NULL, FALSE);
+	g_return_val_if_fail (value != NULL, FALSE);
+
+	if ((gc_value = gconf_client_get (client, key, &error)))
+	{
+		if (gc_value->type == GCONF_VALUE_INT) {
+			*value = gconf_value_get_int (gc_value);
+			success = TRUE;
+		} else if (error) {
+				g_print (error->message);
+				g_error_free (error);
+		}
+		gconf_value_free (gc_value);
+	}
+	return success;
+}
+
+
+gboolean
+ka_gconf_get_bool (GConfClient* client,
+		    const char* key,
+		    gboolean* value)
+{
+	GError*		error = NULL;
+	gboolean	success = FALSE;
+	GConfValue*	gc_value;
+
+	g_return_val_if_fail (key != NULL, FALSE);
+	g_return_val_if_fail (value != NULL, FALSE);
+
+	if ((gc_value = gconf_client_get (client, key, &error))) {
+		if (gc_value->type == GCONF_VALUE_BOOL) {
+			*value = gconf_value_get_bool (gc_value);
+			success = TRUE;
+		} else if (error) {
+				g_print (error->message);
+				g_error_free (error);
+		}
+		gconf_value_free (gc_value);
+	}
+	return success;
+}
+

Added: trunk/src/krb5-auth-gconf-tools.h
==============================================================================
--- (empty file)
+++ trunk/src/krb5-auth-gconf-tools.h	Sat Apr  4 09:29:44 2009
@@ -0,0 +1,38 @@
+/* Krb5 Auth Applet -- Acquire and release kerberos tickets
+ *
+ * (C) 2008,2009 Guido Guenther <agx sigxcpu org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef KRB5_AUTH_GCONF_TOOLS_H
+#define KRB5_AUTH_GCONF_TOOLS_H
+
+#include "config.h"
+
+#include <gconf/gconf-client.h>
+
+#define KA_GCONF_PATH			"/apps/" PACKAGE
+#define KA_GCONF_KEY_PRINCIPAL		KA_GCONF_PATH "/principal"
+#define KA_GCONF_KEY_PK_USERID		KA_GCONF_PATH "/pk_userid"
+#define KA_GCONF_KEY_PROMPT_MINS	KA_GCONF_PATH "/prompt_minutes"
+#define KA_GCONF_KEY_SHOW_TRAYICON	KA_GCONF_PATH "/show_trayicon"
+
+gboolean ka_gconf_get_string (GConfClient* client, const char* key, char** value);
+gboolean ka_gconf_get_int (GConfClient* client, const char* key, int* value);
+gboolean ka_gconf_get_bool (GConfClient* client, const char* key, gboolean* value);
+
+#endif

Modified: trunk/src/krb5-auth-gconf.c
==============================================================================
--- trunk/src/krb5-auth-gconf.c	(original)
+++ trunk/src/krb5-auth-gconf.c	Sat Apr  4 09:29:44 2009
@@ -22,94 +22,9 @@
 #include <gconf/gconf-client.h>
 
 #include "krb5-auth-applet.h"
+#include "krb5-auth-gconf-tools.h"
 #include "krb5-auth-gconf.h"
 
-#define KA_GCONF_PATH			"/apps/" PACKAGE
-#define KA_GCONF_KEY_PRINCIPAL		KA_GCONF_PATH "/principal"
-#define KA_GCONF_KEY_PK_USERID		KA_GCONF_PATH "/pk_userid"
-#define KA_GCONF_KEY_PROMPT_MINS	KA_GCONF_PATH "/prompt_minutes"
-#define KA_GCONF_KEY_SHOW_TRAYICON	KA_GCONF_PATH "/show_trayicon"
-
-static gboolean
-ka_gconf_get_string (GConfClient* client,
-		     const char* key,
-		     char** value)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-	GConfValue*	gc_value;
-
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (*value == NULL, FALSE);
-
-	if ((gc_value = gconf_client_get (client, key, &error))) {
-		if (gc_value->type == GCONF_VALUE_STRING) {
-			*value = g_strdup (gconf_value_get_string (gc_value));
-			success = TRUE;
-		} else if (error) {
-				g_print (error->message);
-				g_error_free (error);
-		}
-		gconf_value_free (gc_value);
-	}
-	return success;
-}
-
-
-static gboolean
-ka_gconf_get_int (GConfClient* client,
-		    const char* key,
-		    int* value)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-	GConfValue*	gc_value;
-
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (value != NULL, FALSE);
-
-	if ((gc_value = gconf_client_get (client, key, &error)))
-	{
-		if (gc_value->type == GCONF_VALUE_INT) {
-			*value = gconf_value_get_int (gc_value);
-			success = TRUE;
-		} else if (error) {
-				g_print (error->message);
-				g_error_free (error);
-		}
-		gconf_value_free (gc_value);
-	}
-	return success;
-}
-
-
-static gboolean
-ka_gconf_get_bool (GConfClient* client,
-		    const char* key,
-		    gboolean* value)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-	GConfValue*	gc_value;
-
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (value != NULL, FALSE);
-
-	if ((gc_value = gconf_client_get (client, key, &error)))
-	{
-		if (gc_value->type == GCONF_VALUE_BOOL) {
-			*value = gconf_value_get_bool (gc_value);
-			success = TRUE;
-		} else if (error) {
-				g_print (error->message);
-				g_error_free (error);
-		}
-		gconf_value_free (gc_value);
-	}
-	return success;
-}
-
-
 static gboolean
 ka_gconf_set_principal (GConfClient* client, KaApplet* applet)
 {