NorwayFun
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add equals function for eapps 

SVN revision: 16954
This commit is contained in:
sebastid 2005-09-26 10:03:49 +00:00 committed by sebastid
parent 443a00308e
commit edfb84445a
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/e_apps.c
View File

@ -415,6 +415,13 @@ e_app_is_parent(E_App *parent, E_App *app)
return 0; return 0;
} }
int
e_app_equals(E_App *app1, E_App *app2)
{
return ((app1 == app2) || (app1->orig == app2) ||
(app1 == app2->orig) || (app1->orig == app2->orig));
}
void void
e_app_subdir_scan(E_App *a, int scan_subdirs) e_app_subdir_scan(E_App *a, int scan_subdirs)
{ {

1
src/bin/e_apps.h
View File

@ -77,6 +77,7 @@ EAPI int e_app_shutdown(void);
EAPI E_App *e_app_new(const char *path, int scan_subdirs); EAPI E_App *e_app_new(const char *path, int scan_subdirs);
EAPI int e_app_is_parent(E_App *parent, E_App *app); EAPI int e_app_is_parent(E_App *parent, E_App *app);
EAPI int e_app_equals(E_App *app1, E_App *app2);
EAPI void e_app_subdir_scan(E_App *a, int scan_subdirs); EAPI void e_app_subdir_scan(E_App *a, int scan_subdirs);
EAPI int e_app_exec(E_App *a, int launch_id); EAPI int e_app_exec(E_App *a, int launch_id);
EAPI int e_app_starting_get(E_App *a); EAPI int e_app_starting_get(E_App *a);

7
src/modules/ibar/e_mod_main.c
View File

@ -406,8 +406,6 @@ _ibar_app_change(void *data, E_App *a, E_App_Change ch)
ic = _ibar_icon_find(ibb, a); ic = _ibar_icon_find(ibb, a);
if (ic) if (ic)
{ {
Evas_List *l;
if (a->startup_notify) if (a->startup_notify)
{ {
edje_object_signal_emit(ic->icon_object, "start", ""); edje_object_signal_emit(ic->icon_object, "start", "");
@ -439,8 +437,6 @@ _ibar_app_change(void *data, E_App *a, E_App_Change ch)
ic = _ibar_icon_find(ibb, a); ic = _ibar_icon_find(ibb, a);
if (ic) if (ic)
{ {
Evas_List *l;
edje_object_signal_emit(ic->icon_object, "stop", ""); edje_object_signal_emit(ic->icon_object, "stop", "");
for (ll = ic->extra_icons; ll; ll = ll->next) edje_object_signal_emit(ll->data, "stop", ""); for (ll = ic->extra_icons; ll; ll = ll->next) edje_object_signal_emit(ll->data, "stop", "");
edje_object_signal_emit(ic->bg_object, "stop", ""); edje_object_signal_emit(ic->bg_object, "stop", "");
@ -795,8 +791,7 @@ _ibar_icon_find(IBar_Bar *ibb, E_App *a)
IBar_Icon *ic; IBar_Icon *ic;
ic = l->data; ic = l->data;
if ((ic->app == a) || (ic->app->orig == a) || if (e_app_equals(ic->app, a))
(ic->app == a->orig) || (ic->app->orig == a->orig))
return ic; return ic;
} }
return NULL; return NULL;