giggle-0.7-vte-2.91.patch 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. From b9e260840d03e33ac55142719f3d54129b54cc70 Mon Sep 17 00:00:00 2001
  2. From: Debarshi Ray <debarshir@gnome.org>
  3. Date: Mon, 26 Jan 2015 15:38:24 +0100
  4. Subject: [PATCH] Port to vte-2.91 API
  5. https://bugzilla.gnome.org/show_bug.cgi?id=743537
  6. ---
  7. configure.ac | 2 +-
  8. plugins/giggle-view-terminal.c | 19 ++++++++++---------
  9. 2 files changed, 11 insertions(+), 10 deletions(-)
  10. diff --git a/configure.ac b/configure.ac
  11. index 6e27733..72e7bd1 100644
  12. --- a/configure.ac
  13. +++ b/configure.ac
  14. @@ -106,7 +106,7 @@ AC_ARG_ENABLE([terminal],
  15. AS_IF([test "x$enable_terminal" = "xyes"],
  16. [
  17. PKG_CHECK_MODULES([VTE],
  18. - [vte-2.90 >= $VTE_REQUIRED_VERSION],
  19. + [vte-2.91 >= $VTE_REQUIRED_VERSION],
  20. [have_vte=yes
  21. AC_DEFINE([HAVE_VTE], [1],
  22. [Use features from vte])
  23. diff --git a/plugins/giggle-view-terminal.c b/plugins/giggle-view-terminal.c
  24. index 06a9a50..cd107f2 100644
  25. --- a/plugins/giggle-view-terminal.c
  26. +++ b/plugins/giggle-view-terminal.c
  27. @@ -186,15 +186,16 @@ giggle_view_terminal_append_tab (GiggleViewTerminal *view,
  28. real_argv[1] = NULL;
  29. spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO;
  30. - succes = vte_terminal_fork_command_full (VTE_TERMINAL (terminal),
  31. - pty_flags,
  32. - directory,
  33. - real_argv,
  34. - NULL,
  35. - spawn_flags,
  36. - NULL, NULL,
  37. - NULL,
  38. - &error);
  39. + succes = vte_terminal_spawn_sync (VTE_TERMINAL (terminal),
  40. + pty_flags,
  41. + directory,
  42. + real_argv,
  43. + NULL,
  44. + spawn_flags,
  45. + NULL, NULL,
  46. + NULL,
  47. + NULL,
  48. + &error);
  49. g_strfreev (real_argv);
  50. if (succes == FALSE) {
  51. --
  52. 2.1.0