2008-07-05 Emmanuele Bassi <ebassi@openedhand.com>

	Bug 1033 - Manually parsing command line options prevents
	           initializing clutter (Armin Burgmeier)

	* clutter/clutter-main.c:
	(post_parse_hook), (clutter_init_real): Set the is_initialized
	flag inside the real initialization function.

diff --git a/ChangeLog b/ChangeLog
index 734a121..9ab0962 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-05  Emmanuele Bassi  <ebassi@openedhand.com>
+
+       Bug 1033 - Manually parsing command line options prevents
+                  initializing clutter (Armin Burgmeier)
+
+       * clutter/clutter-main.c:
+       (post_parse_hook), (clutter_init_real): Set the is_initialized
+       flag inside the real initialization function.
+
 2008-07-04  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter/clutter-label.c: Properly document the behaviour

diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 238a5a8..80ca151 100644 (file)
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -1126,8 +1126,6 @@ post_parse_hook (GOptionContext  *context,
   else
     retval = TRUE;
 
-  clutter_is_initialized = retval;
-
   return retval;
 }
 
@@ -1240,6 +1238,8 @@ clutter_init_real (GError **error)
 
   clutter_stage_set_title (CLUTTER_STAGE (stage), g_get_prgname ());
 
+  clutter_is_initialized = TRUE;
+
   return CLUTTER_INIT_SUCCESS;
 }