diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/dbusbind.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ef1d9b1d5e3..cff1f7a6431 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2009-08-25 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * dbusbind.c (Fdbus_call_method) | ||
| 4 | (Fdbus_call_method_asynchronously): Use English numeric format for | ||
| 5 | timeout values in doc string. | ||
| 6 | |||
| 1 | 2009-08-25 Kenichi Handa <handa@m17n.org> | 7 | 2009-08-25 Kenichi Handa <handa@m17n.org> |
| 2 | 8 | ||
| 3 | * lisp.h (CHAR_TABLE_REF_ASCII): New macro. | 9 | * lisp.h (CHAR_TABLE_REF_ASCII): New macro. |
diff --git a/src/dbusbind.c b/src/dbusbind.c index 9542cd2401d..d0233fdab43 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -853,7 +853,7 @@ offered by SERVICE. It must provide METHOD. | |||
| 853 | 853 | ||
| 854 | If the parameter `:timeout' is given, the following integer TIMEOUT | 854 | If the parameter `:timeout' is given, the following integer TIMEOUT |
| 855 | specifies the maximun number of milliseconds the method call must | 855 | specifies the maximun number of milliseconds the method call must |
| 856 | return. The default value is 25.000. If the method call doesn't | 856 | return. The default value is 25,000. If the method call doesn't |
| 857 | return in time, a D-Bus error is raised. | 857 | return in time, a D-Bus error is raised. |
| 858 | 858 | ||
| 859 | All other arguments ARGS are passed to METHOD as arguments. They are | 859 | All other arguments ARGS are passed to METHOD as arguments. They are |
| @@ -1061,7 +1061,7 @@ be expected. | |||
| 1061 | 1061 | ||
| 1062 | If the parameter `:timeout' is given, the following integer TIMEOUT | 1062 | If the parameter `:timeout' is given, the following integer TIMEOUT |
| 1063 | specifies the maximun number of milliseconds the method call must | 1063 | specifies the maximun number of milliseconds the method call must |
| 1064 | return. The default value is 25.000. If the method call doesn't | 1064 | return. The default value is 25,000. If the method call doesn't |
| 1065 | return in time, a D-Bus error is raised. | 1065 | return in time, a D-Bus error is raised. |
| 1066 | 1066 | ||
| 1067 | All other arguments ARGS are passed to METHOD as arguments. They are | 1067 | All other arguments ARGS are passed to METHOD as arguments. They are |