Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar
Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Fix icon_find function to return the proper icon. This fixes the wrong icons flashing when mount/unmount. =================================================================== RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_main.c 6 Apr 2006 20:14:26 -0000 1.14 +++ e_mod_main.c 6 Apr 2006 20:35:24 -0000 1.15 @@ -487,8 +487,8 @@ edje_object_signal_emit(ll->data, "start", ""); edje_object_signal_emit(ic->bg_object, "start", ""); edje_object_signal_emit(ic->overlay_object, "start", ""); - if (ic->mbb->overlay_object) - edje_object_signal_emit(ic->mbb->overlay_object, "start", ""); + if (mbb->overlay_object) + edje_object_signal_emit(mbb->overlay_object, "start", ""); } else { @@ -497,8 +497,8 @@ edje_object_signal_emit(ll->data, "exec", ""); edje_object_signal_emit(ic->bg_object, "exec", ""); edje_object_signal_emit(ic->overlay_object, "exec", ""); - if (ic->mbb->overlay_object) - edje_object_signal_emit(ic->mbb->overlay_object, "exec", ""); + if (mbb->overlay_object) + edje_object_signal_emit(mbb->overlay_object, "exec", ""); } } } @@ -520,8 +520,8 @@ edje_object_signal_emit(ll->data, "stop", ""); edje_object_signal_emit(ic->bg_object, "stop", ""); edje_object_signal_emit(ic->overlay_object, "stop", ""); - if (ic->mbb->overlay_object) - edje_object_signal_emit(ic->mbb->overlay_object, "stop", ""); + if (mbb->overlay_object) + edje_object_signal_emit(mbb->overlay_object, "stop", ""); } } } @@ -888,7 +888,8 @@ MBar_Icon *ic; ic = l->data; - if (e_app_equals(ic->app, a)) + if (!strcmp(ic->app->generic, a->generic)) + //if (e_app_equals(ic->app, a)) return ic; } return NULL; @@ -1917,7 +1918,7 @@ edje_object_signal_emit(ic->overlay_object, "start", ""); if (ic->mbb->overlay_object) edje_object_signal_emit(ic->mbb->overlay_object, "start", ""); - + snprintf(buf, sizeof(buf), MOUNT " %s", ic->app->generic); x = ecore_exe_run(buf, ic); if (x) @@ -1938,7 +1939,7 @@ edje_object_signal_emit(ic->overlay_object, "start", ""); if (ic->mbb->overlay_object) edje_object_signal_emit(ic->mbb->overlay_object, "start", ""); - + snprintf(buf, sizeof(buf), UMOUNT " %s", ic->app->generic); x = ecore_exe_run(buf, ic); if (x) @@ -2027,7 +2028,7 @@ edje_object_signal_emit(ic->overlay_object, "stop", ""); if (ic->mbb->overlay_object) edje_object_signal_emit(ic->mbb->overlay_object, "stop", ""); - + return 0; } ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs