Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_apps_order.c
Log Message:
Early retreat if we don't get a menu.
Use util functions to add icons.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps_order.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_apps_order.c 6 Apr 2007 01:00:54 -0000 1.1
+++ e_int_config_apps_order.c 6 Apr 2007 09:38:10 -0000 1.2
@@ -173,13 +173,15 @@
Evas *evas;
Evas_Coord w;
Efreet_Menu *menu;
+
+ menu = efreet_menu_get();
+ if (!menu) return;
evas = evas_object_evas_get(cfdata->o_apps);
evas_event_freeze(evas);
edje_freeze();
e_widget_ilist_freeze(cfdata->o_apps);
-
- menu = efreet_menu_get();
+
if (menu->entries)
{
Efreet_Menu *entry;
@@ -198,19 +200,7 @@
Evas_Object *icon = NULL;
if (sub->type != EFREET_MENU_ENTRY_DESKTOP) continue;
- if (sub->icon)
- {
- const char *file;
-
- if (sub->icon[0] == '/') file = sub->icon;
- else
- file = efreet_icon_path_find(e_config->icon_theme,
- sub->icon, "24x24");
-
- icon = e_icon_add(evas);
- e_icon_file_set(icon, file);
- e_icon_fill_inside_set(icon, 1);
- }
+ icon = e_util_icon_theme_icon_add(sub->icon, "24x24", evas);
e_widget_ilist_append(cfdata->o_apps, icon, sub->name,
_apps_cb_selected, cfdata,
sub->desktop->orig_path);
@@ -224,8 +214,8 @@
e_widget_ilist_thaw(cfdata->o_apps);
edje_thaw();
evas_event_thaw(evas);
-
- if (menu) efreet_menu_free(menu);
+
+ efreet_menu_free(menu);
}
static void
@@ -244,21 +234,10 @@
{
Efreet_Desktop *desk;
Evas_Object *icon = NULL;
- const char *file;
-
+
desk = l->data;
if (!desk) continue;
- if (desk->icon)
- {
- if (desk->icon[0] == '/') file = desk->icon;
- else
- file = efreet_icon_path_find(e_config->icon_theme,
- desk->icon, "24x24");
-
- icon = e_icon_add(evas);
- e_icon_file_set(icon, file);
- e_icon_fill_inside_set(icon, 1);
- }
+ icon = e_util_desktop_icon_add(desk, "24x24", evas);
e_widget_ilist_append(cfdata->o_list, icon, desk->name,
_list_cb_selected, cfdata, desk->orig_path);
}
@@ -298,7 +277,6 @@
Efreet_Desktop *desk;
Evas *evas;
Evas_Coord w;
- const char *file;
cfdata = data;
once = data2;
@@ -313,17 +291,7 @@
desk = efreet_desktop_get(cfdata->app);
if (!desk) return;
- if (desk->icon)
- {
- if (desk->icon[0] == '/') file = desk->icon;
- else
- file = efreet_icon_path_find(e_config->icon_theme,
- desk->icon, "24x24");
-
- icon = e_icon_add(evas);
- e_icon_file_set(icon, file);
- e_icon_fill_inside_set(icon, 1);
- }
+ e_util_desktop_icon_add(desk, "24x24", evas);
e_widget_ilist_append(cfdata->o_list, icon, desk->name,
_list_cb_selected, cfdata, cfdata->app);
e_widget_ilist_go(cfdata->o_list);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
