From e5f74a7f7b50800e9b9bb3bdf694b8886cdeb3fc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 5 Jun 2016 16:28:41 +0000
Subject: - fix for a bug with user's profile url; - two sounds added for
 incoming messages & contacts; - version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@16920 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Twitter/src/connection.cpp | 1 +
 protocols/Twitter/src/contacts.cpp   | 4 ++--
 protocols/Twitter/src/main.cpp       | 2 +-
 protocols/Twitter/src/theme.cpp      | 5 +++++
 protocols/Twitter/src/theme.h        | 3 ++-
 protocols/Twitter/src/version.h      | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp
index 80bdf2b14d..642ccd08c3 100644
--- a/protocols/Twitter/src/connection.cpp
+++ b/protocols/Twitter/src/connection.cpp
@@ -589,6 +589,7 @@ void TwitterProto::UpdateStatuses(bool pre_read, bool popups, bool tweetToMsg)
 			if (!pre_read && popups) {
 				std::stringstream url;
 				url << std::string("https://twitter.com/") << i->username << std::string("/status/") << i->status.id;
+				SkinPlaySound("TwitterNew");
 				ShowContactPopup(hContact, i->status.text, new std::string(url.str()));
 			}
 		}
diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp
index 42f445b453..e6c2321d29 100644
--- a/protocols/Twitter/src/contacts.cpp
+++ b/protocols/Twitter/src/contacts.cpp
@@ -247,9 +247,9 @@ MCONTACT TwitterProto::AddToClientList(const char *name, const char *status)
 			setWord(hContact, "Status", ID_STATUS_ONLINE);
 			db_set_utf(hContact, "CList", "StatusMsg", status);
 
-			std::string url = profile_base_url(twit_.get_base_url()) + http::url_encode(name);
+			std::string url = profile_base_url("https://twitter.com/") + http::url_encode(name);
 			setString(hContact, "Homepage", url.c_str());
-
+			SkinPlaySound("TwitterNewContact");
 			DBVARIANT dbv;
 			if (!getTString(TWITTER_KEY_GROUP, &dbv)) {
 				db_set_ts(hContact, "CList", "Group", dbv.ptszVal);
diff --git a/protocols/Twitter/src/main.cpp b/protocols/Twitter/src/main.cpp
index f571c26857..6570b3b1ed 100644
--- a/protocols/Twitter/src/main.cpp
+++ b/protocols/Twitter/src/main.cpp
@@ -100,7 +100,7 @@ extern "C" int __declspec(dllexport) Load(void)
 
 	InitIcons();
 	InitContactMenus();
-
+	TwitterInitSounds();
 	return 0;
 }
 
diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp
index a8723f1115..a89548308a 100644
--- a/protocols/Twitter/src/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
@@ -31,6 +31,11 @@ static IconItem icons[] =
 	{ LPGEN("Visit Homepage"), "homepage", 0 }, 
 };
 
+void TwitterInitSounds(void)
+{
+SkinAddNewSoundEx("TwitterNewContact", LPGEN("Twitter"), LPGEN("TwitterNewContact"));
+SkinAddNewSoundEx("TwitterNew", LPGEN("Twitter"), LPGEN("TwitterNew"));
+}
 static HANDLE hIconLibItem[_countof(icons)];
 
 // TODO: uninit
diff --git a/protocols/Twitter/src/theme.h b/protocols/Twitter/src/theme.h
index 0ba6895014..5c54d33f7d 100644
--- a/protocols/Twitter/src/theme.h
+++ b/protocols/Twitter/src/theme.h
@@ -23,4 +23,5 @@ HANDLE GetIconHandle(const char *name);
 
 void InitContactMenus(void);
 void UninitContactMenus(void);
-void ShowContactMenus(bool show);
\ No newline at end of file
+void ShowContactMenus(bool show);
+void TwitterInitSounds(void);
\ No newline at end of file
diff --git a/protocols/Twitter/src/version.h b/protocols/Twitter/src/version.h
index 9776a81b61..7d252b490a 100644
--- a/protocols/Twitter/src/version.h
+++ b/protocols/Twitter/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION            1
 #define __MINOR_VERSION            3
 #define __RELEASE_NUM              0
-#define __BUILD_NUM                1
+#define __BUILD_NUM                2
 
 #include <stdver.h>
 
-- 
cgit v1.2.3