Changeset be98957 for protocols/skype/t

Timestamp:

2013-01-19T11:36:27Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b2dc873, e4f5ca8

Parents:

a9a6598 (diff), 69ae6f2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from vmiklos.

Location:

protocols/skype/t

Files:

• add-no-bitlbee.mock (added)
• add-no-skyped.mock (added)
• add-yes-bitlbee.mock (added)
• add-yes-skyped.mock (added)
• call-failed-bitlbee.mock (added)
• call-failed-skyped.mock (added)
• call-skyped.mock (modified) (2 diffs)
• called-no-bitlbee.mock (added)
• called-no-skyped.mock (added)
• called-yes-bitlbee.mock (added)
• called-yes-skyped.mock (added)
• groupchat-invite-bitlbee.mock (added)
• groupchat-invite-skyped.mock (added)
• groupchat-invited-bitlbee.mock (added)
• groupchat-invited-skyped.mock (added)
• info-skyped.mock (modified) (2 diffs)
• login-skyped.mock (modified) (2 diffs)
• msg-skyped.mock (modified) (2 diffs)

protocols/skype/t/call-skyped.mock

@@ -2 +2 @@
 << GROUPS 48, 49
 >> SEARCH FRIENDS
-<< USERS echo123, bob, bitlbee-skype
+<< USERS echo123, bob
 >> SET USERSTATUS ONLINE
 << USERSTATUS ONLINE
@@ -11 +11 @@
 >> GET USER bob ONLINESTATUS
 << USER bob ONLINESTATUS ONLINE
->> GET USER bitlbee-skype ONLINESTATUS
-<< USER bitlbee-skype ONLINESTATUS OFFLINE
 >> CALL bob
 << CALL 178 STATUS UNPLACED

protocols/skype/t/info-skyped.mock

@@ -2 +2 @@
 << GROUPS 48, 49
 >> SEARCH FRIENDS
-<< USERS echo123, bob, bitlbee-skype
+<< USERS echo123, bob
 >> SET USERSTATUS ONLINE
 << USERSTATUS ONLINE
@@ -11 +11 @@
 >> GET USER bob ONLINESTATUS
 << USER bob ONLINESTATUS ONLINE
->> GET USER bitlbee-skype ONLINESTATUS
-<< USER bitlbee-skype ONLINESTATUS OFFLINE
 >> GET USER bob FULLNAME
 << USER bob FULLNAME Bob

protocols/skype/t/login-skyped.mock

@@ -2 +2 @@
 << GROUPS 48, 49
 >> SEARCH FRIENDS
-<< USERS echo123, bob, bitlbee-skype
+<< USERS echo123, bob
 >> SET USERSTATUS ONLINE
 << USERSTATUS ONLINE
@@ -11 +11 @@
 >> GET USER bob ONLINESTATUS
 << USER bob ONLINESTATUS ONLINE
->> GET USER bitlbee-skype ONLINESTATUS
-<< USER bitlbee-skype ONLINESTATUS OFFLINE

protocols/skype/t/msg-skyped.mock

@@ -2 +2 @@
 << GROUPS 48, 49
 >> SEARCH FRIENDS
-<< USERS echo123, bob, bitlbee-skype
+<< USERS echo123, bob
 >> SET USERSTATUS ONLINE
 << USERSTATUS ONLINE
@@ -11 +11 @@
 >> GET USER bob ONLINESTATUS
 << USER bob ONLINESTATUS ONLINE
->> GET USER bitlbee-skype ONLINESTATUS
-<< USER bitlbee-skype ONLINESTATUS OFFLINE
 >> MESSAGE bob foo
 << CHATMESSAGE 290 STATUS SENDING