[Tkabber-dev] r1690 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Wed Feb 25 09:58:58 MSK 2009


Author: sergei
Date: 2009-02-25 09:58:57 +0300 (Wed, 25 Feb 2009)
New Revision: 1690

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/messages.tcl
Log:
	* messages.tcl: Added cancelling subscriptions to roster item popup
	  menu because it may be useful to unsubscribe from a contact without
	  removing it from the roster.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-02-24 06:42:30 UTC (rev 1689)
+++ trunk/tkabber/ChangeLog	2009-02-25 06:58:57 UTC (rev 1690)
@@ -1,3 +1,9 @@
+2009-02-25  Sergei Golovan  <sgolovan at nes.ru>
+
+	* messages.tcl: Added cancelling subscriptions to roster item popup
+	  menu because it may be useful to unsubscribe from a contact without
+	  removing it from the roster.
+
 2009-02-24  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/si/ibb.tcl: Fixed reporting error to the other side.

Modified: trunk/tkabber/messages.tcl
===================================================================
--- trunk/tkabber/messages.tcl	2009-02-24 06:42:30 UTC (rev 1689)
+++ trunk/tkabber/messages.tcl	2009-02-25 06:58:57 UTC (rev 1690)
@@ -917,17 +917,25 @@
     }
     set mm [menu $m.subscription -tearoff 0]
     $mm add command -label [::msgcat::mc "Request subscription"] \
-	-command [list ::xmpp::sendPresence $xlib \
-		      -to $rjid \
-		      -type subscribe]
+		    -command [list ::xmpp::sendPresence $xlib \
+					    -to $rjid \
+					    -type subscribe]
     $mm add command -label [::msgcat::mc "Grant subscription"] \
-	-command [list ::xmpp::sendPresence $xlib \
-		      -to $rjid \
-		      -type subscribed]
+		    -command [list ::xmpp::sendPresence $xlib \
+					    -to $rjid \
+					    -type subscribed]
+    $mm add command -label [::msgcat::mc "Request unsubscription"] \
+		    -command [list ::xmpp::sendPresence $xlib \
+					    -to $rjid \
+					    -type unsubscribe]
+    $mm add command -label [::msgcat::mc "Revoke subscription"] \
+		    -command [list ::xmpp::sendPresence $xlib \
+					    -to $rjid \
+					    -type unsubscribed]
 
-    $m add cascad -label [::msgcat::mc "Subscription"] \
-		  -menu $mm \
-		  -state $state
+    $m add cascade -label [::msgcat::mc "Subscription"] \
+		   -menu $mm \
+		   -state $state
 }
 
 hook::add roster_jid_popup_menu_hook message::resubscribe_menu_item 30



More information about the Tkabber-dev mailing list