From dec834684640a6495b39bf11e500d326b4ff193b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 28 Sep 2010 15:39:22 +0200 Subject: * dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it is more portable. * keyboard.c (gobble_input): Move call of xd_read_queued_messages ... (kbd_buffer_get_event): ... here. This is needed for cygwin, which has not defined SIGIO. --- src/dbusbind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dbusbind.c') diff --git a/src/dbusbind.c b/src/dbusbind.c index 93887fa990..f3a573d3bc 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -2135,7 +2135,7 @@ message arrives. */); #else Vdbus_debug = Qnil; /* We do not want to abort. */ - setenv ("DBUS_FATAL_WARNINGS", "0", 1); + putenv ("DBUS_FATAL_WARNINGS=0"); #endif Fprovide (intern_c_string ("dbusbind"), Qnil); -- cgit v1.2.3 From a79b0f2863d2222fed175f6c6b3d535590c59558 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 3 Oct 2010 11:23:07 +0200 Subject: * dbusbind.c (syms_of_dbusbind): Move putenv call ... (Fdbus_init_bus): ... here. (Bug#7113) --- src/ChangeLog | 5 +++++ src/dbusbind.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src/dbusbind.c') diff --git a/src/ChangeLog b/src/ChangeLog index e985c8f84c..156e64a1d4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-10-03 Michael Albinus + + * dbusbind.c (syms_of_dbusbind): Move putenv call ... + (Fdbus_init_bus): ... here. (Bug#7113) + 2010-10-03 Glenn Morris * buffer.c (before-change-functions, after-change-functions): diff --git a/src/dbusbind.c b/src/dbusbind.c index f3a573d3bc..460cf52364 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -854,6 +854,9 @@ This is an internal function, it shall not be used outside dbus.el. */) NULL, (void*) XHASH (bus), NULL)) XD_SIGNAL1 (build_string ("Cannot add watch functions")); + /* We do not want to abort. */ + putenv ("DBUS_FATAL_WARNINGS=0"); + /* Return. */ return Qnil; } @@ -2130,12 +2133,11 @@ message arrives. */); doc: /* If non-nil, debug messages of D-Bus bindings are raised. */); #ifdef DBUS_DEBUG Vdbus_debug = Qt; - /* We can also set environment DBUS_VERBOSE=1 in order to see more - traces. */ + /* We can also set environment variable DBUS_VERBOSE=1 in order to + see more traces. This requires libdbus-1 to be configured with + --enable-verbose-mode. */ #else Vdbus_debug = Qnil; - /* We do not want to abort. */ - putenv ("DBUS_FATAL_WARNINGS=0"); #endif Fprovide (intern_c_string ("dbusbind"), Qnil); -- cgit v1.2.3