popup menu defined in .glade instead of code

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index 9bc6743..d413891 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -173,7 +173,7 @@ static void on_slog_enabled_cb(GConfClient *client,
 
 void ui_window_create(struct ui_psensor *ui)
 {
-       GtkWidget *window, *menubar;
+       GtkWidget *window;
        GdkPixbuf *icon;
        GtkIconTheme *icon_theme;
        struct config *cfg;
@@ -225,19 +225,16 @@ void ui_window_create(struct ui_psensor *ui)
        gtk_window_set_keep_below(GTK_WINDOW(window),
                                  cfg->window_keep_below_enabled);
 
-       /* main box */
-       menubar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar"));
-
+       ui->menu_bar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar"));
        ui->main_box = GTK_WIDGET(gtk_builder_get_object(builder, "main_box"));
-       gtk_box_pack_start(GTK_BOX(ui->main_box), menubar,
-                          FALSE, TRUE, 0);
-
-       gtk_container_add(GTK_CONTAINER(window), ui->main_box);
-
+       ui->popup_menu = GTK_WIDGET(gtk_builder_get_object(builder,
+                                                          "popup_menu"));
+       g_object_ref(G_OBJECT(ui->popup_menu));
        ui->main_window = window;
-       ui->menu_bar = menubar;
 
        gtk_widget_show_all(ui->main_box);
+
+       g_object_unref(G_OBJECT(builder));
 }
 
 static void menu_bar_show(unsigned int show, struct ui_psensor *ui)