From 18d8102ecb7b07663c0b052adee405ac9a75eb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Fri, 22 Aug 2014 17:40:09 +0000 Subject: SkypeClassic: Merge leecher's repo * Added possibility to set Skypeout icon in configuration as requested by user. git-svn-id: http://svn.miranda-ng.org/main/trunk@10302 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeClassic/src/skypesvc.cpp | 4 ++++ protocols/SkypeClassic/src/version.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/protocols/SkypeClassic/src/skypesvc.cpp b/protocols/SkypeClassic/src/skypesvc.cpp index df9ed9595f..4bf0de30ff 100644 --- a/protocols/SkypeClassic/src/skypesvc.cpp +++ b/protocols/SkypeClassic/src/skypesvc.cpp @@ -133,6 +133,7 @@ INT_PTR SkypeGetCaps(WPARAM wParam, LPARAM lParam) { #endif if (!db_get_b(NULL, SKYPE_PROTONAME, "NoSkype3Stats", 0)) ret |= PF2_LONGAWAY | PF2_FREECHAT; + ret |= Proto_Status2Flag(db_get_dw(NULL, SKYPE_PROTONAME, "SkypeOutStatusMode", ID_STATUS_ONTHEPHONE)); break; case PFLAGNUM_3: @@ -143,6 +144,9 @@ INT_PTR SkypeGetCaps(WPARAM wParam, LPARAM lParam) { ret = PF4_FORCEAUTH | PF4_FORCEADDED | PF4_AVATARS | PF4_SUPPORTTYPING /* Not really, but libgaim compat. */; if (mirandaVersion >= 0x070000) ret |= PF4_IMSENDUTF; break; + case PFLAGNUM_5: + ret = Proto_Status2Flag(db_get_dw(NULL, SKYPE_PROTONAME, "SkypeOutStatusMode", ID_STATUS_ONTHEPHONE)); + break; case PFLAG_UNIQUEIDTEXT: ret = (INT_PTR)Translate("Skype ID"); break; diff --git a/protocols/SkypeClassic/src/version.h b/protocols/SkypeClassic/src/version.h index 9ff41b31ce..24495eeb65 100644 --- a/protocols/SkypeClassic/src/version.h +++ b/protocols/SkypeClassic/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 0 #define __RELEASE_NUM 0 -#define __BUILD_NUM 54 +#define __BUILD_NUM 55 #include @@ -12,4 +12,4 @@ #define __AUTHOR "leecher, tweety, jls17" #define __AUTHOREMAIL "leecher@dose.0wnz.at; tweety@user.berlios.de" #define __AUTHORWEB "http://miranda-ng.org/p/SkypeClassic/" -#define __COPYRIGHT "© 2004-2012 leecher, tweety" +#define __COPYRIGHT "© 2004-2014 leecher, tweety" -- cgit v1.2.3