Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c hints.c menus.c pager.c
Log Message:
Fix applying matches to internal client windows in certain situations.
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -3 -r1.173 -r1.174
--- dialog.c 14 Sep 2006 21:20:35 -0000 1.173
+++ dialog.c 8 Oct 2006 13:01:42 -0000 1.174
@@ -312,6 +312,7 @@
if (d->title)
Efree(d->title);
d->title = Estrdup(title);
+ HintsSetWindowName(d->win, d->title);
}
void
@@ -543,12 +544,6 @@
void
DialogArrange(Dialog * d, int resize)
{
- if (d->title)
- {
- HintsSetWindowName(d->win, d->title);
- HintsSetWindowClass(d->win, d->name, "Enlightenment_Dialog");
- }
-
if (d->item)
DialogItemsRealize(d);
@@ -582,6 +577,8 @@
EwinShow(ewin);
return;
}
+
+ HintsSetWindowClass(d->win, d->name, "Enlightenment_Dialog");
ewin = AddInternalToFamily(d->win, "DIALOG", EWIN_TYPE_DIALOG, d,
DialogEwinInit);
===================================================================
RCS file: /cvs/e/e16/e/src/hints.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- hints.c 3 Oct 2006 20:13:45 -0000 1.70
+++ hints.c 8 Oct 2006 13:01:42 -0000 1.71
@@ -157,6 +157,9 @@
void
HintsSetWindowName(Win win, const char *name)
{
+ if (!name)
+ name = "NoTitle";
+
ecore_x_icccm_title_set(WinGetXwin(win), name);
EWMH_SetWindowName(WinGetXwin(win), name);
@@ -166,6 +169,11 @@
HintsSetWindowClass(Win win, const char *name, const char *clss)
{
XClassHint *xch;
+
+ if (!name)
+ name = "NoName";
+ if (!clss)
+ clss = "NoClass";
xch = XAllocClassHint();
xch->res_name = (char *)name;
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -3 -r1.259 -r1.260
--- menus.c 31 Aug 2006 21:33:02 -0000 1.259
+++ menus.c 8 Oct 2006 13:01:42 -0000 1.260
@@ -652,6 +652,7 @@
EventCallbackRegister(m->win, 0, MenuHandleEvents, m);
if (m->title)
HintsSetWindowName(m->win, _(m->title));
+ HintsSetWindowClass(m->win, m->name, "Enlightenment_Menu");
}
maxh = maxw = 0;
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -3 -r1.229 -r1.230
--- pager.c 24 Sep 2006 21:01:56 -0000 1.229
+++ pager.c 8 Oct 2006 13:01:42 -0000 1.230
@@ -727,6 +727,8 @@
return;
}
+ Esnprintf(s, sizeof(s), "Pager-%i", p->dsk->num);
+ HintsSetWindowName(p->win, s);
Esnprintf(s, sizeof(s), "%i", p->dsk->num);
HintsSetWindowClass(p->win, s, "Enlightenment_Pager");
@@ -1218,15 +1220,12 @@
NewPagerForDesktop(Desk * dsk)
{
Pager *p;
- char s[128];
p = PagerCreate();
if (!p)
return;
p->dsk = dsk;
- Esnprintf(s, sizeof(s), "Pager-%i", dsk->num);
- HintsSetWindowName(p->win, s);
PagerShow(p);
}
@@ -2015,6 +2014,8 @@
break;
case ESIGNAL_DESK_ADDED:
+ if (Mode.wm.startup)
+ break;
NewPagerForDesktop(prm);
break;
case ESIGNAL_DESK_REMOVED:
-------------------------------------------------------------------------
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
