Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
eobj.c ewins.c tooltips.c
Log Message:
Always set name on EObj's (debug).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- eobj.c 4 Dec 2005 09:38:28 -0000 1.60
+++ eobj.c 5 Jan 2006 21:56:13 -0000 1.61
@@ -148,11 +148,17 @@
eo->y = y;
eo->w = w;
eo->h = h;
- if (name)
- {
- eo->name = Estrdup(name);
- HintsSetWindowName(eo->win, name);
- }
+
+ if (type == EOBJ_TYPE_EXT)
+ eo->name = ecore_x_icccm_title_get(win);
+ else if (name)
+ eo->name = Estrdup(name);
+ if (!eo->name)
+ eo->name = Estrdup("-?-");
+
+ if (type != EOBJ_TYPE_EWIN && type != EOBJ_TYPE_EXT)
+ HintsSetWindowName(eo->win, eo->name);
+
#if USE_COMPOSITE
eo->fade = 1;
eo->shadow = 1;
@@ -263,11 +269,10 @@
if (attr.class == InputOnly)
eo->inputonly = 1;
- EobjInit(eo, type, win, attr.x, attr.y, attr.width, attr.height, 0, NULL);
-
- eo->name = ecore_x_icccm_title_get(win);
eo->external = 1;
+ EobjInit(eo, type, win, attr.x, attr.y, attr.width, attr.height, 0, NULL);
+
#if 1 /* FIXME - TBD */
if (type == EOBJ_TYPE_EXT)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- ewins.c 22 Dec 2005 18:43:15 -0000 1.135
+++ ewins.c 5 Jan 2006 21:56:13 -0000 1.136
@@ -209,8 +209,8 @@
}
EoInit(ewin, EOBJ_TYPE_EWIN, frame, ewin->client.x, ewin->client.y,
- ewin->client.w, ewin->client.h, 1, NULL);
- EoSetName(ewin, Estrdup(ewin->icccm.wm_name));
+ ewin->client.w, ewin->client.h, 1, ewin->icccm.wm_name);
+
EobjListFocusAdd(&ewin->o, 1);
EobjListOrderAdd(&ewin->o);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- tooltips.c 27 Nov 2005 13:11:06 -0000 1.91
+++ tooltips.c 5 Jan 2006 21:56:13 -0000 1.92
@@ -97,13 +97,12 @@
wh = (i + 1) * 8;
- eo = EobjWindowCreate(EOBJ_TYPE_MISC, -50, -100, wh, wh, 1, NULL);
+ eo = EobjWindowCreate(EOBJ_TYPE_MISC, -50, -100, wh, wh, 1, name);
ImageclassIncRefcount(tt->iclass[i]);
EobjChangeOpacity(eo, OpacityExt(Conf_tooltips.opacity));
tt->win[i] = eo;
}
tt->iwin = ECreateWindow(tt->TTWIN->win, 0, 0, 1, 1, 0);
- tt->TTWIN->name = Estrdup(name);
tt->ref_count = 0;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
