Close HildonAppMenu if it receives a grab-notify signal

[hildon] / examples / hildon-app-menu-example.c

diff --git a/examples/hildon-app-menu-example.c b/examples/hildon-app-menu-example.c
index eb2d321..b018056 100644 (file)
--- a/examples/hildon-app-menu-example.c
+++ b/examples/hildon-app-menu-example.c
@@ -23,7 +23,7 @@
  */
 
 #include                                        <gtk/gtk.h>
-#include                                        "hildon.h"
+#include                                        <hildon/hildon.h>
 
 static void
 menu_button_clicked                             (GtkButton *button,
@@ -49,7 +49,6 @@ create_menu                                     (GtkWidget     *label,
     gtk_button_set_label (GTK_BUTTON (button), "Menu command one");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
-    gtk_widget_show (button);
 
     gtk_widget_add_accelerator (button, "activate", accel, GDK_r, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
 
@@ -57,25 +56,21 @@ create_menu                                     (GtkWidget     *label,
     gtk_button_set_label (GTK_BUTTON (button), "Menu command two");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
-    gtk_widget_show (button);
 
     button = hildon_gtk_button_new (buttonsize);
     gtk_button_set_label (GTK_BUTTON (button), "Menu command three");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
-    gtk_widget_show (button);
 
     button = hildon_gtk_button_new (buttonsize);
     gtk_button_set_label (GTK_BUTTON (button), "Menu command four");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
-    gtk_widget_show (button);
 
     button = hildon_gtk_button_new (buttonsize);
     gtk_button_set_label (GTK_BUTTON (button), "Menu command five");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
-    gtk_widget_show (button);
 
     /* Filters */
     button = hildon_gtk_radio_button_new (buttonsize, NULL);
@@ -83,14 +78,14 @@ create_menu                                     (GtkWidget     *label,
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_add_filter (menu, GTK_BUTTON (button));
     gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
-    gtk_widget_show (button);
 
     button = hildon_gtk_radio_button_new_from_widget (buttonsize, GTK_RADIO_BUTTON (button));
     gtk_button_set_label (GTK_BUTTON (button), "filter two");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_add_filter (menu, GTK_BUTTON (button));
     gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
-    gtk_widget_show (button);
+
+    gtk_widget_show_all (GTK_WIDGET (menu));
 
     return menu;
 }
@@ -122,7 +117,7 @@ main                                            (int argc,
 
     menu = create_menu (label2, accel);
 
-    hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (win), menu);
+    hildon_window_set_app_menu (HILDON_WINDOW (win), menu);
 
     gtk_window_add_accel_group (GTK_WINDOW (win), accel);
     g_object_unref (accel);