monkey-bubble r249 - in trunk: . src/ui

[herzi svn gnome org]

Author: herzi
Date: Tue Feb  5 12:25:14 2008
New Revision: 249
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=249&view=rev

Log:
2008-02-03  Sven Herzberg  <sven imendio com>

	Now really fix the menubar for Maemo.

	* src/ui/main.c: (main): don't gtk_widget_show_all() the window
	* src/ui/ui-main.c: (ui_main_new): add an extra call to
	gtk_widget_show() for the canvas


Modified:
   trunk/ChangeLog
   trunk/src/ui/main.c
   trunk/src/ui/ui-main.c

Modified: trunk/src/ui/main.c
==============================================================================
--- trunk/src/ui/main.c	(original)
+++ trunk/src/ui/main.c	Tue Feb  5 12:25:14 2008
@@ -134,7 +134,7 @@
   mb_input_manager_instance_set_window(window);
   gdk_rgb_init ();
 
-  gtk_widget_show_all (window);
+  gtk_widget_show (window);
 
 #ifdef MAEMO
   if (state.game == 1) {

Modified: trunk/src/ui/ui-main.c
==============================================================================
--- trunk/src/ui/ui-main.c	(original)
+++ trunk/src/ui/ui-main.c	Tue Feb  5 12:25:14 2008
@@ -247,7 +247,7 @@
 	g_signal_connect_swapped(PRIVATE(ui_main)->window ,"destroy",GTK_SIGNAL_FUNC(quit_program),ui_main);
 	hildon_program_add_window(program, HILDON_WINDOW(PRIVATE(ui_main)->window));
 	gtk_container_add(GTK_CONTAINER(PRIVATE(ui_main)->window),
-				GTK_WIDGET(container));
+				container);
 	g_set_application_name(_("Monkey Bubble"));
 	g_signal_connect(G_OBJECT(program), "notify::is-topmost", G_CALLBACK(ui_main_topmost_cb), NULL);
 	PRIVATE(ui_main)->ic = NULL;
@@ -261,6 +261,7 @@
 
 
         PRIVATE(ui_main)->canvas =monkey_canvas_new();
+	gtk_widget_show (GTK_WIDGET (PRIVATE(ui_main)->canvas));
         PRIVATE(ui_main)->main_image = 
                 monkey_canvas_create_block_from_image(
                                                       PRIVATE(ui_main)->canvas,