[gnome-color-manager] Port to vte-2.91 API

[Debarshi Ray <debarshir src gnome org>]

commit dc28d7be370532021f61dec37c87ee058fcca741
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri May 16 15:47:16 2014 +0200

    Port to vte-2.91 API
    
    https://bugzilla.gnome.org/show_bug.cgi?id=730251

 configure.ac               |    2 +-
 src/gcm-calibrate-argyll.c |   22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bb5ca65..3cd563e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2)
 PKG_CHECK_MODULES(COLORD, colord >= 0.1.34 colord-gtk >= 0.1.20)
 
 dnl **** Check for VTE ****
-PKG_CHECK_MODULES(VTE, vte-2.90 >= 0.25.1, has_vte=yes, has_vte=no)
+PKG_CHECK_MODULES(VTE, vte-2.91 >= 0.25.1, has_vte=yes, has_vte=no)
 AM_CONDITIONAL(HAVE_VTE, test x$has_vte = xyes)
 if test x$has_vte = xyes; then
        AC_DEFINE(HAVE_VTE,1,[Use VTE terminal widget])
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index 266f9fe..70876fc 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -328,17 +328,19 @@ gcm_calibrate_argyll_fork_command (GcmCalibrateArgyll *calibrate_argyll,
 
        /* try to run */
        working_directory = gcm_calibrate_get_working_path (GCM_CALIBRATE (calibrate_argyll));
-       ret = vte_terminal_fork_command_full (VTE_TERMINAL(priv->terminal),
-                                             VTE_PTY_DEFAULT,
-                                             working_directory,
-                                             argv, (gchar**)envp,
+       ret = vte_terminal_spawn_sync (VTE_TERMINAL(priv->terminal),
+                                      VTE_PTY_DEFAULT,
+                                      working_directory,
+                                      argv, (gchar**)envp,
 #ifdef FIXED_ARGYLL
-                                             0,
+                                      0,
 #else
-                                             G_SPAWN_FILE_AND_ARGV_ZERO,
+                                      G_SPAWN_FILE_AND_ARGV_ZERO,
 #endif
-                                             NULL, NULL,
-                                             &priv->child_pid, error);
+                                      NULL, NULL,
+                                      &priv->child_pid,
+                                      NULL,
+                                      error);
        if (!ret)
                goto out;
 
@@ -2077,16 +2079,14 @@ static void gcm_calibrate_argyll_flush_vte (GcmCalibrateArgyll *calibrate_argyll
  **/
 static void
 gcm_calibrate_argyll_exit_cb (VteTerminal *terminal,
+                             gint exit_status,
                              GcmCalibrateArgyll *calibrate_argyll)
 {
-       gint exit_status;
        GcmCalibrateArgyllPrivate *priv = calibrate_argyll->priv;
 
        /* flush the VTE output */
        gcm_calibrate_argyll_flush_vte (calibrate_argyll);
 
-       /* get the child exit status */
-       exit_status = vte_terminal_get_child_exit_status (terminal);
        g_debug ("child exit-status is %i", exit_status);
        if (exit_status == 0)
                priv->response = GTK_RESPONSE_ACCEPT;