[maemo-commits] [maemo-commits] r18995 - in projects/haf/trunk/libmatchbox2: . matchbox/theme-engines

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-07-27 19:04:13 +0300 (Mon, 27 Jul 2009)
New Revision: 18995

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme.c
Log:
	Robustness improvement: warn if we can't read theme.xml and create
	a compositing theme as a fallback, so we don't crash and burn when
	starting to manage existing clients in mb_wm_init().

	* matchbox/theme-engines/mb-wm-theme.c (mb_wm_theme_new)


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-27 15:07:35 UTC (rev 18994)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-27 16:04:13 UTC (rev 18995)
@@ -1,3 +1,11 @@
+2009-07-27  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	Robustness improvement: warn if we can't read theme.xml and create
+	a compositing theme as a fallback, so we don't crash and burn when
+	starting to manage existing clients in mb_wm_init().
+
+	* matchbox/theme-engines/mb-wm-theme.c (mb_wm_theme_new)
+
 2009-07-27  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.50

Modified: projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme.c	2009-07-27 15:07:35 UTC (rev 18994)
+++ projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme.c	2009-07-27 16:04:13 UTC (rev 18995)
@@ -484,7 +484,7 @@
   MBWMColor      clr_lowlight;
   MBWMColor      clr_shadow;
   MBWMCompMgrShadowType shadow_type = 0;
-  Bool           compositing = False;
+  Bool           compositing = True;
   Bool           shaped = False;
   struct stat    st;
 
@@ -544,6 +544,9 @@
       if (!(file = fopen (path, "r")) ||
 	  !(par = XML_ParserCreate(NULL)))
 	{
+          g_critical ("couldn't read theme.xml, make sure "
+                      "/usr/share/themes/default/matchbox2/theme.xml "
+                      "is alright and digestable");
 	  goto default_theme;
 	}
 
@@ -614,6 +617,9 @@
 
       xml_stack_free (udata.stack);
     }
+  else
+    g_critical ("couldn't find theme.xml, make sure "
+                "/usr/share/themes/default exists and points somwehere");
 
   if (custom_theme_alloc_func)
     {