diff options
| author | Michael Albinus | 2009-07-25 08:31:40 +0000 |
|---|---|---|
| committer | Michael Albinus | 2009-07-25 08:31:40 +0000 |
| commit | 51768bc824113d16e71d4b6e5e268dc0cec8ec1f (patch) | |
| tree | ae5c8c64ec73f06089deb92ef1dd1aefe9ff6305 | |
| parent | 573794ef4280283d7a9df400aa9af52c72286120 (diff) | |
| download | emacs-51768bc824113d16e71d4b6e5e268dc0cec8ec1f.tar.gz emacs-51768bc824113d16e71d4b6e5e268dc0cec8ec1f.zip | |
* net/zeroconf.el (zeroconf-init): Check for "GetVersionString"
instead of "IsNSSSupportAvailable". Avahi ought to work also when
"IsNSSSupportAvailable" method is not available. Reported by
Steve Youngs <steve@sxemacs.org>.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/net/zeroconf.el | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8faa47ed783..62f6c8e0c89 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2009-07-25 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/zeroconf.el (zeroconf-init): Check for "GetVersionString" | ||
| 4 | instead of "IsNSSSupportAvailable". Avahi ought to work also when | ||
| 5 | "IsNSSSupportAvailable" method is not available. Reported by | ||
| 6 | Steve Youngs <steve@sxemacs.org>. | ||
| 7 | |||
| 1 | 2009-07-24 Kenichi Handa <handa@m17n.org> | 8 | 2009-07-24 Kenichi Handa <handa@m17n.org> |
| 2 | 9 | ||
| 3 | * international/characters.el: Fix setting of category ?C, ?|, ?K, | 10 | * international/characters.el: Fix setting of category ?C, ?|, ?K, |
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el index 972ff88bb69..e6339776a65 100644 --- a/lisp/net/zeroconf.el +++ b/lisp/net/zeroconf.el | |||
| @@ -482,7 +482,7 @@ DOMAIN is nil, the local domain is used." | |||
| 482 | (dbus-ping :system zeroconf-service-avahi) | 482 | (dbus-ping :system zeroconf-service-avahi) |
| 483 | (dbus-call-method | 483 | (dbus-call-method |
| 484 | :system zeroconf-service-avahi zeroconf-path-avahi | 484 | :system zeroconf-service-avahi zeroconf-path-avahi |
| 485 | zeroconf-interface-avahi-server "IsNSSSupportAvailable")) | 485 | zeroconf-interface-avahi-server "GetVersionString")) |
| 486 | 486 | ||
| 487 | ;; Reset all stored values. | 487 | ;; Reset all stored values. |
| 488 | (setq zeroconf-path-avahi-service-type-browser nil | 488 | (setq zeroconf-path-avahi-service-type-browser nil |