Enlightenment CVS committal
Author : ravenlock
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
ecore_evas_x.c
Log Message:
On occasion we see ee->prop.title == NULL. This will safeguard.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- ecore_evas_x.c 19 Jun 2008 21:03:17 -0000 1.122
+++ ecore_evas_x.c 21 Jun 2008 02:44:38 -0000 1.123
@@ -1931,8 +1931,11 @@
ecore_x_mwm_borderless_set(ee->engine.x.win, ee->prop.borderless);
if (ee->visible) ecore_x_window_show(ee->engine.x.win);
if (ee->prop.focused) ecore_x_window_focus(ee->engine.x.win);
- ecore_x_icccm_title_set(ee->engine.x.win, ee->prop.title);
- ecore_x_netwm_name_set(ee->engine.x.win, ee->prop.title);
+ if (ee->prop.title)
+ {
+ ecore_x_icccm_title_set(ee->engine.x.win, ee->prop.title);
+ ecore_x_netwm_name_set(ee->engine.x.win, ee->prop.title);
+ }
#endif /* BUILD_ECORE_EVAS_X11 */
}
else if (!strcmp(ee->driver, "xrender_x11"))
@@ -1999,9 +2002,12 @@
if (ee->prop.borderless)
ecore_x_mwm_borderless_set(ee->engine.x.win, ee->prop.borderless);
if (ee->visible) ecore_x_window_show(ee->engine.x.win);
- if (ee->prop.focused) ecore_x_window_focus(ee->engine.x.win);
- ecore_x_icccm_title_set(ee->engine.x.win, ee->prop.title);
- ecore_x_netwm_name_set(ee->engine.x.win, ee->prop.title);
+ if (ee->prop.focused) ecore_x_window_focus(ee->engine.x.win);
+ if (ee->prop.title)
+ {
+ ecore_x_icccm_title_set(ee->engine.x.win, ee->prop.title);
+ ecore_x_netwm_name_set(ee->engine.x.win, ee->prop.title);
+ }
#endif
}
else if (!strcmp(ee->driver, "software_16_x11"))
@@ -2055,8 +2061,11 @@
ecore_x_mwm_borderless_set(ee->engine.x.win, ee->prop.borderless);
if (ee->visible) ecore_x_window_show(ee->engine.x.win);
if (ee->prop.focused) ecore_x_window_focus(ee->engine.x.win);
- ecore_x_icccm_title_set(ee->engine.x.win, ee->prop.title);
- ecore_x_netwm_name_set(ee->engine.x.win, ee->prop.title);
+ if (ee->prop.title)
+ {
+ ecore_x_icccm_title_set(ee->engine.x.win, ee->prop.title);
+ ecore_x_netwm_name_set(ee->engine.x.win, ee->prop.title);
+ }
#endif /* BUILD_ECORE_EVAS_X11_16 */
}
}
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
