From: Myungjae Lee <mjae.lee@samsung.com>
Date: Thu, 18 Nov 2010 12:40:27 +0000 (+0900)
Subject: [elm main] bug fix - wrong order in calling elm module and loading env. variables... 
X-Git-Tag: 1.0.0+svn.51480slp2+build63~7^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebf1dcdc8e086596090ad920038898591e34e4ab;p=framework%2Fuifw%2Felementary.git

[elm main] bug fix - wrong order in calling elm module and loading env. variables after merging quicklaunch feature
---

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 385ee3b..9b0ad1c 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -374,10 +374,15 @@ static void
 _config_apply(void)
 {
    _elm_theme_parse(NULL, _elm_config->theme);
-   if (_elm_config->modules) _elm_module_parse(_elm_config->modules);
    ecore_animator_frametime_set(1.0 / _elm_config->fps);
+}
+
+static void
+_config_sub_apply(void)
+{
    edje_frametime_set(1.0 / _elm_config->fps);
    edje_scale_set(_elm_config->scale);
+   if (_elm_config->modules) _elm_module_parse(_elm_config->modules);
    edje_input_panel_enabled_set(_elm_config->input_panel_enable);
    edje_autocapitalization_allow_set(_elm_config->autocapital_allow);
    edje_autoperiod_allow_set(_elm_config->autoperiod_allow);
@@ -718,7 +723,7 @@ _elm_config_sub_init(void)
 		    {
 		       _elm_config->scale = (double)val / 1000.0;
 		       // FIXME: hack until e export finger size too
-		       if (getenv("ELM_FINGER_SIZE"))
+		       if (!getenv("ELM_FINGER_SIZE"))
 			 _elm_config->finger_size = 40.0 * _elm_config->scale;
                        edje_scale_set(_elm_config->scale);
 		    }
@@ -809,6 +814,7 @@ _elm_config_sub_init(void)
           }
 #endif
       }
+   _config_sub_apply();
 }
 
 void
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index a46db87..81fec58 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -586,6 +586,7 @@ elm_quicklaunch_sub_init(int argc, char **argv)
         ecore_app_args_set(argc, (const char **)argv);  
         evas_init();  
         edje_init();  
+        _elm_module_init();  
         _elm_config_sub_init();  
         if ((_elm_config->engine == ELM_SOFTWARE_X11) ||  
             (_elm_config->engine == ELM_SOFTWARE_16_X11) ||  
@@ -598,7 +599,7 @@ elm_quicklaunch_sub_init(int argc, char **argv)
           }  
         ecore_evas_init(); // FIXME: check errors  
         ecore_imf_init();  
-        _elm_module_init();  
+
      } 	  
    return _elm_sub_init_count;      
 }