From 03dd87df0b288fd0f0f512fb0bbff29e8c00f366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Tue, 19 Jun 2012 11:06:56 +0000 Subject: Omegle sync. git-svn-id: http://svn.miranda-ng.org/main/trunk@478 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Omegle/communication.cpp | 17 ++++++++++++----- protocols/Omegle/constants.h | 3 ++- protocols/Omegle/omegle.rc | 6 +++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/protocols/Omegle/communication.cpp b/protocols/Omegle/communication.cpp index bdc5490bb1..fc3f12d5e0 100644 --- a/protocols/Omegle/communication.cpp +++ b/protocols/Omegle/communication.cpp @@ -319,8 +319,8 @@ bool Omegle_client::start() std::string data; if (this->spy_mode_) { - // Select any server but quarks, which doesn't support this (it seems) - this->server_ = get_server(true); + // get last server from list, which is for spy mode + this->server_ = servers[SIZEOF(servers)-1]; if (this->question_.empty()) { data = "&wantsspy=1"; @@ -370,9 +370,9 @@ bool Omegle_client::start() data = "[" + data + "]"; data = "&topics=" + utils::url::encode(data); } - - // Interests feature supports only Quarks server - this->server_ = "quarks"; + + // get any server but last, which is for spy mode + this->server_ = get_server(true); } } @@ -387,6 +387,13 @@ bool Omegle_client::start() parent->UpdateChat(NULL, msg); mir_free(msg); } + } else { + char str[255]; + mir_snprintf(str, sizeof(str), Translate("Connected to server %s."), server_.c_str()); + + TCHAR *msg = mir_a2t_cp(str,CP_UTF8); + parent->UpdateChat(NULL, msg); + mir_free(msg); } // Send validation diff --git a/protocols/Omegle/constants.h b/protocols/Omegle/constants.h index 8f4227100e..6f1fbda166 100644 --- a/protocols/Omegle/constants.h +++ b/protocols/Omegle/constants.h @@ -51,4 +51,5 @@ along with this program. If not, see . #define OMEGLE_REQUEST_RECAPTCHA 400 // recaptcha handling // Servers list -static const char *servers[] = {"Random", "bajor", "cardassia", "promenade", "odo-bucket", "ferengi", "quarks"}; \ No newline at end of file +//static const char *servers[] = {"Random", "bajor", "cardassia", "promenade", "odo-bucket", "ferengi", "quilt", "empok-nor", "quibbler"}; +static const char *servers[] = {"Random", "front1", "front2", "front3", "front4", "qfront1"}; \ No newline at end of file diff --git a/protocols/Omegle/omegle.rc b/protocols/Omegle/omegle.rc index 0c2bae4bcf..71fece8bba 100644 --- a/protocols/Omegle/omegle.rc +++ b/protocols/Omegle/omegle.rc @@ -167,8 +167,8 @@ IDI_OMEGLE ICON "icons/omegle.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,0,0 - PRODUCTVERSION 0,9,43,0 + FILEVERSION 0,1,0,1 + PRODUCTVERSION 0,1,0,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -189,7 +189,7 @@ BEGIN VALUE "LegalCopyright", "Copyright © 2011-12 Robert Pösel" VALUE "OriginalFilename", "omegle.dll" VALUE "ProductName", "Omegle Protocol" - VALUE "ProductVersion", "0.9.43.0" + VALUE "ProductVersion", "0.1.0.1" END END BLOCK "VarFileInfo" -- cgit v1.2.3