Fixes TC-1616 - (null) directory generated

Need to call efreet_init() before using efreet_config_home_get()
or it will not get initialized and return null string.  Should
also call efreet_shutdown() at the end.

Change-Id: I21f3eb6fbd893aadf2d4a7bbee1d7b47f1504f0f
Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/dialer/history.c b/dialer/history.c
index 0224265..b1b163c 100644 (file)
--- a/dialer/history.c
+++ b/dialer/history.c
@@ -833,6 +833,7 @@ Evas_Object *history_add(Evas_Object *parent)
        Evas_Object *obj, *genlist_all, *genlist_missed;
 
        eet_init();
+       efreet_init();
        ecore_file_init();
        history = calloc(1, sizeof(History));
        EINA_SAFETY_ON_NULL_RETURN_VAL(history, NULL);
@@ -941,6 +942,7 @@ err_object_new:
 err_layout:
        free(history);
        ecore_file_shutdown();
+       efreet_shutdown();
        eet_shutdown();
        return NULL;
 }

diff --git a/messages/overview.c b/messages/overview.c
index b27a31a..6cd0d8c 100644 (file)
--- a/messages/overview.c
+++ b/messages/overview.c
@@ -1025,6 +1025,7 @@ Evas_Object *overview_add(Evas_Object *parent)
        Elm_Genlist_Item_Class *itc;
 
        eet_init();
+       efreet_init();
        ecore_file_init();
 
        ov = calloc(1, sizeof(Overview));
@@ -1137,6 +1138,7 @@ err_obj:
 err_conversations:
        free(ov);
        ecore_file_shutdown();
+       efreet_shutdown();
        eet_shutdown();
        return NULL;
 }

diff --git a/packaging/lemolo.changes b/packaging/lemolo.changes
index 38638a9..4cc994d 100644 (file)
--- a/packaging/lemolo.changes
+++ b/packaging/lemolo.changes
@@ -1,4 +1,7 @@
-* Thu Aug 07 2014 Jimmy Huang <jimmy.huang@intel.com>
+* Tue Sep 30 2014 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/ivi/20140808.112439-1-g6fc6220
+- Fixes TC-1616 - (null) directory generated
+
+* Thu Aug 07 2014 Jimmy Huang <jimmy.huang@intel.com> None
 - Version bump to 0.1.7
 - Porting Lemolo to use new Eldbus library
 

diff --git a/utils/contacts.c b/utils/contacts.c
index cf1e6e1..3387435 100644 (file)
--- a/utils/contacts.c
+++ b/utils/contacts.c
@@ -877,6 +877,7 @@ Evas_Object *contacts_add(Evas_Object *parent)
        Elm_Genlist_Item_Class *itc, *group;
 
        eet_init();
+       efreet_init();
        contacts = calloc(1, sizeof(Contacts));
        EINA_SAFETY_ON_NULL_RETURN_VAL(contacts, NULL);
 
@@ -964,6 +965,7 @@ err_obj:
        free(details);
 err_layout:
        free(contacts);
+       efreet_shutdown();
        eet_shutdown();
        return NULL;
 }

diff --git a/utils/util.c b/utils/util.c
index de91e6e..cf51937 100644 (file)
--- a/utils/util.c
+++ b/utils/util.c
@@ -245,6 +245,7 @@ Eina_Bool util_init(const char *theme)
        char base_dir[PATH_MAX];
 
        eet_init();
+       efreet_init();
        config_path = efreet_config_home_get();
        snprintf(base_dir, sizeof(base_dir), "%s/%s", config_path, PACKAGE_NAME);
        ecore_file_mkpath(base_dir);
@@ -287,5 +288,6 @@ void util_shutdown(void)
                free(_last_user_mode_config_path);
        if (_last_user_mode_descriptor)
                eet_data_descriptor_free(_last_user_mode_descriptor);
+       efreet_shutdown();
        eet_shutdown();
 }