diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2007-12-02 16:23:40 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2007-12-02 16:23:40 +0000 |
| commit | 033b73e2e09d45b9f71596d3c88e3f237006cd64 (patch) | |
| tree | d046f730bef86a344d40e3f829223842046b427b /src/emacs.c | |
| parent | 131e41336f44d0d706329d16f4213670cb50f48a (diff) | |
| download | emacs-033b73e2e09d45b9f71596d3c88e3f237006cd64.tar.gz | |
* config.in (HAVE_DBUS): Add.
* Makefile.in: (HAVE_DBUS): Add D-Bus definitions if defined.
(ALL_CFLAGS): Add ${DBUS_CFLAGS}.
(obj): Add $(DBUS_OBJ).
(LIBES): Add $(DBUS_LIBS).
(dbusbind.o): New target.
* dbusbind.c: New file.
* emacs.c (main): Call syms_of_dbusbind when HAVE_DBUS is defined.
* keyboard.c: All D-Bus related code is wrapped by "#ifdef HAVE_DBUS".
(Qdbus_event) New Lisp symbol.
(kbd_buffer_get_event, make_lispy_event): Handle DBUS_EVENT.
(gobble_input): Call xd_read_queued_messages, reading D-Bus
messages.
(keys_of_keyboard ): Define dbus-event.
* termhooks.h (event_kind): Add DBUS_EVENT when HAVE_DBUS is defined.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c index af6a7b71423..85aa2f3a6f7 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -353,7 +353,7 @@ int fatal_error_in_progress; void (*fatal_error_signal_hook) P_ ((void)); #ifdef HAVE_GTK_AND_PTHREAD -/* When compiled with GTK and running under Gnome, multiple threads meay be +/* When compiled with GTK and running under Gnome, multiple threads may be created. Keep track of our main thread to make sure signals are delivered to it (see syssignal.h). */ @@ -1639,6 +1639,10 @@ main (argc, argv syms_of_fontset (); #endif /* MAC_OSX && HAVE_CARBON */ +#ifdef HAVE_DBUS + syms_of_dbusbind (); +#endif /* HAVE_DBUS */ + #ifdef SYMS_SYSTEM SYMS_SYSTEM; #endif |