refine error display

2 files changed, 15 insertions, 2 deletions

diff --git a/connect.c b/connect.c
index dbee8f4..43ef3be 100644
--- a/connect.c
+++ b/connect.c
@@ -19,6 +19,13 @@ static void connect_error(void *opaque, virErrorPtr err)
     struct vconsole_connect *conn = opaque;
     GtkMessageType type;
 
+    switch (err->domain) {
+    case VIR_FROM_STREAMS:  /* get one on guest shutdown, ignore */
+        return;
+    default:
+        break;
+    }
+
     switch (err->level) {
     case VIR_ERR_WARNING:
         type = GTK_MESSAGE_WARNING;
@@ -30,7 +37,11 @@ static void connect_error(void *opaque, virErrorPtr err)
         type = GTK_MESSAGE_INFO;
         break;
     }
-    gtk_message(conn->win->toplevel, type, "%s", err->message);
+    gtk_message(conn->win->toplevel, type,
+                "%s\n\n"
+                "[code %d, domain %d]",
+                err->message,
+                err->code, err->domain);
 }
 
 void connect_close(virConnectPtr c, int reason, void *opaque)
diff --git a/vconsole.c b/vconsole.c
index c3578eb..8faa1c7 100644
--- a/vconsole.c
+++ b/vconsole.c
@@ -67,7 +67,9 @@ int gtk_message(GtkWidget *window, GtkMessageType type, char *fmt, ...)
     dialog = gtk_message_dialog_new(GTK_WINDOW(window),
 				    GTK_DIALOG_DESTROY_WITH_PARENT,
 				    type, GTK_BUTTONS_CLOSE,
-				    "%s", msgbuf);
+				    "%s", gtk_msg_type_name[type]);
+    gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
+                                             "%s", msgbuf);
     g_signal_connect_swapped(dialog, "response",
 			     G_CALLBACK (gtk_widget_destroy),
 			     dialog);