diff options
Diffstat (limited to 'protocols/Gadu-Gadu/src/groupchat.cpp')
| -rw-r--r-- | protocols/Gadu-Gadu/src/groupchat.cpp | 30 | 
1 files changed, 15 insertions, 15 deletions
diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 52d5399ef8..29f3e39abc 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -58,7 +58,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot)  {
  	if (gc_enabled) {
  		CMenuItem mi;
 -		mi.flags = CMIF_TCHAR;
 +		mi.flags = CMIF_UNICODE;
  		mi.root = hRoot;
  		// Conferencing
 @@ -128,7 +128,7 @@ int GGPROTO::gc_event(WPARAM, LPARAM lParam)  	// Window terminated (Miranda exit)
  	if (gch->pDest->iType == SESSION_TERMINATE)
  	{
 -		debugLog(L"gc_event(): Terminating chat %x, id %s from chat window...", chat, gch->pDest->ptszID);
 +		debugLogW(L"gc_event(): Terminating chat %x, id %s from chat window...", chat, gch->pDest->ptszID);
  		// Destroy chat entry
  		free(chat->recipients);
  		list_remove(&chats, chat, 1);
 @@ -137,7 +137,7 @@ int GGPROTO::gc_event(WPARAM, LPARAM lParam)  		for (MCONTACT hContact = db_find_first(); hContact; ) {
  			MCONTACT hNext = db_find_next(hContact);
  			DBVARIANT dbv;
 -			if (!getTString(hContact, "ChatRoomID", &dbv)) {
 +			if (!getWString(hContact, "ChatRoomID", &dbv)) {
  				if (dbv.ptszVal && !mir_wstrcmp(gch->pDest->ptszID, dbv.ptszVal))
  					CallService(MS_DB_CONTACT_DELETE, hContact, 0);
  				db_free(&dbv);
 @@ -158,7 +158,7 @@ int GGPROTO::gc_event(WPARAM, LPARAM lParam)  		gce.ptszUID = id;
  		gce.ptszText = gch->ptszText;
  		wchar_t* nickT;
 -		if (!getTString(GG_KEY_NICK, &dbv)){
 +		if (!getWString(GG_KEY_NICK, &dbv)){
  			nickT = mir_wstrdup(dbv.ptszVal);
  			db_free(&dbv);
  		}
 @@ -173,7 +173,7 @@ int GGPROTO::gc_event(WPARAM, LPARAM lParam)  		gce.time = time(NULL);
  		gce.bIsMe = 1;
  		gce.dwFlags = GCEF_ADDTOLOG;
 -		debugLog(L"gc_event(): Sending conference message to room %s, \"%s\".", gch->pDest->ptszID, gch->ptszText);
 +		debugLogW(L"gc_event(): Sending conference message to room %s, \"%s\".", gch->pDest->ptszID, gch->ptszText);
  		CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);
  		mir_free(nickT);
 @@ -191,7 +191,7 @@ int GGPROTO::gc_event(WPARAM, LPARAM lParam)  		if ((uin = _wtoi(gch->ptszUID)) && (hContact = getcontact(uin, 1, 0, NULL)))
  			CallService(MS_MSG_SENDMESSAGE, hContact, 0);
  	}
 -	debugLog(L"gc_event(): Unhandled event %d, chat %x, uin %d, text \"%s\".", gch->pDest->iType, chat, uin, gch->ptszText);
 +	debugLogW(L"gc_event(): Unhandled event %d, chat %x, uin %d, text \"%s\".", gch->pDest->iType, chat, uin, gch->ptszText);
  	return 0;
  }
 @@ -246,9 +246,9 @@ wchar_t* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_cou  			if (found == recipients_count)
  			{
  				if (chat->ignore)
 -					debugLog(L"gc_getchat(): Ignoring existing id %s, size %d.", chat->id, chat->recipients_count);
 +					debugLogW(L"gc_getchat(): Ignoring existing id %s, size %d.", chat->id, chat->recipients_count);
  				else
 -					debugLog(L"gc_getchat(): Returning existing id %s, size %d.", chat->id, chat->recipients_count);
 +					debugLogW(L"gc_getchat(): Returning existing id %s, size %d.", chat->id, chat->recipients_count);
  				return !(chat->ignore) ? chat->id : NULL;
  			}
  		}
 @@ -295,7 +295,7 @@ wchar_t* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_cou  			for(; i < recipients_count; i++)
  				chat->recipients[i] = recipients[i];
  			if (sender) chat->recipients[i] = sender;
 -			debugLog(L"gc_getchat(): Ignoring new chat %s, count %d.", chat->id, chat->recipients_count);
 +			debugLogW(L"gc_getchat(): Ignoring new chat %s, count %d.", chat->id, chat->recipients_count);
  			list_add(&chats, chat, 0);
  			return NULL;
  		}
 @@ -330,7 +330,7 @@ wchar_t* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_cou  	// Create new room
  	if (CallServiceSync(MS_GC_NEWSESSION, 0, (LPARAM) &gcwindow)) {
 -		debugLog(L"gc_getchat(): Cannot create new chat window %s.", chat->id);
 +		debugLogW(L"gc_getchat(): Cannot create new chat window %s.", chat->id);
  		free(name);
  		free(chat);
  		return NULL;
 @@ -353,7 +353,7 @@ wchar_t* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_cou  		UIN2IDT(uin, id);
  		wchar_t* nickT;
 -		if (!getTString(GG_KEY_NICK, &dbv)) {
 +		if (!getWString(GG_KEY_NICK, &dbv)) {
  			nickT = mir_wstrdup(dbv.ptszVal);
  			db_free(&dbv);
  		} else {
 @@ -364,7 +364,7 @@ wchar_t* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_cou  		gce.bIsMe = 1;
  		CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);
  		mir_free(nickT);
 -		debugLog(L"gc_getchat(): Myself %s: %s (%s) to the list...", gce.ptszUID, gce.ptszNick, gce.ptszStatus);
 +		debugLogW(L"gc_getchat(): Myself %s: %s (%s) to the list...", gce.ptszUID, gce.ptszNick, gce.ptszStatus);
  	}
  	else debugLogA("gc_getchat(): Myself adding failed with uin %d !!!", uin);
 @@ -386,14 +386,14 @@ wchar_t* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_cou  			gce.ptszNick = TranslateT("'Unknown'");
  		gce.bIsMe = 0;
  		gce.dwFlags = 0;
 -		debugLog(L"gc_getchat(): Added %s: %s (%s) to the list...", gce.ptszUID, gce.ptszNick, gce.ptszStatus);
 +		debugLogW(L"gc_getchat(): Added %s: %s (%s) to the list...", gce.ptszUID, gce.ptszNick, gce.ptszStatus);
  		CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);
  	}
  	gcd.iType = GC_EVENT_CONTROL;
  	CallServiceSync(MS_GC_EVENT, SESSION_INITDONE, (LPARAM)&gce);
  	CallServiceSync(MS_GC_EVENT, SESSION_ONLINE, (LPARAM)&gce);
 -	debugLog(L"gc_getchat(): Returning new chat window %s, count %d.", chat->id, chat->recipients_count);
 +	debugLogW(L"gc_getchat(): Returning new chat window %s, count %d.", chat->id, chat->recipients_count);
  	list_add(&chats, chat, 0);
  	return chat->id;
  }
 @@ -641,7 +641,7 @@ int GGPROTO::gc_changenick(MCONTACT hContact, wchar_t *ptszNick)  					gce.ptszUID = id;
  					gce.ptszText = ptszNick;
 -					debugLog(L"gc_changenick(): Found room %s with uin %d, sending nick change %s.", chat->id, uin, id);
 +					debugLogW(L"gc_changenick(): Found room %s with uin %d, sending nick change %s.", chat->id, uin, id);
  					CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);
  					break;
  | 
