Commit a6daae7b authored by Paul Eggert's avatar Paul Eggert

Reset dbus registered buses on dump load

Problem reported by Leonard Lausen (Bug#37331).
* src/dbusbind.c: Include pdumper.h.
(syms_of_dbusbind_for_pdumper):
New function, to reset the registered buses.
(syms_of_dbusbind): Use it, fixing a TODO.
parent 636856fa
Pipeline #3098 failed with stage
in 54 minutes and 40 seconds
......@@ -26,6 +26,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#include "lisp.h"
#include "termhooks.h"
#include "keyboard.h"
#include "pdumper.h"
#include "process.h"
#ifndef DBUS_NUM_MESSAGE_TYPES
......@@ -1681,6 +1682,12 @@ init_dbusbind (void)
xputenv ("DBUS_FATAL_WARNINGS=0");
}
static void
syms_of_dbusbind_for_pdumper (void)
{
xd_registered_buses = Qnil;
}
void
syms_of_dbusbind (void)
{
......@@ -1829,13 +1836,10 @@ be called when the D-Bus reply message arrives. */);
#endif
/* Initialize internal objects. */
xd_registered_buses = Qnil;
pdumper_do_now_and_after_load (syms_of_dbusbind_for_pdumper);
staticpro (&xd_registered_buses);
// TODO: reset buses on dump load
Fprovide (intern_c_string ("dbusbind"), Qnil);
}
#endif /* HAVE_DBUS */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment