[Pkg-libvirt-commits] [libguestfs] 25/146: p2v: Add 'Reboot' button to the GUI (RHBZ#1165564).

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 27f49f366230aec606cc4b6b61e6d7a23400136d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Nov 20 15:59:50 2014 +0000

    p2v: Add 'Reboot' button to the GUI (RHBZ#1165564).
    
    (cherry picked from commit 141832e2b22267f8369693d5f4afb27747668889)
---
 p2v/gui.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/p2v/gui.c b/p2v/gui.c
index aa483db..72838ea 100644
--- a/p2v/gui.c
+++ b/p2v/gui.c
@@ -34,6 +34,8 @@
 #pragma GCC diagnostic ignored "-Wstrict-prototypes" /* error in <gtk.h> */
 #include <gtk/gtk.h>
 
+#include "ignore-value.h"
+
 #include "p2v.h"
 
 /* Interactive GUI configuration. */
@@ -65,7 +67,7 @@ static GtkWidget *conv_dlg,
 /* The running dialog which is displayed when virt-v2v is running. */
 static GtkWidget *run_dlg,
   *v2v_output_sw, *v2v_output, *log_label, *status_label,
-  *cancel_button;
+  *cancel_button, *reboot_button;
 
 /* The entry point from the main program.
  * Note that gtk_init etc have already been called in main().
@@ -1056,6 +1058,7 @@ static void set_log_dir (const char *remote_dir);
 static void set_status (const char *msg);
 static void add_v2v_output (const char *msg);
 static void *start_conversion_thread (void *data);
+static void reboot_clicked (GtkWidget *w, gpointer data);
 
 static void
 create_running_dialog (void)
@@ -1092,13 +1095,18 @@ create_running_dialog (void)
   /* Buttons. */
   gtk_dialog_add_buttons (GTK_DIALOG (run_dlg),
                           _("Cancel conversion"), 1,
+                          _("Reboot"), 2,
                           NULL);
   cancel_button = gtk_dialog_get_widget_for_response (GTK_DIALOG (run_dlg), 1);
   gtk_widget_set_sensitive (cancel_button, FALSE);
+  reboot_button = gtk_dialog_get_widget_for_response (GTK_DIALOG (run_dlg), 2);
+  gtk_widget_set_sensitive (reboot_button, FALSE);
 
   /* Signals. */
   g_signal_connect_swapped (G_OBJECT (run_dlg), "destroy",
                             G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (G_OBJECT (reboot_button), "clicked",
+                    G_CALLBACK (reboot_clicked), NULL);
 }
 
 static void
@@ -1111,6 +1119,7 @@ show_running_dialog (void)
   /* Show the running dialog. */
   gtk_widget_show_all (run_dlg);
   gtk_widget_set_sensitive (cancel_button, FALSE);
+  gtk_widget_set_sensitive (reboot_button, FALSE);
 }
 
 static void
@@ -1315,6 +1324,9 @@ start_conversion_thread (void *data)
     gtk_widget_destroy (dlg);
   }
 
+  /* Enable the reboot button. */
+  gtk_widget_set_sensitive (reboot_button, TRUE);
+
   gdk_threads_leave ();
 
   /* Thread is detached anyway, so no one is waiting for the status. */
@@ -1347,3 +1359,11 @@ notify_ui_callback (int type, const char *data)
 
   gdk_threads_leave ();
 }
+
+static void
+reboot_clicked (GtkWidget *w, gpointer data)
+{
+  sync ();
+  sleep (2);
+  ignore_value (system ("/sbin/reboot"));
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git