[Tkabber-dev] r1522 - in trunk/tkabber: . plugins/roster

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Oct 17 21:47:47 MSD 2008


Author: sergei
Date: 2008-10-17 21:47:47 +0400 (Fri, 17 Oct 2008)
New Revision: 1522

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/roster/conferences.tcl
Log:
	* plugins/roster/conferences.tcl: Fixed roster push calls.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-10-17 17:16:48 UTC (rev 1521)
+++ trunk/tkabber/ChangeLog	2008-10-17 17:47:47 UTC (rev 1522)
@@ -18,6 +18,8 @@
 
 	* ckabber.tcl, ifaceck/*: Removed.
 
+	* plugins/roster/conferences.tcl: Fixed roster push calls.
+
 2008-10-11  Sergei Golovan  <sgolovan at nes.ru>
 
 	* AUTHORS: Fixed authors list.

Modified: trunk/tkabber/plugins/roster/conferences.tcl
===================================================================
--- trunk/tkabber/plugins/roster/conferences.tcl	2008-10-17 17:16:48 UTC (rev 1521)
+++ trunk/tkabber/plugins/roster/conferences.tcl	2008-10-17 17:47:47 UTC (rev 1522)
@@ -198,9 +198,10 @@
 
     foreach idx [array names bookmarks $xlib,jid,*] {
 	set jid $bookmarks($idx)
-	client:roster_push $xlib $jid $bookmarks($xlib,name,$jid) \
-			   $bookmarks($xlib,groups,$jid) \
-			   bookmark ""
+	client:roster_push $xlib $jid \
+			   -name $bookmarks($xlib,name,$jid) \
+			   -groups $bookmarks($xlib,groups,$jid) \
+			   -subscription bookmark
 	roster::override_category_and_subtype $xlib $jid conference ""
     }
 }
@@ -509,7 +510,10 @@
     set bookmarks($xlib,hasgroups,$jid) 1
 
     # TODO should we remove $jid from the roster if it is here?
-    client:roster_push $xlib $jid $name $groups bookmark ""
+    client:roster_push $xlib $jid \
+		       -name $name \
+		       -groups $groups \
+		       -subscription bookmark
     roster::override_category_and_subtype $xlib $jid conference ""
     store_bookmarks $xlib
 }
@@ -555,8 +559,10 @@
 	set store 1
     }
     if {$store} {
-	client:roster_push $xlib $jid $bookmarks($xlib,name,$jid) \
-	    $bookmarks($xlib,groups,$jid) bookmark ""
+	client:roster_push $xlib $jid \
+			   -name $bookmarks($xlib,name,$jid) \
+			   -groups $bookmarks($xlib,groups,$jid) \
+			   -subscription bookmark
 	roster::override_category_and_subtype $xlib $jid conference ""
 	store_bookmarks $xlib
     }
@@ -593,9 +599,10 @@
 
     if {![info exists bookmarks($xlib,jid,$jid)]} return
 
-    client:roster_push $xlib $jid $bookmarks($xlib,name,$jid) \
-		       $bookmarks($xlib,groups,$jid) \
-		       remove ""
+    client:roster_push $xlib $jid \
+		       -name $bookmarks($xlib,name,$jid) \
+		       -groups $bookmarks($xlib,groups,$jid) \
+		       -subscription remove
 
     catch { unset bookmarks($xlib,jid,$jid) }
     catch { unset bookmarks($xlib,name,$jid) }
@@ -635,8 +642,10 @@
 		set groups [lreplace $groups $idx $idx]
 	    }
 	    set groups [lrmdups $groups]
-	    client:roster_push $xlib $jid $bookmarks($xlib,name,$jid) \
-			       $groups bookmark ""
+	    client:roster_push $xlib $jid \
+			       -name $bookmarks($xlib,name,$jid) \
+			       -groups $groups \
+			       -subscription bookmark
 	    roster::override_category_and_subtype $xlib $jid conference ""
 	    set bookmarks($xlib,groups,$jid) $groups
 	    set store 1
@@ -666,8 +675,10 @@
 	if {(([llength $groups] == 1) && [lcontain $groups $name]) || \
 		(($name == $roster::undef_group_name) && ($groups == {}))} {
 	    
-	    client:roster_push $xlib $jid $bookmarks($xlib,name,$jid) \
-			       $groups remove ""
+	    client:roster_push $xlib $jid \
+			       -name $bookmarks($xlib,name,$jid) \
+			       -groups $groups \
+			       -subscription remove
 
 	    catch { unset bookmarks($xlib,jid,$jid) }
 	    catch { unset bookmarks($xlib,name,$jid) }
@@ -681,8 +692,10 @@
 	    set idx [lsearch -exact $groups $name]
 	    set groups [lreplace $groups $idx $idx]
 	    
-	    client:roster_push $xlib $jid $bookmarks($xlib,name,$jid) \
-			       $groups bookmark ""
+	    client:roster_push $xlib $jid \
+			       -name $bookmarks($xlib,name,$jid) \
+			       -groups $groups \
+			       -subscription bookmark
 	    roster::override_category_and_subtype $xlib $jid conference ""
 	    set bookmarks($xlib,groups,$jid) $groups
 	    



More information about the Tkabber-dev mailing list