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/10-PubSubManager-non-final.patch
author Nikita Kozlov <nikita@beem-project.com>
Sun, 16 Jan 2011 12:44:59 +0100
changeset 854 30d32b73be7c
parent 800 1eefc5da624a
permissions -rw-r--r--
fix Bug #321 I have commented the PrivacyListManagerAdapter initialization because the exception came from the underneath code. Also, since the feature isn't finished (especially tested) and enabled in the gui, it will be safer.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
800
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     1
 
Index: org/jivesoftware/smackx/pubsub/PubSubManager.java
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     2
 
===================================================================
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     3
 
--- org/jivesoftware/smackx/pubsub/PubSubManager.java	(revision 11464)
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     4
 
+++ org/jivesoftware/smackx/pubsub/PubSubManager.java	(working copy)
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     5
 
@@ -41,7 +41,7 @@
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     6
 
  *
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     7
 
  * @author Robin Collier
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     8
 
  */
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     9
 
-final public class PubSubManager
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    10
 
+public class PubSubManager
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    11
 
 {
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    12
 
 	private XMPPConnection con;
1eefc5da624a Port the avatar manager on smackx.pubsub.* instead of PEPManager.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    13
 
 	private String to;
BEEM-OTR