comparison src/dbusbind.c @ 109351:c8a969d13eda

merge trunk
author Kenichi Handa <handa@etlken>
date Fri, 09 Jul 2010 15:55:27 +0900
parents 8cfee7d2955f
children a0cffb71f267
comparison
equal deleted inserted replaced
109350:c11d07f3d731 109351:c8a969d13eda
819 } 819 }
820 820
821 DEFUN ("dbus-init-bus", Fdbus_init_bus, Sdbus_init_bus, 1, 1, 0, 821 DEFUN ("dbus-init-bus", Fdbus_init_bus, Sdbus_init_bus, 1, 1, 0,
822 doc: /* Initialize connection to D-Bus BUS. 822 doc: /* Initialize connection to D-Bus BUS.
823 This is an internal function, it shall not be used outside dbus.el. */) 823 This is an internal function, it shall not be used outside dbus.el. */)
824 (bus) 824 (Lisp_Object bus)
825 Lisp_Object bus;
826 { 825 {
827 DBusConnection *connection; 826 DBusConnection *connection;
828 827
829 /* Check parameters. */ 828 /* Check parameters. */
830 CHECK_SYMBOL (bus); 829 CHECK_SYMBOL (bus);
845 } 844 }
846 845
847 DEFUN ("dbus-get-unique-name", Fdbus_get_unique_name, Sdbus_get_unique_name, 846 DEFUN ("dbus-get-unique-name", Fdbus_get_unique_name, Sdbus_get_unique_name,
848 1, 1, 0, 847 1, 1, 0,
849 doc: /* Return the unique name of Emacs registered at D-Bus BUS. */) 848 doc: /* Return the unique name of Emacs registered at D-Bus BUS. */)
850 (bus) 849 (Lisp_Object bus)
851 Lisp_Object bus;
852 { 850 {
853 DBusConnection *connection; 851 DBusConnection *connection;
854 const char *name; 852 const char *name;
855 853
856 /* Check parameters. */ 854 /* Check parameters. */
934 "system.kernel.machine") 932 "system.kernel.machine")
935 933
936 => "i686" 934 => "i686"
937 935
938 usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &optional :timeout TIMEOUT &rest ARGS) */) 936 usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &optional :timeout TIMEOUT &rest ARGS) */)
939 (nargs, args) 937 (int nargs, register Lisp_Object *args)
940 int nargs;
941 register Lisp_Object *args;
942 { 938 {
943 Lisp_Object bus, service, path, interface, method; 939 Lisp_Object bus, service, path, interface, method;
944 Lisp_Object result; 940 Lisp_Object result;
945 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; 941 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
946 DBusConnection *connection; 942 DBusConnection *connection;
1118 => (:system 2) 1114 => (:system 2)
1119 1115
1120 -| i686 1116 -| i686
1121 1117
1122 usage: (dbus-call-method-asynchronously BUS SERVICE PATH INTERFACE METHOD HANDLER &optional :timeout TIMEOUT &rest ARGS) */) 1118 usage: (dbus-call-method-asynchronously BUS SERVICE PATH INTERFACE METHOD HANDLER &optional :timeout TIMEOUT &rest ARGS) */)
1123 (nargs, args) 1119 (int nargs, register Lisp_Object *args)
1124 int nargs;
1125 register Lisp_Object *args;
1126 { 1120 {
1127 Lisp_Object bus, service, path, interface, method, handler; 1121 Lisp_Object bus, service, path, interface, method, handler;
1128 Lisp_Object result; 1122 Lisp_Object result;
1129 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; 1123 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
1130 DBusConnection *connection; 1124 DBusConnection *connection;
1248 3, MANY, 0, 1242 3, MANY, 0,
1249 doc: /* Return for message SERIAL on the D-Bus BUS. 1243 doc: /* Return for message SERIAL on the D-Bus BUS.
1250 This is an internal function, it shall not be used outside dbus.el. 1244 This is an internal function, it shall not be used outside dbus.el.
1251 1245
1252 usage: (dbus-method-return-internal BUS SERIAL SERVICE &rest ARGS) */) 1246 usage: (dbus-method-return-internal BUS SERIAL SERVICE &rest ARGS) */)
1253 (nargs, args) 1247 (int nargs, register Lisp_Object *args)
1254 int nargs;
1255 register Lisp_Object *args;
1256 { 1248 {
1257 Lisp_Object bus, serial, service; 1249 Lisp_Object bus, serial, service;
1258 struct gcpro gcpro1, gcpro2, gcpro3; 1250 struct gcpro gcpro1, gcpro2, gcpro3;
1259 DBusConnection *connection; 1251 DBusConnection *connection;
1260 DBusMessage *dmessage; 1252 DBusMessage *dmessage;
1342 3, MANY, 0, 1334 3, MANY, 0,
1343 doc: /* Return error message for message SERIAL on the D-Bus BUS. 1335 doc: /* Return error message for message SERIAL on the D-Bus BUS.
1344 This is an internal function, it shall not be used outside dbus.el. 1336 This is an internal function, it shall not be used outside dbus.el.
1345 1337
1346 usage: (dbus-method-error-internal BUS SERIAL SERVICE &rest ARGS) */) 1338 usage: (dbus-method-error-internal BUS SERIAL SERVICE &rest ARGS) */)
1347 (nargs, args) 1339 (int nargs, register Lisp_Object *args)
1348 int nargs;
1349 register Lisp_Object *args;
1350 { 1340 {
1351 Lisp_Object bus, serial, service; 1341 Lisp_Object bus, serial, service;
1352 struct gcpro gcpro1, gcpro2, gcpro3; 1342 struct gcpro gcpro1, gcpro2, gcpro3;
1353 DBusConnection *connection; 1343 DBusConnection *connection;
1354 DBusMessage *dmessage; 1344 DBusMessage *dmessage;
1459 \(dbus-send-signal 1449 \(dbus-send-signal
1460 :session "org.gnu.Emacs" "/org/gnu/Emacs" 1450 :session "org.gnu.Emacs" "/org/gnu/Emacs"
1461 "org.gnu.Emacs.FileManager" "FileModified" "/home/albinus/.emacs") 1451 "org.gnu.Emacs.FileManager" "FileModified" "/home/albinus/.emacs")
1462 1452
1463 usage: (dbus-send-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS) */) 1453 usage: (dbus-send-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS) */)
1464 (nargs, args) 1454 (int nargs, register Lisp_Object *args)
1465 int nargs;
1466 register Lisp_Object *args;
1467 { 1455 {
1468 Lisp_Object bus, service, path, interface, signal; 1456 Lisp_Object bus, service, path, interface, signal;
1469 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; 1457 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
1470 DBusConnection *connection; 1458 DBusConnection *connection;
1471 DBusMessage *dmessage; 1459 DBusMessage *dmessage;
1801 1789
1802 `dbus-register-signal' returns an object, which can be used in 1790 `dbus-register-signal' returns an object, which can be used in
1803 `dbus-unregister-object' for removing the registration. 1791 `dbus-unregister-object' for removing the registration.
1804 1792
1805 usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARGS) */) 1793 usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARGS) */)
1806 (nargs, args) 1794 (int nargs, register Lisp_Object *args)
1807 int nargs;
1808 register Lisp_Object *args;
1809 { 1795 {
1810 Lisp_Object bus, service, path, interface, signal, handler; 1796 Lisp_Object bus, service, path, interface, signal, handler;
1811 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; 1797 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
1812 Lisp_Object uname, key, key1, value; 1798 Lisp_Object uname, key, key1, value;
1813 DBusConnection *connection; 1799 DBusConnection *connection;
1925 PATH is the D-Bus object path SERVICE is registered. INTERFACE is the 1911 PATH is the D-Bus object path SERVICE is registered. INTERFACE is the
1926 interface offered by SERVICE. It must provide METHOD. HANDLER is a 1912 interface offered by SERVICE. It must provide METHOD. HANDLER is a
1927 Lisp function to be called when a method call is received. It must 1913 Lisp function to be called when a method call is received. It must
1928 accept the input arguments of METHOD. The return value of HANDLER is 1914 accept the input arguments of METHOD. The return value of HANDLER is
1929 used for composing the returning D-Bus message. */) 1915 used for composing the returning D-Bus message. */)
1930 (bus, service, path, interface, method, handler) 1916 (Lisp_Object bus, Lisp_Object service, Lisp_Object path, Lisp_Object interface, Lisp_Object method, Lisp_Object handler)
1931 Lisp_Object bus, service, path, interface, method, handler;
1932 { 1917 {
1933 Lisp_Object key, key1, value; 1918 Lisp_Object key, key1, value;
1934 DBusConnection *connection; 1919 DBusConnection *connection;
1935 int result; 1920 int result;
1936 DBusError derror; 1921 DBusError derror;