Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.h e_border.c
Log Message:
Track the border icon eap.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- e_border.h 25 Sep 2005 16:43:34 -0000 1.116
+++ e_border.h 28 Sep 2005 03:06:58 -0000 1.117
@@ -394,6 +394,8 @@
E_Border *parent;
Evas_List *transients;
+
+ E_App *app;
};
struct _E_Border_Pending_Move_Resize
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -3 -r1.427 -r1.428
--- e_border.c 27 Sep 2005 16:36:14 -0000 1.427
+++ e_border.c 28 Sep 2005 03:06:58 -0000 1.428
@@ -2102,6 +2102,7 @@
if (!e_util_edje_icon_list_set(o, a->icon_class))
{
edje_object_file_set(o, a->path, "icon");
+ bd->app = a;
}
}
else if (bd->client.netwm.icons)
@@ -6158,7 +6159,6 @@
{
E_Menu *m;
E_Menu_Item *mi;
- E_App *a;
if (bd->border_menu) return;
@@ -6472,16 +6472,12 @@
else title = bd->client.icccm.title;
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
- a = e_app_window_name_class_title_role_find(bd->client.icccm.name,
- bd->client.icccm.class,
- title,
-
bd->client.icccm.window_role);
- if (a)
+ if (bd->app)
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Edit Icon"));
- e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, a->path);
- e_menu_item_icon_edje_set(mi, a->path, "icon");
+ e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd->app);
+ e_menu_item_icon_edje_set(mi, bd->app->path, "icon");
}
else if (bd->client.icccm.class) /* icons with no class useless to
borders */
{
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
