diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index d77d60338..17719bd5d 100644
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -415,6 +415,13 @@ e_app_is_parent(E_App *parent, E_App *app)
    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
 e_app_subdir_scan(E_App *a, int scan_subdirs)
 {
diff --git a/src/bin/e_apps.h b/src/bin/e_apps.h
index f9eee0b81..22976824a 100644
--- a/src/bin/e_apps.h
+++ b/src/bin/e_apps.h
@@ -77,6 +77,7 @@ EAPI int    e_app_shutdown(void);
 
 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_equals(E_App *app1, E_App *app2);
 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_starting_get(E_App *a);
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 151217730..c274f6991 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -406,8 +406,6 @@ _ibar_app_change(void *data, E_App *a, E_App_Change ch)
 		  ic = _ibar_icon_find(ibb, a);
 		  if (ic)
 		    {
-		       Evas_List *l;
-		       
 		       if (a->startup_notify)
 			 {
 			    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);
 		       if (ic)
 			 {
-			    Evas_List *l;
-			    
 			    edje_object_signal_emit(ic->icon_object, "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", "");
@@ -795,8 +791,7 @@ _ibar_icon_find(IBar_Bar *ibb, E_App *a)
 	IBar_Icon *ic;
 
 	ic = l->data;
-	if ((ic->app == a) || (ic->app->orig == a) ||
-	    (ic->app == a->orig) || (ic->app->orig == a->orig)) 
+	if (e_app_equals(ic->app, a))
 	  return ic;
      }
    return NULL;