Enlightenment CVS committal

Author  : handyande
Project : misc
Module  : engage

Dir     : misc/engage/src/module


Modified Files:
        e_mod_main.c 


Log Message:
Fixes
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_mod_main.c        6 Apr 2005 09:30:27 -0000       1.37
+++ e_mod_main.c        10 Apr 2005 15:15:22 -0000      1.38
@@ -403,9 +403,9 @@
                  evas_image_cache_flush(eb->evas);
                  evas_image_cache_reload(eb->evas);
                  ic = _engage_icon_new(eb, a);
-                 ic->extra_icons = extras;
                  if (ic)
                    {
+                      ic->extra_icons = extras;
                       for (ll = e->apps->subapps; ll; ll = ll->next)
                         {
                            E_App *a2;
@@ -1011,19 +1011,23 @@
    if (!ic)
      {
        ic = _engage_icon_new(eb, app);
-       ic->temp = 1;
-       _engage_bar_frame_resize(eb);
+       if (ic)
+         {
+            ic->temp = 1;
+            _engage_bar_frame_resize(eb);
+         }
      }
    if (ic)
      {
        ai = _engage_app_icon_new(ic, e->border, 0);
-       if (e->border->iconic)
+       if (ai && e->border->iconic)
          {
             ai->min = 1;
             edje_object_signal_emit(ai->overlay_object, "iconify", "");
             edje_object_signal_emit(ai->bg_object, "iconify", "");
          }                                    
      }
+   return 1;
 }
 
 static int
@@ -1066,6 +1070,7 @@
          }
        icons = icons->next;
      }
+   return 1;
 }
 
 static int
@@ -1091,11 +1096,14 @@
    if (!ic)
      {
        ic = _engage_icon_new(eb, app);
-       ic->temp = 1;
-       _engage_bar_frame_resize(eb);
+       if (ic)
+         {
+            ic->temp = 1;
+            _engage_bar_frame_resize(eb);
+         }
      }
    if (!ic)
-     return 0;
+     return 1;
 
    icons = ic->extra_icons;
    while (icons)
@@ -1110,8 +1118,7 @@
          }
        icons = icons->next;
      }
-   /* fallback, is this needed? */
-//   ai = _engage_app_icon_new(ic, e->border, 1);
+   return 1;
 }
 
 static int
@@ -1136,7 +1143,7 @@
      app = _engage_unmatched_app;
    ic = _engage_icon_find(eb, app);
    if (!ic)
-     return 0;
+     return 1;
 
    icons = ic->extra_icons;
    while (icons)
@@ -1151,8 +1158,7 @@
          }
        icons = icons->next;
      }
-   /* fallback, is this needed? */
-//   ai = _engage_app_icon_new(ic, e->border, 0);
+   return 1;
 }
 
 
@@ -2149,12 +2155,13 @@
    static char *ignores[] = { "Gkrellm2", "trayer", NULL};
    char       **cur;
    
+   if (ecore_x_window_prop_state_isset(bd->win,
+                                      ECORE_X_WINDOW_STATE_SKIP_TASKBAR))
+     return 1;
+   
    for (cur = ignores; *cur; cur++)
      if (bd->client.icccm.class && strcmp(bd->client.icccm.class, *cur) == 0)
        return 1;
    
-   if (ecore_x_window_prop_state_isset(bd->win,
-                                      ECORE_X_WINDOW_STATE_SKIP_TASKBAR))
-     return 1;
    return 0;
 }




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to