devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=a8d3df85a28de104597d909544ef1f19b3f06d91

commit a8d3df85a28de104597d909544ef1f19b3f06d91
Author: Chris Michael <cpmich...@osg.samsung.com>
Date:   Tue Jan 5 08:55:54 2016 -0500

    elementary: Fix elementary not compiling
    
    With the push of 1056b6ed01475817da2439012057d11865d2c5d8, elementary
    compile broke due to undeclared variables. This patch fixes elm to
    compile again by declaring the missing vars.
    
    @fix
    
    @raster, Please double check this change as I am unsure if it is what
    you Really intended here.
    
    Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
 src/lib/elm_config.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index c2a02a7..02091dd 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1898,8 +1898,9 @@ _elm_config_eet_close_error_get(Eet_File *ef,
 }
 
 static Eina_Bool
-_elm_config_profile_save(void)
+_elm_config_profile_save(const char *profile)
 {
+   Elm_Config_Derived *derived;
    char buf[4096], buf2[4096];
    int ok = 0, ret;
    const char *err;
@@ -1943,7 +1944,7 @@ _elm_config_profile_save(void)
    derived = _elm_config_derived_load(profile ? profile : _elm_profile);
    if (derived)
      {
-        _elm_config_derived_save(cfg, derived);
+        _elm_config_derived_save(_elm_config, derived);
         _elm_config_derived_free(derived);
      }
    return EINA_TRUE;
@@ -1956,7 +1957,6 @@ err:
 Eina_Bool
 _elm_config_save(Elm_Config *cfg, const char *profile)
 {
-   Elm_Config_Derived *derived;
    char buf[4096], buf2[4096];
    int ok = 0, ret;
    const char *err;
@@ -1990,7 +1990,7 @@ _elm_config_save(Elm_Config *cfg, const char *profile)
 
    if (!profile)
      {
-        if (!_elm_config_profile_save())
+        if (!_elm_config_profile_save(NULL))
           return EINA_FALSE;
      }
 
@@ -3608,7 +3608,7 @@ elm_config_all_flush(void)
         return;
      }
 
-   if (!_elm_config_profile_save())
+   if (!_elm_config_profile_save(NULL))
      {
         ERR("Failed to save profile");
         return;

-- 


Reply via email to