diff options
| author | Joakim Verona | 2013-05-27 23:14:19 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-05-27 23:14:19 +0200 |
| commit | 5cf62a1639c5993c1fd6b532f92325b28a13ee79 (patch) | |
| tree | d67d1c7c583947f164ee7494601d5c9decbd6b0f /src/dbusbind.c | |
| parent | 3b2a9bcfc08c74d95f46d634fadc758decb1c2b0 (diff) | |
| parent | 6ef3db10430c653e302ca5983ade6f8eaa186f85 (diff) | |
| download | emacs-5cf62a1639c5993c1fd6b532f92325b28a13ee79.tar.gz emacs-5cf62a1639c5993c1fd6b532f92325b28a13ee79.zip | |
Merge remote-tracking branch 'origin/trunk' into xwidget
Conflicts:
ChangeLog
lisp/ChangeLog
lisp/progmodes/octave.el
src/Makefile.in
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 863f7634eb5..3ec3c28431b 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -882,7 +882,7 @@ xd_retrieve_arg (int dtype, DBusMessageIter *iter) | |||
| 882 | #endif | 882 | #endif |
| 883 | { | 883 | { |
| 884 | dbus_uint32_t val; | 884 | dbus_uint32_t val; |
| 885 | unsigned int pval = val; | 885 | unsigned int pval; |
| 886 | dbus_message_iter_get_basic (iter, &val); | 886 | dbus_message_iter_get_basic (iter, &val); |
| 887 | pval = val; | 887 | pval = val; |
| 888 | XD_DEBUG_MESSAGE ("%c %u", dtype, pval); | 888 | XD_DEBUG_MESSAGE ("%c %u", dtype, pval); |