emacs-jabber jabber-bookmarks.el,1.10,1.11

[Evgenii T. <evg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32209

Modified Files:
	jabber-bookmarks.el 
Log Message:
jabber-get-bookmarks-from-cache returns a list of bookmarks, or t if
there is no bookmarks, or nil if there is no cache at all. So we need
to check whether we really have a list of bookmarks before calling
jabber-get-conference-data-internal.


Index: jabber-bookmarks.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-bookmarks.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jabber-bookmarks.el	18 May 2008 12:13:57 -0000	1.10
+++ jabber-bookmarks.el	31 May 2008 08:49:31 -0000	1.11
@@ -38,10 +38,10 @@
 result as arguments.  If CONT is nil, return the requested data
 immediately, and return nil if it is not in the cache."
   (if (null cont)
-      (jabber-get-conference-data-internal
-       (jabber-get-bookmarks-from-cache jc)
-       conference-jid
-       key)
+      (let ((cache (jabber-get-bookmarks-from-cache jc)))
+       (if (and cache (listp cache))
+        (jabber-get-conference-data-internal
+         cache conference-jid key)))
     (jabber-get-bookmarks 
      jc
      (lexical-let ((conference-jid conference-jid)