Enlightenment CVS committal

Author  : onefang
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_apps.c e_border.c e_fm.c 


Log Message:
Tweak the E_App object reference counting.  I think this is correct, but
I suspect the dir scanning in e_apps.c still needs an unref.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -3 -r1.189 -r1.190
--- e_apps.c    16 Sep 2006 22:48:01 -0000      1.189
+++ e_apps.c    17 Sep 2006 00:13:52 -0000      1.190
@@ -220,7 +220,7 @@
         {
            if(st.st_mtime > a->mtime)
            {
-              e_object_del(E_OBJECT(a));
+              e_object_free(E_OBJECT(a));
               a = NULL;
               stated = 1;
            }
@@ -278,6 +278,9 @@
        _e_apps_list = evas_list_prepend(_e_apps_list, a);
 #endif
      }
+   else
+      e_object_ref(E_OBJECT(a));
+
    return a;
 
 error:
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -3 -r1.543 -r1.544
--- e_border.c  16 Sep 2006 05:38:09 -0000      1.543
+++ e_border.c  17 Sep 2006 00:13:52 -0000      1.544
@@ -2552,7 +2552,7 @@
                  if (o)   evas_object_del(o);
                  o = e_app_icon_add(evas, a);
                  bd->app = a;
-                 e_object_ref(E_OBJECT(bd->app));
+//               e_object_ref(E_OBJECT(bd->app));
               }
             else
               {
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- e_fm.c      16 Sep 2006 13:07:55 -0000      1.61
+++ e_fm.c      17 Sep 2006 00:13:52 -0000      1.62
@@ -1611,7 +1611,10 @@
                   app = e_app_new(buf, 0);
                  if (app)
                    {
-                      ic->obj_icon = 
e_app_icon_add(evas_object_evas_get(ic->sd->obj), app);
+/* FIXME: Actually, I think it's the icon searching that is slowing things 
down a lot.
+ * That will be fixed by moving it to thumbnailing as planned.  Commented out 
for now.
+ */
+//                    ic->obj_icon = 
e_app_icon_add(evas_object_evas_get(ic->sd->obj), app);
                       e_object_unref(E_OBJECT(app));
                    }
               }
@@ -1698,7 +1701,10 @@
                   app = e_app_new(buf, 0);
                  if (app)
                    {
-                      ic->obj_icon = 
e_app_icon_add(evas_object_evas_get(ic->sd->obj), app);
+/* FIXME: Actually, I think it's the icon searching that is slowing things 
down a lot.
+ * That will be fixed by moving it to thumbnailing as planned.  Commented out 
for now.
+ */
+//                    ic->obj_icon = 
e_app_icon_add(evas_object_evas_get(ic->sd->obj), app);
                       e_object_unref(E_OBJECT(app));
                    }
                  edje_object_part_swallow(ic->obj, "e.swallow.icon", 
ic->obj_icon);



-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to