HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-23T17:06:58Z!eliz@gnu.org
[bpt/emacs.git]
/
src
/
dbusbind.c
diff --git
a/src/dbusbind.c
b/src/dbusbind.c
index
f63f294
..
863f763
100644
(file)
--- a/
src/dbusbind.c
+++ b/
src/dbusbind.c
@@
-1,5
+1,5
@@
/* Elisp bindings for D-Bus.
/* Elisp bindings for D-Bus.
- Copyright (C) 2007-201
2
Free Software Foundation, Inc.
+ Copyright (C) 2007-201
3
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-21,7
+21,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_DBUS
#include <stdio.h>
#include <dbus/dbus.h>
#ifdef HAVE_DBUS
#include <stdio.h>
#include <dbus/dbus.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "frame.h"
#include "termhooks.h"
#include "lisp.h"
#include "frame.h"
#include "termhooks.h"
@@
-32,6
+32,14
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define DBUS_NUM_MESSAGE_TYPES 5
#endif
#define DBUS_NUM_MESSAGE_TYPES 5
#endif
+
+/* Some platforms define the symbol "interface", but we want to use it
+ * as a variable name below. */
+
+#ifdef interface
+#undef interface
+#endif
+
\f
/* Subroutines. */
static Lisp_Object Qdbus_init_bus;
\f
/* Subroutines. */
static Lisp_Object Qdbus_init_bus;
@@
-70,7
+78,7
@@
static Lisp_Object QCdbus_registered_signal;
static Lisp_Object xd_registered_buses;
/* Whether we are reading a D-Bus event. */
static Lisp_Object xd_registered_buses;
/* Whether we are reading a D-Bus event. */
-static
int
xd_in_read_queued_messages = 0;
+static
bool
xd_in_read_queued_messages = 0;
\f
/* We use "xd_" and "XD_" as prefix for all internal symbols, because
\f
/* We use "xd_" and "XD_" as prefix for all internal symbols, because
@@
-291,8
+299,8
@@
xd_symbol_to_dbus_type (Lisp_Object object)
} \
} while (0)
} \
} while (0)
-#if (HAVE_DBUS_VALIDATE_BUS_NAME || HAVE_DBUS_VALIDATE_PATH \
- ||
XD_DBUS_VALIDATE_OBJECT
|| HAVE_DBUS_VALIDATE_MEMBER)
+#if (HAVE_DBUS_VALIDATE_BUS_NAME || HAVE_DBUS_VALIDATE_PATH
\
+ ||
HAVE_DBUS_VALIDATE_INTERFACE
|| HAVE_DBUS_VALIDATE_MEMBER)
#define XD_DBUS_VALIDATE_OBJECT(object, func) \
do { \
if (!NILP (object)) \
#define XD_DBUS_VALIDATE_OBJECT(object, func) \
do { \
if (!NILP (object)) \
@@
-997,8
+1005,7
@@
xd_find_watch_fd (DBusWatch *watch)
}
/* Prototype. */
}
/* Prototype. */
-static void
-xd_read_queued_messages (int fd, void *data, int for_read);
+static void xd_read_queued_messages (int fd, void *data);
/* Start monitoring WATCH for possible I/O. */
static dbus_bool_t
/* Start monitoring WATCH for possible I/O. */
static dbus_bool_t
@@
-1196,7
+1203,7
@@
this connection to those buses. */)
xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses);
/* We do not want to abort. */
xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses);
/* We do not want to abort. */
-
putenv ((char *)
"DBUS_FATAL_WARNINGS=0");
+
xputenv (
"DBUS_FATAL_WARNINGS=0");
/* Cleanup. */
dbus_error_free (&derror);
/* Cleanup. */
dbus_error_free (&derror);
@@
-1686,7
+1693,7
@@
xd_read_message (Lisp_Object bus)
/* Callback called when something is ready to read or write. */
static void
/* Callback called when something is ready to read or write. */
static void
-xd_read_queued_messages (int fd, void *data
, int for_read
)
+xd_read_queued_messages (int fd, void *data)
{
Lisp_Object busp = xd_registered_buses;
Lisp_Object bus = Qnil;
{
Lisp_Object busp = xd_registered_buses;
Lisp_Object bus = Qnil;