Merge remote branch 'sf_upstream/master' into upstream

* sf_upstream/master:
  * emacs-jabber-uri-handler: Renamed from xmppuri.sh.
  Add .gitignore file
  * README (XMPP URIs): Mention the ideal case.

1 files changed, 32 insertions, 8 deletions

diff --git a/jabber.texi b/jabber.texi
index 814017b..f368714 100644
--- a/jabber.texi
+++ b/jabber.texi
@@ -1536,23 +1536,47 @@ Your web browser could be made to pass such links to jabber.el, so that
 such links are actually useful and not just decoration.  How to do that
 depends on your operating system and web browser.
 
+For any of these methods, you need to make sure that you are running
+the Emacs server.  @xref{Emacs Server, , Using Emacs as a Server,
+emacs, GNU Emacs Manual}, though the simplest way to start it is to
+customize the variable @code{server-mode}.
+
+@section GNOME
+
+The jabber.el distribution contains a GConf schema which tries to set
+up handling of @samp{xmpp:} URIs.  It is installed by @samp{make
+install}.  This may or may not work, depending on your GConf
+configuration and other installed applications.  To check, try
+running:
+
+@example
+gconftool --get /desktop/gnome/url-handlers/xmpp/command
+@end example
+
+This should print something like:
+
+@example
+/usr/local/libexec/emacs-jabber-uri-handler "%s"
+@end example
+
+This setting is picked up by most GNOME or GTK based web browsers,
+including Firefox.
+
 @section Mozilla and Unix
 
-If you use a Mozilla-based web browser on a Unix-like operating system,
-follow these steps.
+If you use a Mozilla-based web browser on a Unix-like operating
+system, and the GConf method above doesn't work, you can set it up
+manually by following these steps:
 
 @enumerate
-@item
-Make sure you are running the Emacs server.  @xref{Emacs Server, , Using
-Emacs as a Server, emacs, GNU Emacs Manual}.
 
 @item
-Note the path of the @file{xmppuri.sh} file in the jabber.el
+Note the path of the @file{emacs-jabber-uri-handler} file in the jabber.el
 distribution, and make sure it is executable.
 
 @item
 Set the Mozilla preference @samp{network.protocol-handler.app.xmpp} to
-the path of @file{xmppuri.sh}.  There are two ways to do this:
+the path of @file{emacs-jabber-uri-handler}.  There are two ways to do this:
 
 @itemize
 @item
@@ -1566,7 +1590,7 @@ Open or create the file @file{user.js} in your Mozilla profile directory
 
 @example
 user_pref("network.protocol-handler.app.xmpp",
-  "@var{/path/to}/xmppuri.sh");
+  "@var{/path/to}/emacs-jabber-uri-handler");
 @end example
 
 Restart Mozilla for this change to take effect.