Assorted fixes and cleanups, updated version

12 files changed, 49 insertions, 36 deletions

diff --git a/configure.ac b/configure.ac
index 144af8c..81ab62b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.60])
-AC_INIT([gsignond], [0.0.3],[],[],[http://01.org/gsso])
+AC_INIT([gsignond], [0.0.4],[],[],[http://01.org/gsso])
 AC_CONFIG_SRCDIR([src/daemon/main.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/dists/debian/changelog b/dists/debian/changelog
index 757a55d..4ed4d7e 100644
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,3 +1,15 @@
+gsignond (0.0.4-3) unstable; urgency=low
+
+  * Update to 0.0.4
+
+ -- Jussi Laako <jussi.laako@linux.intel.com>  Fri, 28 Feb 2014 15:44:00 +0200
+
+gsignond (0.0.3-2) unstable; urgency=low
+
+  * Minor update
+
+ -- Jussi Laako <jussi.laako@linux.intel.com>  Wed, 08 Jan 2014 17:37:00 +0200
+
 gsignond (0.0.3-1) unstable; urgency=low
 
   * Bug fixes in UI interaction
diff --git a/dists/rpm/gsignond-suse.spec b/dists/rpm/gsignond-suse.spec
index 00f0cf3..17320fa 100644
--- a/dists/rpm/gsignond-suse.spec
+++ b/dists/rpm/gsignond-suse.spec
@@ -6,8 +6,8 @@
 
 Name: gsignond
 Summary: GLib based Single Sign-On daemon
-Version: 0.0.3
-Release: 1
+Version: 0.0.4
+Release: 2
 Group: System/Daemons
 License: LGPL-2.1+
 Source: %{name}-%{version}.tar.gz
@@ -121,6 +121,9 @@ groupadd -f -r gsignond
 
 
 %changelog
+* Fri Feb 28 2014 Jussi Laako <jussi.laako@linux.intel.com>
+- Release 0.0.4
+
 * Thu Aug 22 2013 Amarnath Valluri <amarnath.valluri@linux.intel.com>
 - Release 0.0.3
 - Bug fixes in UI interaction
diff --git a/dists/rpm/gsignond-tizen.changes b/dists/rpm/gsignond-tizen.changes
index 0fc9fd8..3b388a7 100644
--- a/dists/rpm/gsignond-tizen.changes
+++ b/dists/rpm/gsignond-tizen.changes
@@ -1,3 +1,6 @@
+* Fri Feb 28 2014 Jussi Laako <jussi.laako@linux.intel.com>
+- Release 0.0.4
+
 * Thu Aug 22 2013 Amarnath Valluri <amarnath.valluri@linux.intel.com>
 - Release 0.0.3 
 - Bug fixes in UI interaction
diff --git a/dists/rpm/gsignond-tizen.spec b/dists/rpm/gsignond-tizen.spec
index c41efa1..3b1c91c 100644
--- a/dists/rpm/gsignond-tizen.spec
+++ b/dists/rpm/gsignond-tizen.spec
@@ -6,8 +6,8 @@
 
 Name: gsignond
 Summary: GLib based Single Sign-On daemon
-Version: 0.0.3
-Release: 1
+Version: 0.0.4
+Release: 2
 Group: System/Daemons
 License: LGPL-2.1+
 Source: %{name}-%{version}.tar.gz
diff --git a/src/daemon/plugins/gsignond-plugin-proxy-factory.c b/src/daemon/plugins/gsignond-plugin-proxy-factory.c
index f7e2162..6dabab2 100644
--- a/src/daemon/plugins/gsignond-plugin-proxy-factory.c
+++ b/src/daemon/plugins/gsignond-plugin-proxy-factory.c
@@ -3,7 +3,7 @@
 /*
  * This file is part of gsignond
  *
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alexander Kanavin <alex.kanavin@gmail.com>
  *
@@ -153,7 +153,7 @@ static void _enumerate_plugins(GSignondPluginProxyFactory* self)
 
     // make a flat list of available plugin types
     int n_plugins = g_hash_table_size(self->methods_to_mechanisms);
-    self->methods = g_malloc0(sizeof(gchar*) * (n_plugins + 1));
+    self->methods = g_new0(gchar*, n_plugins + 1);
     gchar **method_iter = self->methods;
 
     GList* keys = g_hash_table_get_keys(self->methods_to_mechanisms);
diff --git a/src/daemon/plugins/gsignond-plugin-proxy.c b/src/daemon/plugins/gsignond-plugin-proxy.c
index ffe08e7..30446c5 100644
--- a/src/daemon/plugins/gsignond-plugin-proxy.c
+++ b/src/daemon/plugins/gsignond-plugin-proxy.c
@@ -3,7 +3,7 @@
 /*
  * This file is part of gsignond
  *
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alexander Kanavin <alex.kanavin@gmail.com>
  *
@@ -372,7 +372,7 @@ gsignond_plugin_proxy_get_property (
                                    "mechanisms", value);
             break;
         case PROP_LOADERPATH:
-            g_value_set_object (value, priv->loader_path);
+            g_value_set_string (value, priv->loader_path);
             break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
diff --git a/src/daemon/plugins/gsignond-plugin-remote.c b/src/daemon/plugins/gsignond-plugin-remote.c
index 4c8f401..3a0aee4 100644
--- a/src/daemon/plugins/gsignond-plugin-remote.c
+++ b/src/daemon/plugins/gsignond-plugin-remote.c
@@ -3,7 +3,7 @@
 /*
  * This file is part of gsignond
  *
- * Copyright (C) 2013 Intel Corporation.
+ * Copyright (C) 2013-2014 Intel Corporation.
  *
  * Contact: Imran Zaman <imran.zaman@intel.com>
  *
@@ -496,7 +496,7 @@ gsignond_plugin_remote_new (
     signal(SIGPIPE, SIG_IGN);
 
     /* Spawn child process */
-    argv = g_malloc0 ((2 + 1) * sizeof (gchar *));
+    argv = g_new0 (gchar *, 2 + 1);
     argv[0] = g_strdup(loader_path);
     argv[1] = g_strdup_printf("--load-plugin=%s",plugin_type);
     ret = g_spawn_async_with_pipes (NULL, argv, NULL,
diff --git a/src/gplugind/gsignond-plugin-daemon.c b/src/gplugind/gsignond-plugin-daemon.c
index 11a7eb9..d025d74 100644
--- a/src/gplugind/gsignond-plugin-daemon.c
+++ b/src/gplugind/gsignond-plugin-daemon.c
@@ -3,7 +3,7 @@
 /*
  * This file is part of gsignond
  *
- * Copyright (C) 2013 Intel Corporation.
+ * Copyright (C) 2013-2014 Intel Corporation.
  *
  * Contact: Imran Zaman <imran.zaman@intel.com>
  *
@@ -354,8 +354,8 @@ gsignond_plugin_daemon_new (
             GSIGNOND_TYPE_PLUGIN_DAEMON, NULL));
 
     /* Load plugin */
-    daemon->priv->plugin = gsignond_load_plugin_with_filename (
-            (gchar *)plugin_type, (gchar*)filename);
+    daemon->priv->plugin = gsignond_load_plugin_with_filename (plugin_type,
+                                                               filename);
     if (!daemon->priv->plugin) {
         DBG ("failed to load plugin");
         g_object_unref (daemon);
diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c
index d31590b..17425f0 100644
--- a/src/gplugind/gsignond-plugin-loader.c
+++ b/src/gplugind/gsignond-plugin-loader.c
@@ -3,7 +3,7 @@
 /*
  * This file is part of gsignond
  *
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alexander Kanavin <alex.kanavin@gmail.com>
  *
@@ -31,10 +31,10 @@
 #include "gsignond/gsignond-log.h"
 #include "gsignond-plugin-loader.h"
 
-GSignondPlugin*
-gsignond_load_plugin(
+GSignondPlugin *
+gsignond_load_plugin (
         GSignondConfig* config,
-        gchar* plugin_type)
+        const gchar *plugin_type)
 {
     const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
     gchar *plugin_filename;
@@ -52,10 +52,10 @@ gsignond_load_plugin(
     return plugin;
 }
 
-GSignondPlugin*
+GSignondPlugin *
 gsignond_load_plugin_with_filename(
-        gchar *plugin_type,
-        gchar *plugin_filename)
+        const gchar *plugin_type,
+        const gchar *plugin_filename)
 {
     DBG("Loading plugin %s", plugin_filename);
     GModule* plugin_module = g_module_open (plugin_filename, 
diff --git a/src/gplugind/gsignond-plugin-loader.h b/src/gplugind/gsignond-plugin-loader.h
index 0c1e727..ae8cec1 100644
--- a/src/gplugind/gsignond-plugin-loader.h
+++ b/src/gplugind/gsignond-plugin-loader.h
@@ -3,7 +3,7 @@
 /*
  * This file is part of gsignond
  *
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alexander Kanavin <alex.kanavin@gmail.com>
  *
@@ -31,15 +31,15 @@
 
 G_BEGIN_DECLS
 
-GSignondPlugin*
-gsignond_load_plugin(
+GSignondPlugin *
+gsignond_load_plugin (
         GSignondConfig* config,
-        gchar* plugin_type);
+        const gchar *plugin_type);
 
-GSignondPlugin*
-gsignond_load_plugin_with_filename(
-        gchar *plugin_type,
-        gchar *plugin_filename);
+GSignondPlugin *
+gsignond_load_plugin_with_filename (
+        const gchar *plugin_type,
+        const gchar *plugin_filename);
 
 G_END_DECLS
 
diff --git a/src/gplugind/main.c b/src/gplugind/main.c
index 3460689..aef71c3 100644
--- a/src/gplugind/main.c
+++ b/src/gplugind/main.c
@@ -3,7 +3,7 @@
 /*
  * This file is part of gsignond
  *
- * Copyright (C) 2013 Intel Corporation.
+ * Copyright (C) 2013-2014 Intel Corporation.
  *
  * Contact: Imran Zaman <imran.zaman@intel.com>
  *
@@ -105,11 +105,6 @@ static void _list_plugins()
         return;
     }
 
-    int n_plugins = 0;
-    while (g_dir_read_name(plugin_dir) != NULL)
-        n_plugins++;
-    g_dir_rewind(plugin_dir);
-
     while (1) {
         const gchar* plugin_soname = g_dir_read_name(plugin_dir);
         if (plugin_soname == NULL)
@@ -194,7 +189,7 @@ int main (int argc, char **argv)
     const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
     if (env_val)
         plugin_path = env_val;
-#endif
+#   endif
     gchar* filename = g_module_build_path (plugin_path, plugin_name);
 
     _daemon = gsignond_plugin_daemon_new (filename, plugin_name, in_fd,