From: Alberto Garcia <agarcia@igalia.com>
Date: Wed, 4 Mar 2009 14:15:54 +0000 (+0000)
Subject: 2009-03-04 Alberto Garcia <agarcia@igalia.com>
X-Git-Tag: 2.1.66-1~102
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=43221847c5da06de6d5b302cbe9663310bd16ae1;p=hildon

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

* src/hildon-program-private.h
	* src/hildon-program.c
	(hildon_program_set_common_menu)
	(hildon_program_get_common_menu)
	(hildon_program_set_common_app_menu)
	(hildon_program_get_common_app_menu):
	Change common menu pointers from GtkWidget* to GtkMenu* and
	HildonAppMenu* to avoid unnecessary casts.
---

diff --git a/ChangeLog b/ChangeLog
index 6cb3ab4..a35a19d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-04  Alberto Garcia  <agarcia@igalia.com>
+
+	* src/hildon-program-private.h
+	* src/hildon-program.c
+	(hildon_program_set_common_menu)
+	(hildon_program_get_common_menu)
+	(hildon_program_set_common_app_menu)
+	(hildon_program_get_common_app_menu):
+	Change common menu pointers from GtkWidget* to GtkMenu* and
+	HildonAppMenu* to avoid unnecessary casts.
+
 2009-03-03  Alberto Garcia  <agarcia@igalia.com>
 
 	* src/hildon-window.c (hildon_window_set_main_menu):
diff --git a/src/hildon-program-private.h b/src/hildon-program-private.h
index a77df9b..bf2a3f7 100644
--- a/src/hildon-program-private.h
+++ b/src/hildon-program-private.h
@@ -43,8 +43,8 @@ struct                                          _HildonProgramPrivate
     gboolean killable;
     gboolean is_topmost;
     guint window_count;
-    GtkWidget *common_menu;
-    GtkWidget *common_app_menu;
+    GtkMenu *common_menu;
+    HildonAppMenu *common_app_menu;
     GtkWidget *common_toolbar;
     GSList *windows;
     Window window_group;
diff --git a/src/hildon-program.c b/src/hildon-program.c
index d5230f0..8207477 100644
--- a/src/hildon-program.c
+++ b/src/hildon-program.c
@@ -598,13 +598,13 @@ hildon_program_set_common_menu                  (HildonProgram *self,
     {
         if (GTK_WIDGET_VISIBLE (priv->common_menu))
         {
-            gtk_menu_popdown (GTK_MENU (priv->common_menu));
+            gtk_menu_popdown (priv->common_menu);
             gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->common_menu));
         }
 
-        if (gtk_menu_get_attach_widget (GTK_MENU (priv->common_menu)))
+        if (gtk_menu_get_attach_widget (priv->common_menu))
         {
-            gtk_menu_detach (GTK_MENU (priv->common_menu));
+            gtk_menu_detach (priv->common_menu);
         }
         else
         {
@@ -612,7 +612,7 @@ hildon_program_set_common_menu                  (HildonProgram *self,
         }
     }
 
-    priv->common_menu = GTK_WIDGET (menu);
+    priv->common_menu = menu;
 
     if (priv->common_menu)
     {
@@ -641,7 +641,7 @@ hildon_program_get_common_menu                  (HildonProgram *self)
     priv = HILDON_PROGRAM_GET_PRIVATE (self);
     g_assert (priv);
 
-    return GTK_MENU (priv->common_menu);
+    return priv->common_menu;
 }
 
 /**
@@ -667,7 +667,7 @@ hildon_program_set_common_app_menu              (HildonProgram *self,
                                                  HildonAppMenu *menu)
 {
     HildonProgramPrivate *priv;
-    GtkWidget *old_menu;
+    HildonAppMenu *old_menu;
 
     g_return_if_fail (HILDON_IS_PROGRAM (self));
     g_return_if_fail (menu == NULL || HILDON_IS_APP_MENU (menu));
@@ -678,13 +678,13 @@ hildon_program_set_common_app_menu              (HildonProgram *self,
     old_menu = priv->common_app_menu;
 
     /* Set new menu */
-    priv->common_app_menu = GTK_WIDGET (menu);
+    priv->common_app_menu = menu;
     if (menu)
         g_object_ref_sink (menu);
 
     /* Hide and unref old menu */
     if (old_menu) {
-        hildon_app_menu_set_parent_window (HILDON_APP_MENU (old_menu), NULL);
+        hildon_app_menu_set_parent_window (old_menu, NULL);
         g_object_unref (old_menu);
     }
 }
@@ -711,7 +711,7 @@ hildon_program_get_common_app_menu              (HildonProgram *self)
     priv = HILDON_PROGRAM_GET_PRIVATE (self);
     g_assert (priv);
 
-    return HILDON_APP_MENU (priv->common_app_menu);
+    return priv->common_app_menu;
 }
 
 /**