Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h e_int_menus.c e_winlist.c
Log Message:
Code outside of e_border shouldn't care if we use icccm or netwm name.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -3 -r1.373 -r1.374
--- e_border.c 30 Aug 2005 01:15:25 -0000 1.373
+++ e_border.c 30 Aug 2005 01:42:56 -0000 1.374
@@ -2028,6 +2028,17 @@
return list;
}
+const char *
+e_border_name_get(E_Border *bd)
+{
+ if (bd->client.netwm.name)
+ return bd->client.netwm.name;
+ else if (bd->client.icccm.title)
+ return bd->client.icccm.title;
+ else
+ return "";
+}
+
/* local subsystem functions */
static void
_e_border_free(E_Border *bd)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- e_border.h 30 Aug 2005 01:15:25 -0000 1.103
+++ e_border.h 30 Aug 2005 01:42:56 -0000 1.104
@@ -535,6 +535,8 @@
EAPI void e_border_frame_recalc(E_Border *bd);
EAPI Evas_List *e_border_immortal_windows_get(void);
+const char *e_border_name_get(E_Border *bd);
+
extern EAPI int E_EVENT_BORDER_RESIZE;
extern EAPI int E_EVENT_BORDER_MOVE;
extern EAPI int E_EVENT_BORDER_ADD;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- e_int_menus.c 25 Aug 2005 17:14:00 -0000 1.87
+++ e_int_menus.c 30 Aug 2005 01:42:56 -0000 1.88
@@ -640,16 +640,13 @@
{
E_Border *bd = l->data;
E_App *a;
- char *title = "";
+ const char *title;
- if (bd->client.netwm.name) title = bd->client.netwm.name;
- else title = bd->client.icccm.title;
+ title = e_border_name_get(bd);
mi = e_menu_item_new(m);
e_menu_item_check_set(mi, 1);
- if (bd->client.netwm.name)
- e_menu_item_label_set(mi, bd->client.netwm.name);
- else if (bd->client.icccm.title)
- e_menu_item_label_set(mi, bd->client.icccm.title);
+ if ((title) && (title[0]))
+ e_menu_item_label_set(mi, title);
else
e_menu_item_label_set(mi, _("No name!!"));
/* ref the border as we implicitly unref it in the callback */
@@ -910,15 +907,12 @@
{
E_Border *bd = l->data;
E_App *a;
- char *title = "";
+ const char *title = "";
- if (bd->client.netwm.name) title = bd->client.netwm.name;
- else title = bd->client.icccm.title;
+ title = e_border_name_get(bd);
mi = e_menu_item_new(m);
- if (bd->client.netwm.name)
- e_menu_item_label_set(mi, bd->client.netwm.name);
- else if (bd->client.icccm.title)
- e_menu_item_label_set(mi, bd->client.icccm.title);
+ if ((title) && (title[0]))
+ e_menu_item_label_set(mi, title);
else
e_menu_item_label_set(mi, _("No name!!"));
/* ref the border as we implicitly unref it in the callback */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_winlist.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_winlist.c 22 Aug 2005 03:22:46 -0000 1.30
+++ e_winlist.c 30 Aug 2005 01:42:56 -0000 1.31
@@ -414,10 +414,7 @@
ww->bg_object = o;
e_theme_edje_object_set(o, "base/theme/winlist",
"widgets/winlist/item");
- if (bd->client.netwm.name)
- edje_object_part_text_set(o, "title_text", bd->client.netwm.name);
- else if (bd->client.icccm.title)
- edje_object_part_text_set(o, "title_text", bd->client.icccm.title);
+ edje_object_part_text_set(o, "title_text",
e_border_name_get(ww->border));
evas_object_show(o);
if (edje_object_part_exists(ww->bg_object, "icon_swallow"))
{
@@ -561,10 +558,7 @@
if (!ww->border->lock_focus_out)
e_border_focus_set(ww->border, 1, 1);
}
- if (ww->border->client.netwm.name)
- edje_object_part_text_set(bg_object, "title_text",
ww->border->client.netwm.name);
- else if (ww->border->client.icccm.title)
- edje_object_part_text_set(bg_object, "title_text",
ww->border->client.icccm.title);
+ edje_object_part_text_set(bg_object, "title_text",
e_border_name_get(ww->border));
if (icon_object)
{
evas_object_del(icon_object);
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
