comparison src/dbusbind.c @ 110840:eb0cb131cf06

* dbusbind.c (syms_of_dbusbind): Move putenv call ... (Fdbus_init_bus): ... here. (Bug#7113)
author Michael Albinus <michael.albinus@gmx.de>
date Sun, 03 Oct 2010 11:23:07 +0200
parents 56cf47a21830
children bec49af30c2f 7e091be752b1
comparison
equal deleted inserted replaced
110839:018f0b2e8f23 110840:eb0cb131cf06
852 xd_add_watch, 852 xd_add_watch,
853 xd_remove_watch, 853 xd_remove_watch,
854 NULL, (void*) XHASH (bus), NULL)) 854 NULL, (void*) XHASH (bus), NULL))
855 XD_SIGNAL1 (build_string ("Cannot add watch functions")); 855 XD_SIGNAL1 (build_string ("Cannot add watch functions"));
856 856
857 /* We do not want to abort. */
858 putenv ("DBUS_FATAL_WARNINGS=0");
859
857 /* Return. */ 860 /* Return. */
858 return Qnil; 861 return Qnil;
859 } 862 }
860 863
861 DEFUN ("dbus-get-unique-name", Fdbus_get_unique_name, Sdbus_get_unique_name, 864 DEFUN ("dbus-get-unique-name", Fdbus_get_unique_name, Sdbus_get_unique_name,
2128 2131
2129 DEFVAR_LISP ("dbus-debug", &Vdbus_debug, 2132 DEFVAR_LISP ("dbus-debug", &Vdbus_debug,
2130 doc: /* If non-nil, debug messages of D-Bus bindings are raised. */); 2133 doc: /* If non-nil, debug messages of D-Bus bindings are raised. */);
2131 #ifdef DBUS_DEBUG 2134 #ifdef DBUS_DEBUG
2132 Vdbus_debug = Qt; 2135 Vdbus_debug = Qt;
2133 /* We can also set environment DBUS_VERBOSE=1 in order to see more 2136 /* We can also set environment variable DBUS_VERBOSE=1 in order to
2134 traces. */ 2137 see more traces. This requires libdbus-1 to be configured with
2138 --enable-verbose-mode. */
2135 #else 2139 #else
2136 Vdbus_debug = Qnil; 2140 Vdbus_debug = Qnil;
2137 /* We do not want to abort. */
2138 putenv ("DBUS_FATAL_WARNINGS=0");
2139 #endif 2141 #endif
2140 2142
2141 Fprovide (intern_c_string ("dbusbind"), Qnil); 2143 Fprovide (intern_c_string ("dbusbind"), Qnil);
2142 2144
2143 } 2145 }