2009-04-01 Alberto Garcia <agarcia@igalia.com>

[hildon] / src / hildon-program.c

diff --git a/src/hildon-program.c b/src/hildon-program.c
index c205b8f..79639a3 100644 (file)
--- a/src/hildon-program.c
+++ b/src/hildon-program.c
@@ -27,19 +27,19 @@
  * @short_description: An object that represents an application running in the Hildon framework.
  * @see_also: #HildonWindow, #HildonStackableWindow
  *
- * The #HildonProgram is an object used to represent an application running
+ * #HildonProgram is an object used to represent an application running
  * in the Hildon framework.
  *
- * Such an application is thought to have one or more #HildonWindow. These
- * shall be registered to the #HildonProgram with hildon_program_add_window(),
+ * Applications can have one or more #HildonWindow<!-- -->s. These
+ * can be registered in the #HildonProgram with hildon_program_add_window(),
  * and can be unregistered similarly with hildon_program_remove_window().
  *
- * The #HildonProgram provides the programmer with commodities such
- * as applying a common toolbar and menu to all #HildonWindow<!-- -->s
- * registered to it. This is done with hildon_program_set_common_menu(),
+ * #HildonProgram provides the programmer with commodities such
+ * as applying a common toolbar and menu to all registered
+ * #HildonWindow<!-- -->s. This is done with hildon_program_set_common_menu(),
  * hildon_program_set_common_app_menu() and hildon_program_set_common_toolbar().
  *
- * The #HildonProgram is also used to apply program-wide properties that
+ * #HildonProgram is also used to apply program-wide properties that
  * are specific to the Hildon framework. For instance
  * hildon_program_set_can_hibernate() sets whether or not an application
  * can be set to hibernate by the Hildon task navigator, in situations of
@@ -335,7 +335,7 @@ hildon_program_window_list_is_is_topmost        (gpointer data,
 static void
 hildon_program_update_top_most                  (HildonProgram *program)
 {
-    XWMHints *wm_hints;
+    gboolean is_topmost;
     Window active_window;
     HildonProgramPrivate *priv;
 
@@ -343,30 +343,35 @@ hildon_program_update_top_most                  (HildonProgram *program)
     g_assert (priv);
     
     active_window = hildon_window_get_active_window();
+    is_topmost = FALSE;
 
     if (active_window)
     {
       gint xerror;
-      gboolean is_topmost = FALSE;
+      XWMHints *wm_hints;
       
       gdk_error_trap_push ();
       wm_hints = XGetWMHints (GDK_DISPLAY (), active_window);
       xerror = gdk_error_trap_pop ();
       if (xerror)
+      {
+        if (wm_hints)
+          XFree (wm_hints);
         return;
+      }
 
       if (wm_hints)
       {
         is_topmost = (wm_hints->window_group == priv->window_group);
         XFree (wm_hints);
       }
+    }
 
-      /* Send notification if is_topmost has changed */
-      if (!priv->is_topmost != !is_topmost)
-      {
-        priv->is_topmost = is_topmost;
-        g_object_notify (G_OBJECT (program), "is-topmost");
-      }
+    /* Send notification if is_topmost has changed */
+    if (!priv->is_topmost != !is_topmost)
+    {
+      priv->is_topmost = is_topmost;
+      g_object_notify (G_OBJECT (program), "is-topmost");
     }
 
     /* Check each window if it was is_topmost */
@@ -444,7 +449,7 @@ hildon_program_get_instance                     (void)
  * Registers a #HildonWindow as belonging to a given #HildonProgram. This
  * allows to apply program-wide settings as all the registered windows,
  * such as hildon_program_set_common_menu(), hildon_program_set_common_app_menu()
- * and hildon_pogram_set_common_toolbar().
+ * and hildon_program_set_common_toolbar().
  **/
 void
 hildon_program_add_window                       (HildonProgram *self, 
@@ -453,6 +458,7 @@ hildon_program_add_window                       (HildonProgram *self,
     HildonProgramPrivate *priv;
     
     g_return_if_fail (HILDON_IS_PROGRAM (self));
+    g_return_if_fail (HILDON_IS_WINDOW (window));
     
     priv = HILDON_PROGRAM_GET_PRIVATE (self);
     g_assert (priv);
@@ -488,11 +494,11 @@ hildon_program_add_window                       (HildonProgram *self,
 /**
  * hildon_program_remove_window:
  * @self: The #HildonProgram to which the window should be unregistered
- * @window: The @HildonWindow to unregister
+ * @window: The #HildonWindow to unregister
  *
  * Used to unregister a window from the program. Subsequent calls to
  * hildon_program_set_common_menu(), hildon_program_set_common_app_menu()
- * and hildon_pogram_set_common_toolbar() will not affect the window.
+ * and hildon_program_set_common_toolbar() will not affect the window.
  **/
 void
 hildon_program_remove_window                    (HildonProgram *self, 
@@ -501,10 +507,13 @@ hildon_program_remove_window                    (HildonProgram *self,
     HildonProgramPrivate *priv;
     
     g_return_if_fail (HILDON_IS_PROGRAM (self));
+    g_return_if_fail (HILDON_IS_WINDOW (window));
     
     priv = HILDON_PROGRAM_GET_PRIVATE (self);
     g_assert (priv);
     
+    g_return_if_fail (g_slist_find (priv->windows, window));
+
     hildon_window_unset_program (window);
 
     priv->windows = g_slist_remove (priv->windows, window);
@@ -715,12 +724,12 @@ hildon_program_get_common_app_menu              (HildonProgram *self)
 /**
  * hildon_program_set_common_toolbar:
  * @self: The #HildonProgram in which the common toolbar should be used
- * @toolbar: A GtkToolbar to use as common toolbar for the program
+ * @toolbar: A #GtkToolbar to use as common toolbar for the program
  *
- * Sets a GtkToolbar that will appear in all the #HildonWindow registered
- * to the #HildonProgram. Only one common GtkToolbar can be set, further
- * call will detach the previous common GtkToolbar. A #HildonWindow
- * can use its own GtkToolbar with hildon_window_add_toolbar(). Both
+ * Sets a #GtkToolbar that will appear in all the #HildonWindow registered
+ * to the #HildonProgram. Only one common #GtkToolbar can be set, further
+ * call will detach the previous common #GtkToolbar. A #HildonWindow
+ * can use its own #GtkToolbar with hildon_window_add_toolbar(). Both
  * #HildonProgram and #HildonWindow specific toolbars will be shown
  **/
 void