monkey-bubble r296 - in trunk: . src/ui
- From: herzi svn gnome org
- To: svn-commits-list gnome org
- Subject: monkey-bubble r296 - in trunk: . src/ui
- Date: Fri, 8 Feb 2008 13:14:48 +0000 (GMT)
Author: herzi
Date: Fri Feb 8 13:14:48 2008
New Revision: 296
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=296&view=rev
Log:
2008-02-08 Sven Herzberg <sven imendio com>
* src/ui/ui-main.c: (ui_main_new): replace the glade-generated vbox by
a manually created one (for Maemo, too)
Modified:
trunk/ChangeLog
trunk/src/ui/ui-main.c
Modified: trunk/src/ui/ui-main.c
==============================================================================
--- trunk/src/ui/ui-main.c (original)
+++ trunk/src/ui/ui-main.c Fri Feb 8 13:14:48 2008
@@ -282,7 +282,6 @@
};
#ifdef MAEMO
HildonProgram * program;
- GtkWidget * container;
GtkWidget * main_menu;
#endif
UiMain * ui_main;
@@ -300,29 +299,27 @@
#endif
#ifdef MAEMO
PRIVATE(ui_main)->glade_xml = glade_xml_new(DATADIR"/monkey-bubble/glade/monkey-bubble.glade","main_vbox",NULL);
+#endif
+
+ vbox = glade_xml_get_widget (PRIVATE (ui_main)->glade_xml, "main_vbox");
- container = glade_xml_get_widget( PRIVATE(ui_main)->glade_xml, "main_vbox");
+ gtk_widget_destroy (vbox);
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox);
+
+#ifdef MAEMO
program = HILDON_PROGRAM(hildon_program_get_instance());
PRIVATE(ui_main)->window = hildon_window_new();
g_signal_connect (PRIVATE (ui_main)->window, "destroy",
G_CALLBACK (window_destroy_cb), ui_main);
hildon_program_add_window(program, HILDON_WINDOW(PRIVATE(ui_main)->window));
- gtk_container_add(GTK_CONTAINER(PRIVATE(ui_main)->window),
- 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;
#endif
- vbox = glade_xml_get_widget( PRIVATE(ui_main)->glade_xml,"main_vbox");
-#ifdef GNOME
- gtk_widget_destroy (vbox);
- vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox);
-
gtk_container_add (GTK_CONTAINER (PRIVATE (ui_main)->window),
vbox);
-#endif
PRIVATE(ui_main)->canvas =monkey_canvas_new();
gtk_widget_show (GTK_WIDGET (PRIVATE(ui_main)->canvas));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]