X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Ffilemenu.c;h=d2dae9c15b3d840124b6fff3f23adea6cff25bfd;hb=c2ef73ab945d0c668e000aef58a1ad227d8910c1;hp=ce13368ef44697259e3afd1041ab1b3f49d8b71c;hpb=43cc485237ad6fab2ca1506ff3d3f4b1dfb904d5;p=emu8051.git

diff --git a/src/filemenu.c b/src/filemenu.c
index ce13368..d2dae9c 100644
--- a/src/filemenu.c
+++ b/src/filemenu.c
@@ -46,12 +46,9 @@ remember_current_folder(GtkFileChooser *chooser)
 	if (folder != NULL) {
 		if (strlen(folder) >= MAX_FILENAME_LENGTH) {
 			/* Non-critical error */
-			g_print("current folder name too long for buffer\n");
+			log_warn("current folder name too long for buffer");
 		} else {
-#if defined(DEBUG)
-			g_print("current folder = %s\n", folder);
-#endif
-
+			log_info("current folder = %s", folder);
 			strncpy(previous_folder, folder, MAX_FILENAME_LENGTH);
 		}
 
@@ -66,9 +63,7 @@ FileOpenEvent(GtkObject *object, gpointer data)
 	char *dir;
 	char *cwd = NULL;
 
-#if defined(DEBUG)
-	g_print("FileOpenEvent()\n");
-#endif
+	log_info("FileOpenEvent()");
 
 	/* Create a new file selection widget. */
 	file_dialog = gtk_file_chooser_dialog_new(
@@ -97,9 +92,7 @@ FileOpenEvent(GtkObject *object, gpointer data)
 			GTK_FILE_CHOOSER(file_dialog));
 
 		if (selected_file != NULL) {
-#if defined(DEBUG)
-			g_print("emugtk_File = %s\n", selected_file);
-#endif
+			log_info("emugtk_File = %s", selected_file);
 
 			remember_current_folder(GTK_FILE_CHOOSER(file_dialog));
 
@@ -114,11 +107,7 @@ FileOpenEvent(GtkObject *object, gpointer data)
 static void
 FileQuitEvent(gchar *string)
 {
-#if defined(DEBUG)
-	g_print("%s\n", string);
-#endif
-
-	gtk_main_quit();
+	emugtk_quit_gui();
 }
 
 void
@@ -133,20 +122,18 @@ FileAddMenu(GtkWidget *menu_bar)
 	item = gtk_menu_item_new_with_label(FILENAME_DESCRIPTION);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	/* Attach the callback functions to the activate signal. */
-	gtk_signal_connect_object(GTK_OBJECT(item), "activate",
-				  GTK_SIGNAL_FUNC(FileOpenEvent), NULL);
+	g_signal_connect(item, "activate", G_CALLBACK(FileOpenEvent), NULL);
 
 	AddMenuSeparator(menu);
 
 	item = gtk_menu_item_new_with_label("Exit");
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	/* We can attach the Quit menu item to our exit function */
-	gtk_signal_connect_object(GTK_OBJECT(item), "activate",
-				  GTK_SIGNAL_FUNC(FileQuitEvent),
-				  (gpointer) "file.quit");
+	g_signal_connect(item, "activate", G_CALLBACK(FileQuitEvent),
+			 (gpointer) "file.quit");
 
 	/* Adding submenu title. */
 	item = gtk_menu_item_new_with_label("File");
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
-	gtk_menu_bar_append(GTK_MENU_BAR(menu_bar), item);
+	gtk_menu_shell_append((GtkMenuShell *) menu_bar, item);
 }