[virt-tools-list] [PATCH virt-viewer 4/4] Do not warn if the display is shown and not ready

Marc-André Lureau marcandre.lureau at gmail.com
Wed Mar 21 23:25:29 UTC 2012


From: Marc-Andre Lureau <marcandre.lureau at redhat.com>

Lower warning message to debug level. There are various racy ways it
ends up calling show_display although the display is not yet
ready. This is not such a big problem, although it would be nice to
handle this case better
---
 src/virt-viewer-notebook.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/virt-viewer-notebook.c b/src/virt-viewer-notebook.c
index 0249021..09e8ec4 100644
--- a/src/virt-viewer-notebook.c
+++ b/src/virt-viewer-notebook.c
@@ -129,8 +129,10 @@ virt_viewer_notebook_show_display(VirtViewerNotebook *self)
     g_return_if_fail(VIRT_VIEWER_IS_NOTEBOOK(self));
 
     display = gtk_notebook_get_nth_page(GTK_NOTEBOOK(self), 1);
-    g_warn_if_fail(display != NULL);
-    gtk_widget_grab_focus(display);
+    if (display == NULL)
+        DEBUG_LOG("FIXME: showing display although it's not ready yet");
+    else
+        gtk_widget_grab_focus(display);
 
     gtk_notebook_set_current_page(GTK_NOTEBOOK(self), 1);
     gtk_widget_show_all(GTK_WIDGET(self));
-- 
1.7.7.6




More information about the virt-tools-list mailing list