Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_int_config_wallpaper_import.c e_int_config_theme_import.c 


Log Message:
Use the new edje_file_group_exists function, rather than evas_objects.
Thanks rephorm :)


===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_int_config_wallpaper_import.c     2 Sep 2006 04:43:55 -0000       1.21
+++ e_int_config_wallpaper_import.c     2 Sep 2006 05:15:01 -0000       1.22
@@ -525,16 +525,12 @@
             snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s", 
                      homedir, file);
             E_FREE(homedir);
-
-            Evas_Object *o;
             
-            o = edje_object_add(e_win_evas_get(import->win));
-            is_bg = (edje_object_file_set(o, import->cfdata->file, 
-                                          "e/desktop/background"));
+            is_bg = edje_file_group_exists(import->cfdata->file, 
+                                           "e/desktop/background");
             is_theme = 
-              (edje_object_file_set(o, import->cfdata->file, 
-                                    "e/widgets/border/default/border"));
-            evas_object_del(o);
+              edje_file_group_exists(import->cfdata->file, 
+                                     "e/widgets/border/default/border");
             
             if ((is_bg) && (!is_theme)) 
               {
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_theme_import.c 2 Sep 2006 04:43:55 -0000       1.4
+++ e_int_config_theme_import.c 2 Sep 2006 05:15:01 -0000       1.5
@@ -236,7 +236,6 @@
 {
    Import *import;
    E_Win *win;
-   Evas_Object *o;
    const char *path;
    const char *file;
    char *homedir;
@@ -266,12 +265,8 @@
        if (!e_util_glob_case_match(file, "*.edj")) 
          return;
 
-       o = edje_object_add(e_win_evas_get(win));
-       is_theme = (edje_object_file_set(o, import->cfdata->file,
-                                        "e/widgets/border/default/border"));
-       evas_object_del(o);
-
-       if (!is_theme)
+       if (!edje_file_group_exists(import->cfdata->file, 
+                                   "e/widgets/border/default/border"))
          {
             e_util_dialog_show(_("Theme Import Error"),
                                _("Enlightenment was unable to import "



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to