From 4752753fafe02bb96d42ddac11f928a3e2400a7c Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon, 7 Oct 2013 23:40:25 +0100
Subject: Fixes after code review

[endlessm/eos-sdk#326]
---
 endless/eosinit.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'endless/eosinit.c')

diff --git a/endless/eosinit.c b/endless/eosinit.c
index 057e391..f285da7 100644
--- a/endless/eosinit.c
+++ b/endless/eosinit.c
@@ -21,8 +21,6 @@ should also work on Clang. */
 
 static gboolean _eos_initialized = FALSE;
 
-static char *eos_system_personality;
-
 /*
  * _eos_init:
  *
@@ -67,17 +65,23 @@ eos_is_inited (void)
  *   with the name of the personality. You should never free or modify
  *   the returned string.
  */
-const char *
+const gchar *
 eos_get_system_personality (void)
 {
-  static char *personality;
+  static gchar *personality;
 
   if (g_once_init_enter (&personality))
     {
-      char *tmp;
+      gchar *tmp;
 
       tmp = g_strdup (g_getenv ("ENDLESS_OS_PERSONALITY"));
-      if (tmp == NULL || *tmp == '\0')
+      if (tmp == '\0')
+        {
+          g_free (tmp);
+          tmp = NULL;
+        }
+
+      if (tmp == NULL)
         {
           char *path = g_build_filename (DATADIR,
                                          "EndlessOS",
-- 
cgit v1.2.3