Fix this the right way. Better trapping

SVN revision: 19423

diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 7c82799..6c364c0 100644 (file)
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -165,18 +165,21 @@ int
 e_modapi_config(E_Module *m)
 {
    IBar *ib;
-   E_Container *con;
    Evas_List *l;
    
    ib = m->data;
-   con = e_container_current_get(e_manager_current_get());
+   if (!ib) return 0;
    for (l = ib->bars; l; l = l->next) 
      {
        IBar_Bar *ibb;
        
        ibb = l->data;
-       if (ibb->con == con) _config_ibar_module(con, ib);
-       break;
+       if (!ibb) return 0;
+       if (ibb->con == e_container_current_get(e_manager_current_get())) 
+         { 
+            _config_ibar_module(ibb->con, ib);
+            break;
+         }     
      }
    return 1;
 }

diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index 256c725..9ac1914 100644 (file)
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -160,8 +160,11 @@ e_modapi_config(E_Module *m)
        IBox_Box *face;
        face = l->data;
        if (!face) return 0;
-       if (face->con == e_container_current_get(e_manager_current_get()))
-         _config_ibox_module(face->con, face->ibox);   
+       if (face->con == e_container_current_get(e_manager_current_get())) 
+         {
+            _config_ibox_module(face->con, face->ibox);
+            break;
+         }     
      }
    return 1;
 }