for now dont check valid exe BUt use the call

SVN revision: 17021
This commit is contained in:
Carsten Haitzler 2005-09-28 03:44:31 +00:00
parent 8c3e7eba9c
commit 61327b1932
3 changed files with 36 additions and 26 deletions

View File

@ -1021,7 +1021,8 @@ int
e_app_valid_exe_get(E_App *a)
{
if (!a->exe) return 0;
if (!ecore_file_app_installed(a->exe)) return 0;
// if (!ecore_file_app_installed(a->exe)) return 0;
return 1;
}

View File

@ -408,22 +408,25 @@ _e_int_menus_apps_scan(E_Menu *m)
{
a = l->data;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, a->name);
if (a->exe)
if (e_app_valid_exe_get(a))
{
e_menu_item_icon_edje_set(mi, a->path, "icon");
e_menu_item_callback_set(mi, _e_int_menus_apps_run, a);
app_count++;
}
else
{
char buf[4096];
snprintf(buf, sizeof(buf), "%s/.directory.eap", a->path);
e_menu_item_icon_edje_set(mi, buf, "icon");
e_menu_item_submenu_set(mi, e_int_menus_apps_new(a->path));
app_count++;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, a->name);
if (a->exe)
{
e_menu_item_icon_edje_set(mi, a->path, "icon");
e_menu_item_callback_set(mi, _e_int_menus_apps_run, a);
app_count++;
}
else
{
char buf[4096];
snprintf(buf, sizeof(buf), "%s/.directory.eap", a->path);
e_menu_item_icon_edje_set(mi, buf, "icon");
e_menu_item_submenu_set(mi, e_int_menus_apps_new(a->path));
app_count++;
}
}
}
}

View File

@ -335,18 +335,21 @@ _ibar_app_change(void *data, E_App *a, E_App_Change ch)
{
IBar_Icon *ic;
ic = _ibar_icon_new(ibb, a);
if (ic)
if (e_app_valid_exe_get(a))
{
for (ll = ib->apps->subapps; ll; ll = ll->next)
ic = _ibar_icon_new(ibb, a);
if (ic)
{
E_App *a2;
a2 = ll->data;
ic = _ibar_icon_find(ibb, a2);
if (ic) _ibar_icon_reorder_after(ic, NULL);
for (ll = ib->apps->subapps; ll; ll = ll->next)
{
E_App *a2;
a2 = ll->data;
ic = _ibar_icon_find(ibb, a2);
if (ic) _ibar_icon_reorder_after(ic, NULL);
}
_ibar_bar_frame_resize(ibb);
}
_ibar_bar_frame_resize(ibb);
}
}
break;
@ -517,7 +520,10 @@ _ibar_bar_new(IBar *ib, E_Container *con)
IBar_Icon *ic;
a = l->data;
ic = _ibar_icon_new(ibb, a);
if (e_app_valid_exe_get(a))
{
ic = _ibar_icon_new(ibb, a);
}
}
}
ibb->align_req = 0.5;