1 files changed, 28 insertions, 5 deletions

diff --git a/qemu-gtk.c b/qemu-gtk.c
index ff18d6c..5ab68a6 100644
--- a/qemu-gtk.c
+++ b/qemu-gtk.c
@@ -101,7 +101,6 @@ static void vte_configure(struct qemu_window *win, GtkWidget *vte)
     vte_terminal_set_backspace_binding(VTE_TERMINAL(vte),
                                        VTE_ERASE_ASCII_BACKSPACE);
 
-    fprintf(stderr, "%s: %s %s\n", __FUNCTION__, win->tty_fg, win->tty_bg);
     gdk_color_parse(win->tty_fg, &fg);
     gdk_color_parse(win->tty_bg, &bg);
     vte_terminal_set_color_foreground(VTE_TERMINAL(vte), &fg);
@@ -227,6 +226,7 @@ static void menu_cb_config_font(GtkAction *action, void *data)
         win->tty_font = gtk_font_selection_dialog_get_font_name
 	    (GTK_FONT_SELECTION_DIALOG(dialog));
 	g_key_file_set_string(config, "tty", "font", win->tty_font);
+        config_dirty++;
         vtes_set_font(win);
 	break;
     }
@@ -254,6 +254,7 @@ static int pickcolor(char *title, char *group, char *key, char *current)
         snprintf(name, sizeof(name), "#%04x%04x%04x",
                  color.red, color.green, color.blue);
         g_key_file_set_string(config, group, key, name);
+        config_dirty++;
 	rc = 0;
     }
     gtk_widget_destroy(dialog);
@@ -292,6 +293,12 @@ static void menu_cb_send_ctrlaltdel(GtkToggleAction *action, gpointer userdata)
                              VNC_DISPLAY_KEY_EVENT_CLICK);
 }
 
+static void menu_cb_devices_rescan(GtkToggleAction *action, gpointer userdata)
+{
+    struct qemu_window *win = userdata;
+    devices_rescan(win);
+}
+
 static void menu_cb_about(GtkAction *action, gpointer userdata)
 {
     static char *comments = "gtk ui for qemu";
@@ -595,11 +602,17 @@ static const GtkActionEntry entries[] = {
     },{
 
         /* --- sub menus --- */
+	.name        = "ChangeMediaSubMenu",
+	.label       = "_Change media",
+    },{
 	.name        = "EjectMediaSubMenu",
 	.label       = "_Eject media",
     },{
-	.name        = "ChangeMediaSubMenu",
-	.label       = "_Change media",
+	.name        = "PlugUsbSubMenu",
+	.label       = "_Plugin USB",
+    },{
+	.name        = "UnplugUsbSubMenu",
+	.label       = "_Unplug USB",
     },{
 
         /* --- file menu --- */
@@ -656,6 +669,12 @@ static const GtkActionEntry entries[] = {
 	.callback    = G_CALLBACK(menu_cb_run_gdb),
     },{
 
+        /* --- devices menu --- */
+	.name        = "DevicesRescan",
+	.label       = "_Rescan devices",
+	.callback    = G_CALLBACK(menu_cb_devices_rescan),
+    },{
+
         /* --- help menu --- */
 	.name        = "About",
         .stock_id    = GTK_STOCK_ABOUT,
@@ -716,8 +735,12 @@ static char ui_xml[] =
 "      <menuitem action='RunGdb'/>"
 "    </menu>"
 "    <menu action='DevicesMenu'>"
-"      <menu action='EjectMediaSubMenu'/>"
 "      <menu action='ChangeMediaSubMenu'/>"
+"      <menu action='EjectMediaSubMenu'/>"
+"      <menu action='PlugUsbSubMenu'/>"
+"      <menu action='UnplugUsbSubMenu'/>"
+"      <separator/>"
+"      <menuitem action='DevicesRescan'/>"
 "    </menu>"
 "    <menu action='HelpMenu'>"
 "      <menuitem action='About'/>"
@@ -812,7 +835,7 @@ static struct qemu_window *qemu_create_window(void)
     win->tty_bg = g_key_file_get_string(config, "tty", "background", &err);
 
     /* config defaults */
-    if (!win->tty_fg)
+    if (!win->tty_font)
         win->tty_font = "console 12";
     if (!win->tty_fg)
         win->tty_fg = "white";