[vte] Return error when compiled without g-p-h and no-fallback flag used
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] Return error when compiled without g-p-h and no-fallback flag used
- Date: Wed, 24 Mar 2010 14:47:53 +0000 (UTC)
commit 28b4c114ab963aa526a27853fd16e311f5bfc171
Author: Christian Persch <chpe gnome org>
Date: Wed Mar 24 15:46:41 2010 +0100
Return error when compiled without g-p-h and no-fallback flag used
src/pty.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/src/pty.c b/src/pty.c
index 0a94ec0..954d82e 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -1433,7 +1433,6 @@ vte_pty_initable_init (GInitable *initable,
VtePty *pty = VTE_PTY (initable);
VtePtyPrivate *priv = pty->priv;
gboolean ret = FALSE;
- GError *err = NULL;
if (cancellable != NULL) {
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
@@ -1450,6 +1449,8 @@ vte_pty_initable_init (GInitable *initable,
#ifdef VTE_USE_GNOME_PTY_HELPER
if ((priv->flags & VTE_PTY_NO_HELPER) == 0) {
+ GError *err = NULL;
+
ret = _vte_pty_open_with_helper(pty, &err);
g_assert(ret || err != NULL);
@@ -1468,6 +1469,12 @@ vte_pty_initable_init (GInitable *initable,
g_error_free(err);
/* Fall back to unix98 PTY */
}
+#else
+ if (priv->flags & VTE_PTY_NO_FALLBACK) {
+ g_set_error_literal(error, VTE_PTY_ERROR, VTE_PTY_ERROR_PTY_HELPER_FAILED,
+ "VTE compiled without GNOME PTY helper");
+ goto out;
+ }
#endif /* VTE_USE_GNOME_PTY_HELPER */
ret = _vte_pty_open_unix98(pty, error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]