E SVN: barbieri IN trunk/terminology: . src/bin

[Enlightenment S. <no-...@en...>]

Log:
hard dep on efreet.
  

Author:       barbieri
Date:         2012-10-09 13:20:28 -0700 (Tue, 09 Oct 2012)
New Revision: 77684
Trac:         http://trac.enlightenment.org/e/changeset/77684

Modified:
  trunk/terminology/configure.ac trunk/terminology/src/bin/config.c 

Modified: trunk/terminology/configure.ac
===================================================================
--- trunk/terminology/configure.ac	2012-10-09 20:16:29 UTC (rev 77683)
+++ trunk/terminology/configure.ac	2012-10-09 20:20:28 UTC (rev 77684)
@@ -29,6 +29,7 @@
    ecore-input >= 1.7.0 \
    ecore-imf >= 1.7.0 \
    ecore-imf-evas >= 1.7.0 \
+   efreet >= 1.7.0
    "
 
 PKG_CHECK_MODULES([TERMINOLOGY], [${requirements}])

Modified: trunk/terminology/src/bin/config.c
===================================================================
--- trunk/terminology/src/bin/config.c	2012-10-09 20:16:29 UTC (rev 77683)
+++ trunk/terminology/src/bin/config.c	2012-10-09 20:20:28 UTC (rev 77684)
@@ -1,6 +1,7 @@
 #include "private.h"
 
 #include <Elementary.h>
+#include <Efreet.h>
 #include "config.h"
 
 #define CONF_VER 1
@@ -12,27 +13,7 @@
 static const char *
 _config_home_get(void)
 {
-#ifdef ELM_EFREET
    return efreet_config_home_get();
-#else
-   static char path[PATH_MAX] = "";
-   const char *v = getenv("XDG_CONFIG_HOME");
-   if (v) eina_strlcpy(path, v, sizeof(path));
-   else
-     {
-        char homepath[PATH_MAX];
-        if (homedir_get(homepath, sizeof(homepath)))
-          snprintf(path, sizeof(path), "%s/.config", homepath);
-        else
-          {
-             if (!v) v = getenv("XDG_RUNTIME_DIR");
-             if (!v) v = getenv("TMPDIR");
-             if (!v) v = "/tmp";
-             eina_strlcpy(path, v, sizeof(path));
-          }
-     }
-   return path;
-#endif
 }
 
 void
@@ -41,6 +22,7 @@
    Eet_Data_Descriptor_Class eddc;
 
    elm_need_efreet();
+   efreet_init();
    
    eet_eina_stream_data_descriptor_class_set
      (&eddc, sizeof(eddc), "Config", sizeof(Config));
@@ -106,6 +88,8 @@
         eet_data_descriptor_free(edd_base);
         edd_base = NULL;
      }
+
+   efreet_shutdown();
 }
 
 void