<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121499] users/devans/GNOME-3/unstable/dports/gnome</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121499">121499</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-06-27 08:17:26 -0700 (Fri, 27 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable: nemiver, copy from stable and patch for vte 0.37.2 API changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomenemiverPortfile">users/devans/GNOME-3/unstable/dports/gnome/nemiver/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/devans/GNOME-3/unstable/dports/gnome/nemiver/</li>
<li><a href="#usersdevansGNOME3unstabledportsgnomenemiverfilespatchconsolidategerrorsafeptrdefinitionsdiff">users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-consolidate-gerrorsafeptr-definitions.diff</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomenemiverfilespatchsrcuicommonnmvterminalccdiff">users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-src-uicommon-nmv-terminal.cc.diff</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomenemiverfilespatchvte291apidiff">users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-vte-2.91-api.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3unstabledportsgnomenemiverPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/nemiver/Portfile (121488 => 121499)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/nemiver/Portfile 2014-06-26 22:14:51 UTC (rev 121488)
+++ users/devans/GNOME-3/unstable/dports/gnome/nemiver/Portfile 2014-06-27 15:17:26 UTC (rev 121499)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name nemiver
</span><span class="cx"> version 0.9.5
</span><ins>+revision 1
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Standalone graphical debugger for GNOME.
</span><span class="lines">@@ -55,6 +56,18 @@
</span><span class="cx"> patch-dconf-configure.ac.diff \
</span><span class="cx"> patch-gconf-configure.ac.diff
</span><span class="cx">
</span><ins>+# proposed upstream patches to port to vte-2.91 API
+# https://bugzilla.gnome.org/show_bug.cgi?id=730243
+
+patchfiles-append patch-consolidate-gerrorsafeptr-definitions.diff \
+ patch-vte-2.91-api.diff
+
+# emulation support now removed from vte, xterm behavior hardcoded
+# https://bugzilla.gnome.org/show_bug.cgi?id=728900#c5
+# https://git.gnome.org/browse/vte/commit/src/vte.c?id=4e253be9282829f594c8a55ca08d1299e80e471d
+
+patchfiles-append patch-src-uicommon-nmv-terminal.cc.diff
+
</ins><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomenemiverfilespatchconsolidategerrorsafeptrdefinitionsdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-consolidate-gerrorsafeptr-definitions.diff (0 => 121499)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-consolidate-gerrorsafeptr-definitions.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-consolidate-gerrorsafeptr-definitions.diff 2014-06-27 15:17:26 UTC (rev 121499)
</span><span class="lines">@@ -0,0 +1,248 @@
</span><ins>+From 58b36ceaeb6dcdbcee54d5849b282dd10f9b3f24 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Fri, 16 May 2014 14:15:04 +0200
+Subject: [PATCH 1/2] 730243 Consolidate GErrorSafePtr definitions
+
+ * src/common/nmv-error.h: New file.
+ * src/common/nmv-error.cc: Likewise.
+ * src/common/Makefile.am: Add nmv-error.[h|cc] to the build
+ system.
+ * src/common/nmv-ustring.cc: Remove local copy of GErrorSafePtr.
+ (wstring_to_ustring): Use GErrorSafePtr from nmv-error.h
+ instead of local copy.
+ (ustring_to_wstring): Likewise.
+ * src/confmgr/nmv-gconf-mgr.cc: Remove local copy of
+ GErrorSafePtr.
+---
+ src/common/Makefile.am | 6 +++--
+ src/common/nmv-error.cc | 51 +++++++++++++++++++++++++++++++++++++++++++
+ src/common/nmv-error.h | 52 ++++++++++++++++++++++++++++++++++++++++++++
+ src/common/nmv-ustring.cc | 20 +++--------------
+ src/confmgr/nmv-gconf-mgr.cc | 11 +---------
+ 5 files changed, 111 insertions(+), 29 deletions(-)
+ create mode 100644 src/common/nmv-error.cc
+ create mode 100644 src/common/nmv-error.h
+
+diff --git a/src/common/Makefile.am b/src/common/Makefile.am
+index 074c5bd..9ef837a 100644
+--- src/common/Makefile.am
++++ src/common/Makefile.am
+@@ -42,7 +42,8 @@ $(h)/nmv-insert-statement.h \
+ $(h)/nmv-delete-statement.h \
+ $(h)/nmv-proc-utils.h \
+ $(h)/nmv-proc-mgr.h \
+-$(h)/nmv-loc.h
++$(h)/nmv-loc.h \
++$(h)/nmv-error.h
+
+ libnemivercommon_la_SOURCES= $(headers) \
+ $(h)/nmv-ustring.cc \
+@@ -71,7 +72,8 @@ $(h)/nmv-sql-statement.cc \
+ $(h)/nmv-insert-statement.cc \
+ $(h)/nmv-delete-statement.cc \
+ $(h)/nmv-proc-utils.cc \
+-$(h)/nmv-proc-mgr.cc
++$(h)/nmv-proc-mgr.cc \
++$(h)/nmv-error.cc
+
+ publicheaders_DATA=$(headers)
+ publicheadersdir=$(NEMIVER_INCLUDE_DIR)/common
+diff --git a/src/common/nmv-error.cc b/src/common/nmv-error.cc
+new file mode 100644
+index 0000000..aa7a2be
+--- /dev/null
++++ src/common/nmv-error.cc
+@@ -0,0 +1,51 @@
++/* -*- Mode: C++; indent-tabs-mode:nil; c-basic-offset: 4-*- */
++
++/*Copyright (c) 2014 Red Hat, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
++ * software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute,
++ * sublicense, and/or sell copies of the Software, and to permit
++ * persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in all copies
++ * or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS",
++ * WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
++ * INCLUDING BUT NOT LIMITED TO THE
++ * WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE
++ * AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM,
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
++ * CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
++ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++#include "config.h"
++#include "nmv-error.h"
++
++NEMIVER_BEGIN_NAMESPACE (nemiver)
++NEMIVER_BEGIN_NAMESPACE (common)
++
++void
++GErrorRef::operator () (GError *a_error)
++{
++}
++
++void
++GErrorUnref::operator () (GError *a_error)
++{
++ if (a_error) {
++ g_error_free (a_error);
++ }
++}
++
++NEMIVER_END_NAMESPACE (common)
++NEMIVER_END_NAMESPACE (nemiver)
++
+diff --git a/src/common/nmv-error.h b/src/common/nmv-error.h
+new file mode 100644
+index 0000000..0230087
+--- /dev/null
++++ src/common/nmv-error.h
+@@ -0,0 +1,52 @@
++/* -*- Mode: C++; indent-tabs-mode:nil; c-basic-offset: 4-*- */
++
++/*Copyright (c) 2014 Red Hat, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
++ * software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute,
++ * sublicense, and/or sell copies of the Software, and to permit
++ * persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in all copies
++ * or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS",
++ * WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
++ * INCLUDING BUT NOT LIMITED TO THE
++ * WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE
++ * AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM,
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
++ * CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
++ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++#ifndef __NMV_ERROR_H__
++#define __NMV_ERROR_H__
++
++#include <glib.h>
++#include "nmv-namespace.h"
++#include "nmv-safe-ptr.h"
++
++namespace nemiver {
++namespace common {
++
++struct GErrorRef {
++ void operator () (GError *a_error);
++};
++
++struct GErrorUnref {
++ void operator () (GError *a_error);
++};
++
++typedef SafePtr<GError, GErrorRef, GErrorUnref> GErrorSafePtr;
++
++}//end namespace common
++}//end namespace nemiver
++#endif // __NMV_ERROR_H__
+diff --git a/src/common/nmv-ustring.cc b/src/common/nmv-ustring.cc
+index f5dfe49..076258c 100644
+--- src/common/nmv-ustring.cc
++++ src/common/nmv-ustring.cc
+@@ -30,6 +30,7 @@
+ #include "config.h"
+ #include <cstring>
+ #include <sstream>
++#include "nmv-error.h"
+ #include "nmv-ustring.h"
+ #include "nmv-safe-ptr-utils.h"
+ #include "nmv-log-stream-utils.h"
+@@ -479,21 +480,6 @@ WString::assign (super_type::size_type a_n, gunichar a_c)
+ return *this;
+ }
+
+-struct GErrorRef {
+- void operator () (GError *)
+- {
+- }
+-};
+-
+-struct GErrorUnref {
+- void operator () (GError *a_err)
+- {
+- if (a_err) {
+- g_error_free (a_err);
+- }
+- }
+-};
+-
+ bool
+ wstring_to_ustring (const WString &a_wstr,
+ UString &a_ustr)
+@@ -504,7 +490,7 @@ wstring_to_ustring (const WString &a_wstr,
+ utf8_buf.reset (g_ucs4_to_utf8 (a_wstr.c_str (),
+ a_wstr.size (), &wstr_len,
+ &utf8_bytes_len, &err));
+- SafePtr<GError, GErrorRef, GErrorUnref> error;
++ GErrorSafePtr error;
+ error.reset (err);
+ if (error) {
+ LOG_ERROR ("got error conversion error: '" << error->message << "'");
+@@ -531,7 +517,7 @@ ustring_to_wstring (const UString &a_ustr,
+ &utf8_bytes_len,
+ &wstr_len,
+ &err));
+- SafePtr<GError, GErrorRef, GErrorUnref> error;
++ GErrorSafePtr error;
+ error.reset (err);
+ if (error) {
+ LOG_ERROR ("got error conversion error: '" << error->message << "'");
+diff --git a/src/confmgr/nmv-gconf-mgr.cc b/src/confmgr/nmv-gconf-mgr.cc
+index fd7ff1c..f0f97ad 100644
+--- src/confmgr/nmv-gconf-mgr.cc
++++ src/confmgr/nmv-gconf-mgr.cc
+@@ -24,6 +24,7 @@
+ */
+ #include <gconf/gconf-client.h>
+ #include "nmv-i-conf-mgr.h"
++#include "common/nmv-error.h"
+ #include "common/nmv-ustring.h"
+ #include "common/nmv-exception.h"
+ #include "common/nmv-safe-ptr-utils.h"
+@@ -92,16 +93,6 @@ public:
+
+ //static const char * NEMIVER_KEY_DIR = "/app/nemiver";
+
+-struct GErrorRef {
+- void operator () (GError *a_error) {if (a_error) {}}
+-};
+-
+-struct GErrorUnref {
+- void operator () (GError *a_error) {if (a_error) {g_error_free (a_error);}}
+-};
+-
+-typedef SafePtr<GError, GErrorRef, GErrorUnref> GErrorSafePtr;
+-
+ void
+ client_notify_func (GConfClient *a_client,
+ const char* a_key,
+--
+1.9.0
+
</ins></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomenemiverfilespatchsrcuicommonnmvterminalccdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-src-uicommon-nmv-terminal.cc.diff (0 => 121499)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-src-uicommon-nmv-terminal.cc.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-src-uicommon-nmv-terminal.cc.diff 2014-06-27 15:17:26 UTC (rev 121499)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- src/uicommon/nmv-terminal.cc.orig 2014-06-27 07:54:24.000000000 -0700
++++ src/uicommon/nmv-terminal.cc 2014-06-27 07:59:47.000000000 -0700
+@@ -143,7 +143,11 @@
+
+ vte_terminal_set_scroll_on_output (vte, TRUE);
+ vte_terminal_set_scrollback_lines (vte, 1000);
+- vte_terminal_set_emulation (vte, "xterm");
++
++// emulation support now removed from vte, xterm behavior hardcoded
++// https://bugzilla.gnome.org/show_bug.cgi?id=728900#c5
++// https://git.gnome.org/browse/vte/commit/src/vte.c?id=4e253be9282829f594c8a55ca08d1299e80e471d
++// vte_terminal_set_emulation (vte, "xterm");
+
+ widget = Glib::wrap (w);
+ THROW_IF_FAIL (widget);
</ins></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomenemiverfilespatchvte291apidiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-vte-2.91-api.diff (0 => 121499)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-vte-2.91-api.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-vte-2.91-api.diff 2014-06-27 15:17:26 UTC (rev 121499)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+From 09dad74181806895a40e749464f84ccc027b4fe6 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Fri, 16 May 2014 14:16:43 +0200
+Subject: [PATCH 2/2] 730243 Port to vte-2.91 API
+
+ * configure.ac: Build against vte-2.91.
+ * src/uicommon/nmv-terminal (init_body): Use
+ vte_terminal_set_font instead of
+ vte_terminal_set_font_from_string.
+ (init_pty): vte_terminal_set_pty expects a VtePty instead of a
+ fd. Adjust according to that.
+---
+ configure.ac | 4 ++--
+ src/uicommon/nmv-terminal.cc | 14 ++++++++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 04f5a26..272acd9 100644
+--- configure.ac
++++ configure.ac
+@@ -361,7 +361,7 @@ dnl library dependencies for the nemiver common UI module
+ DEP_UICOMMON=" gtkmm-3.0 >= $LIBGTKMM_VERSION \
+ gtk+-3.0 >= $LIBGTK_VERSION \
+ gtksourceviewmm-3.0 >= $LIBGTKSOURCEVIEWMM_VERSION \
+- vte-2.90 >= $LIBVTE_VERSION"
++ vte-2.91 >= $LIBVTE_VERSION"
+
+ PKG_CHECK_MODULES(NEMIVERUICOMMON, $DEP_UICOMMON $DEP_COMMON $DEP_MEMORYVIEW)
+ NEMIVERUICOMMON_CFLAGS="$NEMIVERUICOMMON_CFLAGS $CPPUNIT_CFLAGS"
+@@ -384,7 +384,7 @@ AC_SUBST(NEMIVERWORKBENCH_CFLAGS)
+
+ dnl library dependencies for the nemiver debug perspective plugin
+ DEP_PERSP="gtksourceviewmm-3.0 >= $LIBGTKSOURCEVIEWMM_VERSION \
+- vte-2.90 >= $LIBVTE_VERSION"
++ vte-2.91 >= $LIBVTE_VERSION"
+
+ PKG_CHECK_MODULES(NEMIVERDBGPERSP, $DEP_UICOMMON $DEP_VFS $DEP_PERSP $DEP_MEMORYVIEW $DEP_DYNAMICLAYOUT)
+ NEMIVERDBGPERSP_LIBS="$NEMIVERDBGPERSP_LIBS $CPPUNIT_LIBS"
+diff --git a/src/uicommon/nmv-terminal.cc b/src/uicommon/nmv-terminal.cc
+index 717c094..e7432c1 100644
+--- src/uicommon/nmv-terminal.cc
++++ src/uicommon/nmv-terminal.cc
+@@ -48,11 +48,13 @@
+ #include <gtkmm/menu.h>
+ #include <gtkmm/builder.h>
+ #include <gtkmm/uimanager.h>
++#include <pangomm/fontdescription.h>
+ #include <vte/vte.h>
+ #include <glib/gi18n.h>
+ #include "common/nmv-exception.h"
+ #include "common/nmv-log-stream-utils.h"
+ #include "common/nmv-env.h"
++#include "common/nmv-error.h"
+ #include "nmv-ui-utils.h"
+
+ NEMIVER_BEGIN_NAMESPACE(nemiver)
+@@ -136,7 +138,8 @@ struct Terminal::Priv {
+ THROW_IF_FAIL (vte);
+
+ // Mandatory for vte 0.14
+- vte_terminal_set_font_from_string (vte, "monospace");
++ Pango::FontDescription font_desc ("monospace");
++ vte_terminal_set_font (vte, font_desc.gobj());
+
+ vte_terminal_set_scroll_on_output (vte, TRUE);
+ vte_terminal_set_scrollback_lines (vte, 1000);
+@@ -266,7 +269,14 @@ struct Terminal::Priv {
+ THROW_IF_FAIL (slave_pty);
+ THROW_IF_FAIL (master_pty);
+
+- vte_terminal_set_pty (vte, master_pty);
++ GError *err = 0;
++ VtePty *pty = vte_pty_new_foreign_sync (master_pty, 0, &err);
++ GErrorSafePtr error (error);
++ THROW_IF_FAIL2 (!error, error->message);
++
++ vte_terminal_set_pty (vte, pty);
++ g_object_unref (pty);
++
+ return true;
+ }
+ };//end Terminal::Priv
+--
+1.9.0
+
</ins></span></pre>
</div>
</div>
</body>
</html>