[med-svn] [aghermann] 02/24: fix a call vte_terminal_* for vte-2.91

[andrei zavada]

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

hmmr-guest pushed a commit to branch WIP
in repository aghermann.

commit 5aa49bcc903123ef63c00f14c52bdee327c20318
Author: Andrei Zavada <hmmr at ra>
Date:   Thu Jun 11 15:58:31 2015 +0300

    fix a call vte_terminal_* for vte-2.91
    
    Thanks Rodolphe PELLOUX-PRAYER <rodolphe at damsy.net>
---
 debian/control                         | 2 +-
 upstream/configure.ac                  | 2 +-
 upstream/src/aghermann/ui/mw/splash.cc | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index c672333..a783e21 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Andrei Zavada <johnhommer at gmail.com>
 Build-Depends: debhelper (>= 9), dh-autoreconf,
  autoconf-archive, pkg-config, libgomp1, libconfig++-dev, libgsl0-dev, libfftw3-dev,
- libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libvte-2.90-dev,
+ libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libvte-2.91-dev,
  liblua5.2-dev, lua5.2, libxml2-utils
 Standards-Version: 3.9.6
 Homepage: http://johnhommer.com/academic/code/aghermann
diff --git a/upstream/configure.ac b/upstream/configure.ac
index af545dc..0c8c068 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -65,7 +65,7 @@ PKG_CHECK_MODULES([ITPP], [itpp])
 PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4 glib-2.0 gthread-2.0 gio-unix-2.0 gmodule-export-2.0])
 PKG_CHECK_MODULES([CAIRO], [cairo >= 1.8.10])
 PKG_CHECK_MODULES([UNIQUE], [unique-3.0])
-PKG_CHECK_MODULES([VTE], [vte-2.90])
+PKG_CHECK_MODULES([VTE], [vte-2.91])
 
 AC_CHECK_LIB(
 	fftw3_omp, fftw_init_threads,
diff --git a/upstream/src/aghermann/ui/mw/splash.cc b/upstream/src/aghermann/ui/mw/splash.cc
index c7950d5..641b260 100644
--- a/upstream/src/aghermann/ui/mw/splash.cc
+++ b/upstream/src/aghermann/ui/mw/splash.cc
@@ -36,11 +36,11 @@ bDownload_clicked_cb(
 void
 download_process_child_exited_cb(
         VteTerminal *terminal,
+        int exit_status,
         const gpointer userdata)
 {
         auto& ED = *(SExpDesignUI*)userdata;
         ED.set_wMainWindow_interactive( true, true);
-        int exit_status = vte_terminal_get_child_exit_status( terminal);
         if ( exit_status != 0 )
                 pop_ok_message(
                         ED.wMainWindow,
@@ -144,7 +144,7 @@ try_download()
                 "source " PACKAGE_DATADIR "/aghermann/experiment-dl.sh",
                 NULL
         };
-        vte_terminal_fork_command_full(
+        vte_terminal_spawn_sync(
                 tTerm,
                 VTE_PTY_DEFAULT,
                 ED->session_dir(),
@@ -154,6 +154,7 @@ try_download()
                 NULL, // GSpawnChildSetupFunc child_setup,
                 NULL, // gpointer child_setup_data,
                 &dl_pid,
+                NULL,
                 &Error); // GError **error);
         if ( Error ) {
                 pop_ok_message(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git