2009-03-18 Alberto Garcia <agarcia@igalia.com>

* src/hildon-main.c (hildon_init):
	Don't allow hildon_init() to be called more than once.

	Fixes: NB#106607 (hildon_init should issue error message upon
	successive calls)

diff --git a/ChangeLog b/ChangeLog
index c108e57..0df9c3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-18  Alberto Garcia  <agarcia@igalia.com>
+
+       * src/hildon-main.c (hildon_init):
+       Don't allow hildon_init() to be called more than once.
+
+       Fixes: NB#106607 (hildon_init should issue error message upon
+       successive calls)
+
 2009-03-17  Alejandro Pinheiro  <apinheiro@igalia.com>
 
        * examples/hildon-pannable-area-touch-list-example.c

diff --git a/src/hildon-main.c b/src/hildon-main.c
index 652d4aa..10782e9 100644 (file)
--- a/src/hildon-main.c
+++ b/src/hildon-main.c
@@ -70,7 +70,6 @@
 
 /**
  * hildon_init:
- * @void:
  *
  * Initializes the hildon library. Call this function after calling gtk_init()
  * and before using any hildon or GTK+ functions in your program.
@@ -79,6 +78,15 @@
 void
 hildon_init (void)
 {
+  static gboolean initialized = FALSE;
+
+  if (initialized) {
+    g_critical ("Tried to initialized Hildon more than once.");
+    return;
+  } else {
+    initialized = TRUE;
+  }
+
   /* Register icon sizes */
   gtk_icon_size_register ("hildon-xsmall", 16, 16);
   gtk_icon_size_register ("hildon-small", 24, 24);