Mercurial Mercurial > beem > otr / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc/asmack-beem/beem_patches/50-fix-chatmanager.patch
author Da Risk <darisk972@gmail.com>
Mon, 24 May 2010 18:57:37 +0200
changeset 752 0e16dee2bd4c
parent 694 cffbce08906d
child 797 fbd3585af53e
permissions -rw-r--r--
use a LevelListDrawable for status icon
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
694
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     1
 
--- ../../../src/smack/org/jivesoftware/smack/ChatManager.java	2010-02-23 19:27:26.000000000 +0100
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     2
 
+++ org/jivesoftware/smack/ChatManager.java	2010-02-23 19:37:47.000000000 +0100
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     3
 
@@ -111,7 +111,9 @@
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     4
 
                     	chat = getUserChat(message.getFrom());
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     5
 
                     }
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     6
 
                 }
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     7
 
-
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     8
 
+		if (chat == null) {
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     9
 
+                	chat = getUserChat(StringUtils.parseBareAddress(message.getFrom()));
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    10
 
+		}
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    11
 
                 if(chat == null) {
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    12
 
                     chat = createChat(message);
cffbce08906d Add informations on how to build the asmack flavour for beem.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    13
 
                 }
BEEM-OTR