From c543df064cd19ad557155ce45a8aed1dd5f4da44 Mon Sep 17 00:00:00 2001 From: Eric Schuele Date: Sat, 21 Jun 2008 02:44:38 +0000 Subject: [PATCH] On occasion we see ee->prop.title == NULL. This will safeguard. SVN revision: 34881 --- .../ecore/src/lib/ecore_evas/ecore_evas_x.c | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c index aaf282a9f4..2fd2e3e35e 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c @@ -1931,8 +1931,11 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha) 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 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha) 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_evas_x_alpha_set(Ecore_Evas *ee, int alpha) 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 */ } }