summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikalaiR <nikolay.romanovich@narod.ru>2015-05-02 16:35:00 +0000
committerMikalaiR <nikolay.romanovich@narod.ru>2015-05-02 16:35:00 +0000
commitf60c0cb263b460be9eb87b9e0f78d81c3a6c305a (patch)
tree5210abe0c4bc8e0ccadac6ef9902f76007b0034b
parentddace4b7aeb7bb5b9008fa6879696b3443fe6a98 (diff)
SkypeWeb: Small fix.
git-svn-id: http://svn.miranda-ng.org/main/trunk@13377 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/SkypeWeb/src/skype_icons.cpp12
-rw-r--r--protocols/SkypeWeb/src/skype_poll_processing.cpp5
2 files changed, 10 insertions, 7 deletions
diff --git a/protocols/SkypeWeb/src/skype_icons.cpp b/protocols/SkypeWeb/src/skype_icons.cpp
index 41852bcd7f..0a01349389 100644
--- a/protocols/SkypeWeb/src/skype_icons.cpp
+++ b/protocols/SkypeWeb/src/skype_icons.cpp
@@ -19,12 +19,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
IconInfo CSkypeProto::Icons[] =
{
- { LPGENT("Protocol icon"), "main", IDI_SKYPE },
- { LPGENT("Create new chat icon"), "conference", IDI_CONFERENCE },
- { LPGENT("Sync history icon"), "synchistory", IDI_SYNCHISTORY},
- { LPGENT("Block user icon"), "user_block", IDI_BLOCKUSER },
- { LPGENT("Unblock user icon"), "user_unblock", IDI_UNBLOCKUSER },
- { LPGENT("Incoming call icon"), "inc_call", IDI_CALL }
+ { LPGENT("Protocol icon"), "main", IDI_SKYPE },
+ { LPGENT("Create new chat icon"), "conference", IDI_CONFERENCE },
+ { LPGENT("Sync history icon"), "synchistory", IDI_SYNCHISTORY },
+ { LPGENT("Block user icon"), "user_block", IDI_BLOCKUSER },
+ { LPGENT("Unblock user icon"), "user_unblock", IDI_UNBLOCKUSER },
+ { LPGENT("Incoming call icon"), "inc_call", IDI_CALL }
};
void CSkypeProto::InitIcons()
{
diff --git a/protocols/SkypeWeb/src/skype_poll_processing.cpp b/protocols/SkypeWeb/src/skype_poll_processing.cpp
index e6a46d531c..e2a51baf6f 100644
--- a/protocols/SkypeWeb/src/skype_poll_processing.cpp
+++ b/protocols/SkypeWeb/src/skype_poll_processing.cpp
@@ -24,7 +24,10 @@ void CSkypeProto::ProcessEndpointPresenceRes(JSONNODE *node)
ptrA skypename(ContactUrlToName(selfLink));
if (skypename == NULL)
return;
- MCONTACT hContact = AddContact(skypename, true);
+
+ MCONTACT hContact = NULL;
+ if (!IsMe(skypename))
+ hContact = AddContact(skypename, true);
//"publicInfo":{"capabilities":"","typ":"11","skypeNameVersion":"0/7.1.0.105//","nodeInfo":"","version":"24"}
JSONNODE *publicInfo = json_get(node, "publicInfo");