From 2c4f0c273a3872a324ce530e43ffeb050ae1dd95 Mon Sep 17 00:00:00 2001 From: Markus Koch Date: Sat, 18 Feb 2017 15:06:11 +0100 Subject: [PATCH] Revert "Trying some app_menu stuff" This reverts commit 844813709b4434b62e80fe2dc206ac59790da419. --- src/main.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main.c b/src/main.c index 5067824..050f6b0 100644 --- a/src/main.c +++ b/src/main.c @@ -10,31 +10,17 @@ int main(int argc, char *argv[]) struct mainWindow *mainWindow; struct mdiary_settings *settings; gchar *settings_path; - GtkApplication *app; gtk_init(&argc, &argv); mainWindow = mainWindow_new(); - app = gtk_application_new(0, G_APPLICATION_FLAGS_NONE); - g_application_register(app, NULL, NULL); - gtk_application_add_window(app, mainWindow->mainWindow); - - GMenu *app_menu = g_menu_new(); - GMenu *p1 = g_menu_new(); - GMenu *p2 = g_menu_new(); - g_menu_append(p1, "Settings", "win.settings"); - g_menu_append(p2, "Quit", "win.quit"); - g_menu_append_section(app_menu, NULL, p1); - g_menu_append_section(app_menu, NULL, p2); - gtk_application_set_app_menu(app, G_MENU_MODEL(app_menu)); settings_path = g_strdup_printf("%s/.mdiary.conf", g_get_home_dir()); settings = mdiary_settings_new(mainWindow); mdiary_load_settings(settings_path, settings); gtk_widget_show(mainWindow->mainWindow); - /* gtk_main(); */ - g_application_run(G_APPLICATION(app), argc, argv); + gtk_main(); mdiary_save_settings(settings_path, settings); mdiary_settings_free(settings);