[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100080: * dbusbind.c (syms_of_dbusbind): Move putenv call ...

[Michael Albinus]

------------------------------------------------------------
revno: 100080
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-10-03 11:23:07 +0200
message:
  * dbusbind.c (syms_of_dbusbind): Move putenv call ...
  (Fdbus_init_bus): ... here.  (Bug#7113)
modified:
  src/ChangeLog
  src/dbusbind.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-03 01:23:50 +0000
+++ b/src/ChangeLog     2010-10-03 09:23:07 +0000
@@ -1,3 +1,8 @@
+2010-10-03  Michael Albinus  <address@hidden>
+
+       * dbusbind.c (syms_of_dbusbind): Move putenv call ...
+       (Fdbus_init_bus): ... here.  (Bug#7113)
+
 2010-10-03  Glenn Morris  <address@hidden>
 
        * buffer.c (before-change-functions, after-change-functions):

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2010-09-28 13:39:22 +0000
+++ b/src/dbusbind.c    2010-10-03 09:23:07 +0000
@@ -854,6 +854,9 @@
                                            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 @@
     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);