diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/dbusbind.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 8a6870555d0..792414b23d8 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -30,53 +30,53 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | /* Subroutines. */ | 32 | /* Subroutines. */ |
| 33 | Lisp_Object Qdbus_init_bus; | 33 | static Lisp_Object Qdbus_init_bus; |
| 34 | Lisp_Object Qdbus_close_bus; | 34 | static Lisp_Object Qdbus_close_bus; |
| 35 | Lisp_Object Qdbus_get_unique_name; | 35 | static Lisp_Object Qdbus_get_unique_name; |
| 36 | Lisp_Object Qdbus_call_method; | 36 | static Lisp_Object Qdbus_call_method; |
| 37 | Lisp_Object Qdbus_call_method_asynchronously; | 37 | static Lisp_Object Qdbus_call_method_asynchronously; |
| 38 | Lisp_Object Qdbus_method_return_internal; | 38 | static Lisp_Object Qdbus_method_return_internal; |
| 39 | Lisp_Object Qdbus_method_error_internal; | 39 | static Lisp_Object Qdbus_method_error_internal; |
| 40 | Lisp_Object Qdbus_send_signal; | 40 | static Lisp_Object Qdbus_send_signal; |
| 41 | Lisp_Object Qdbus_register_service; | 41 | static Lisp_Object Qdbus_register_service; |
| 42 | Lisp_Object Qdbus_register_signal; | 42 | static Lisp_Object Qdbus_register_signal; |
| 43 | Lisp_Object Qdbus_register_method; | 43 | static Lisp_Object Qdbus_register_method; |
| 44 | 44 | ||
| 45 | /* D-Bus error symbol. */ | 45 | /* D-Bus error symbol. */ |
| 46 | Lisp_Object Qdbus_error; | 46 | static Lisp_Object Qdbus_error; |
| 47 | 47 | ||
| 48 | /* Lisp symbols of the system and session buses. */ | 48 | /* Lisp symbols of the system and session buses. */ |
| 49 | Lisp_Object QCdbus_system_bus, QCdbus_session_bus; | 49 | static Lisp_Object QCdbus_system_bus, QCdbus_session_bus; |
| 50 | 50 | ||
| 51 | /* Lisp symbol for method call timeout. */ | 51 | /* Lisp symbol for method call timeout. */ |
| 52 | Lisp_Object QCdbus_timeout; | 52 | static Lisp_Object QCdbus_timeout; |
| 53 | 53 | ||
| 54 | /* Lisp symbols for name request flags. */ | 54 | /* Lisp symbols for name request flags. */ |
| 55 | Lisp_Object QCdbus_request_name_allow_replacement; | 55 | static Lisp_Object QCdbus_request_name_allow_replacement; |
| 56 | Lisp_Object QCdbus_request_name_replace_existing; | 56 | static Lisp_Object QCdbus_request_name_replace_existing; |
| 57 | Lisp_Object QCdbus_request_name_do_not_queue; | 57 | static Lisp_Object QCdbus_request_name_do_not_queue; |
| 58 | 58 | ||
| 59 | /* Lisp symbols for name request replies. */ | 59 | /* Lisp symbols for name request replies. */ |
| 60 | Lisp_Object QCdbus_request_name_reply_primary_owner; | 60 | static Lisp_Object QCdbus_request_name_reply_primary_owner; |
| 61 | Lisp_Object QCdbus_request_name_reply_in_queue; | 61 | static Lisp_Object QCdbus_request_name_reply_in_queue; |
| 62 | Lisp_Object QCdbus_request_name_reply_exists; | 62 | static Lisp_Object QCdbus_request_name_reply_exists; |
| 63 | Lisp_Object QCdbus_request_name_reply_already_owner; | 63 | static Lisp_Object QCdbus_request_name_reply_already_owner; |
| 64 | 64 | ||
| 65 | /* Lisp symbols of D-Bus types. */ | 65 | /* Lisp symbols of D-Bus types. */ |
| 66 | Lisp_Object QCdbus_type_byte, QCdbus_type_boolean; | 66 | static Lisp_Object QCdbus_type_byte, QCdbus_type_boolean; |
| 67 | Lisp_Object QCdbus_type_int16, QCdbus_type_uint16; | 67 | static Lisp_Object QCdbus_type_int16, QCdbus_type_uint16; |
| 68 | Lisp_Object QCdbus_type_int32, QCdbus_type_uint32; | 68 | static Lisp_Object QCdbus_type_int32, QCdbus_type_uint32; |
| 69 | Lisp_Object QCdbus_type_int64, QCdbus_type_uint64; | 69 | static Lisp_Object QCdbus_type_int64, QCdbus_type_uint64; |
| 70 | Lisp_Object QCdbus_type_double, QCdbus_type_string; | 70 | static Lisp_Object QCdbus_type_double, QCdbus_type_string; |
| 71 | Lisp_Object QCdbus_type_object_path, QCdbus_type_signature; | 71 | static Lisp_Object QCdbus_type_object_path, QCdbus_type_signature; |
| 72 | #ifdef DBUS_TYPE_UNIX_FD | 72 | #ifdef DBUS_TYPE_UNIX_FD |
| 73 | Lisp_Object QCdbus_type_unix_fd; | 73 | Lisp_Object QCdbus_type_unix_fd; |
| 74 | #endif | 74 | #endif |
| 75 | Lisp_Object QCdbus_type_array, QCdbus_type_variant; | 75 | static Lisp_Object QCdbus_type_array, QCdbus_type_variant; |
| 76 | Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; | 76 | static Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; |
| 77 | 77 | ||
| 78 | /* Whether we are reading a D-Bus event. */ | 78 | /* Whether we are reading a D-Bus event. */ |
| 79 | int xd_in_read_queued_messages = 0; | 79 | static int xd_in_read_queued_messages = 0; |
| 80 | 80 | ||
| 81 | 81 | ||
| 82 | /* We use "xd_" and "XD_" as prefix for all internal symbols, because | 82 | /* We use "xd_" and "XD_" as prefix for all internal symbols, because |