merge with trunk

20 files changed, 33 insertions, 25 deletions

diff --git a/langpacks/german/Plugins/Clist_modern.txt b/langpacks/german/Plugins/Clist_modern.txt
index 6d39d7eec8..55c8a8e4ab 100644
--- a/langpacks/german/Plugins/Clist_modern.txt
+++ b/langpacks/german/Plugins/Clist_modern.txt
@@ -748,7 +748,7 @@ Kontoname
 [Rate]

 Priorität

 [Last online]

-

+Zuletzt online

 [-Nothing-]

 -Nichts-

 [Hide to tray]

diff --git a/langpacks/german/Plugins/CurrencyRates.txt b/langpacks/german/Plugins/CurrencyRates.txt
index 25ca0ad80a..bd8a335d65 100644
--- a/langpacks/german/Plugins/CurrencyRates.txt
+++ b/langpacks/german/Plugins/CurrencyRates.txt
@@ -105,7 +105,7 @@ In &Kontaktliste anzeigen als:
 [&Tendency:]
 &Tendenz:
 [&Personal key:]
-
+&Persönlicher Schlüssel:
 [&Advanced Settings...]
 Erweiterte &Einstellungen...
 [Rate Info]
@@ -205,7 +205,7 @@ Währungssymbol
 Netzwerk
 ;file \protocols\CurrencyRates\src\HTTPSession.cpp
 [This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
-
+Dieses Plugin benötigt einen persönlichen Schlüssel. Klicken Sie Ja, um ihn auf der Seite zu erhalten, und tragen Sie ihn dann im Einstellungsdialog ein, sonst wird dieses Plugin nicht funktionieren.
 [CurrencyRates HTTP connections]
 Currency-Rates-HTTP-Verbindungen
 ;file \protocols\CurrencyRates\src\IconLib.cpp
diff --git a/langpacks/german/Plugins/Db_autobackups.txt b/langpacks/german/Plugins/Db_autobackups.txt
index 4161caf191..614de73529 100644
--- a/langpacks/german/Plugins/Db_autobackups.txt
+++ b/langpacks/german/Plugins/Db_autobackups.txt
@@ -57,9 +57,9 @@ Datenbank gesichert
 Datenbank wird gerade gesichert...

 ;file \plugins\Db_autobackups\src\main.cpp

 [Enable &AutoBackups notification]

-

+&AutoBackups-Benachrichtigung aktivieren

 [Disable &AutoBackups notification]

-

+&AutoBackups-Benachrichtigung deaktivieren

 [Miranda NG databases]

 Miranda-NG-Datenbanken

 [Compressed Miranda NG databases]

diff --git a/langpacks/german/Plugins/MsgPopup.txt b/langpacks/german/Plugins/MsgPopup.txt
index 5e30d2ff05..0790f89901 100644
--- a/langpacks/german/Plugins/MsgPopup.txt
+++ b/langpacks/german/Plugins/MsgPopup.txt
@@ -30,7 +30,7 @@ Spezielle Werte des "Timeout":\n -1 = unendlich, 0 = Standardtimeoutwert
 Sound abspielen

 ;file \plugins\MsgPopup\src\main.cpp

 [MessagePopup]

-

+MessagePopup

 [Popups]

 Popups

 ;file \plugins\MsgPopup\src\options.cpp

diff --git a/langpacks/german/Plugins/NotesReminders.txt b/langpacks/german/Plugins/NotesReminders.txt
index 47c920350a..4141ed584b 100644
--- a/langpacks/german/Plugins/NotesReminders.txt
+++ b/langpacks/german/Plugins/NotesReminders.txt
@@ -55,7 +55,7 @@ Datum
 [Time]

 Zeit

 [Repeat each day]

-

+Täglich wiederholen

 [Reminder Note:]

 Erinnerungsnotiz:

 [None]

diff --git a/langpacks/german/Plugins/UInfoEx.txt b/langpacks/german/Plugins/UInfoEx.txt
index 84a51d037f..1fa2e4fa03 100644
--- a/langpacks/german/Plugins/UInfoEx.txt
+++ b/langpacks/german/Plugins/UInfoEx.txt
@@ -1053,9 +1053,9 @@ Gymnasium
 [University]

 Universität

 [Past Work Place]

-

+Ehemaliger Arbeitsplatz

 [Past Organization]

-

+Ehemalige Organisation

 [Single]

 Single

 [Close relationships]

diff --git a/langpacks/german/Untranslated/Clist_modern.txt b/langpacks/german/Untranslated/Clist_modern.txt
deleted file mode 100644
index 9551e7ec34..0000000000
--- a/langpacks/german/Untranslated/Clist_modern.txt
+++ /dev/null
@@ -1 +0,0 @@
-[Last online]
diff --git a/langpacks/german/Untranslated/CurrencyRates.txt b/langpacks/german/Untranslated/CurrencyRates.txt
deleted file mode 100644
index 3edda1efe8..0000000000
--- a/langpacks/german/Untranslated/CurrencyRates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[&Personal key:]
-[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
diff --git a/langpacks/german/Untranslated/Db_autobackups.txt b/langpacks/german/Untranslated/Db_autobackups.txt
deleted file mode 100644
index fd5e343b5c..0000000000
--- a/langpacks/german/Untranslated/Db_autobackups.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[Enable &AutoBackups notification]
-[Disable &AutoBackups notification]
diff --git a/langpacks/german/Untranslated/MsgPopup.txt b/langpacks/german/Untranslated/MsgPopup.txt
deleted file mode 100644
index 0ea2ff0ae7..0000000000
--- a/langpacks/german/Untranslated/MsgPopup.txt
+++ /dev/null
@@ -1 +0,0 @@
-[MessagePopup]

diff --git a/langpacks/german/Untranslated/NotesReminders.txt b/langpacks/german/Untranslated/NotesReminders.txt
deleted file mode 100644
index d556187530..0000000000
--- a/langpacks/german/Untranslated/NotesReminders.txt
+++ /dev/null
@@ -1 +0,0 @@
-[Repeat each day]

diff --git a/langpacks/german/Untranslated/UInfoEx.txt b/langpacks/german/Untranslated/UInfoEx.txt
deleted file mode 100644
index 69c6e6cb14..0000000000
--- a/langpacks/german/Untranslated/UInfoEx.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[Past Work Place]

-[Past Organization]

diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.h b/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.h
index 3f9f2bbc3c..bd94745e5e 100644
--- a/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.h
+++ b/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.h
@@ -82,7 +82,7 @@ private:
 	DWORD	m_dwLastScroll = 0;

 

 	list<CLogEntry*> m_Entrys;

-	CLCDBar			*m_pScrollbar;

+	CLCDBar *m_pScrollbar = nullptr;

 };

 

 #endif

diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp
index 0ec823f2e6..eedbfd316d 100755
--- a/plugins/Msg_Export/src/FileViewer.cpp
+++ b/plugins/Msg_Export/src/FileViewer.cpp
@@ -749,6 +749,7 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam,
 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 		pclDlg = (CLHistoryDlg *)lParam;

 

+		Window_SetIcon_IcoLib(hwndDlg, iconList[0].hIcolib);

 		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_EXPORT_MESSAGE)));

 		{

 			HWND hRichEdit = GetDlgItem(hwndDlg, IDC_RICHEDIT);

@@ -824,6 +825,7 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam,
 	case WM_DESTROY:

 		Utils_SaveWindowPosition(hwndDlg, pclDlg->hContact, MODULENAME, szFileViewDB);

 		WindowList_Remove(hInternalWindowList, hwndDlg);

+		Window_FreeIcon_IcoLib(hwndDlg);

 		return 0;

 

 	case WM_SYSCOMMAND:

diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp
index 5337cb88e0..2273804ae6 100755
--- a/plugins/Msg_Export/src/main.cpp
+++ b/plugins/Msg_Export/src/main.cpp
@@ -22,6 +22,11 @@ CMPlugin g_plugin;
 

 MWindowList hInternalWindowList = nullptr;

 

+IconItem iconList[] =

+{

+	{ "Main icon", "main", IDI_EXPORT_MESSAGE },

+};

+

 /////////////////////////////////////////////////////

 // Remember to update the Version in the resource !!!

 /////////////////////////////////////////////////////

@@ -108,7 +113,7 @@ int MainInit(WPARAM /*wparam*/, LPARAM /*lparam*/)
 	if (!g_bReplaceHistory) {

 		CMenuItem mi(&g_plugin);

 		SET_UID(mi, 0x701c543, 0xd078, 0x41dd, 0x95, 0xe3, 0x96, 0x49, 0x8a, 0x72, 0xc7, 0x50);

-		mi.hIcolibItem = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_EXPORT_MESSAGE));

+		mi.hIcolibItem = iconList[0].hIcolib;

 		mi.position = 1000090100;

 		mi.name.a = LPGEN("Open E&xported History");

 		mi.pszService = MS_SHOW_EXPORT_HISTORY;

@@ -134,6 +139,8 @@ int MainInit(WPARAM /*wparam*/, LPARAM /*lparam*/)
 

 int CMPlugin::Load()

 {

+	registerIcon(MODULENAME, iconList, MODULENAME);

+

 	HookEvent(ME_DB_EVENT_ADDED, nExportEvent);

 	HookEvent(ME_DB_EVENT_EDITED, nExportEvent);

 	HookEvent(ME_DB_CONTACT_DELETED, nContactDeleted);

diff --git a/plugins/Msg_Export/src/stdafx.h b/plugins/Msg_Export/src/stdafx.h
index 3b69f6885b..4648e635f6 100755
--- a/plugins/Msg_Export/src/stdafx.h
+++ b/plugins/Msg_Export/src/stdafx.h
@@ -39,6 +39,7 @@ using namespace std;
 #include <m_langpack.h>

 #include <m_netlib.h>

 #include <m_options.h>

+#include <m_icolib.h>

 #include <m_history.h>

 #include <m_userinfo.h>

 #include <m_protosvc.h>

@@ -70,5 +71,6 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 

 extern MWindowList hInternalWindowList;

 extern wstring g_sDBPath, g_sMirandaPath;

+extern IconItem iconList[];

 

 #endif
\ No newline at end of file
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index f90535beba..920ac3142e 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -1111,6 +1111,7 @@ public:
 	{

 		chkAfter.OnChange = Callback(this, &CReminderNotifyDlg::onChange_After);

 		chkOnDate.OnChange = Callback(this, &CReminderNotifyDlg::onChange_OnDate);

+		dateAgain.OnChange = Callback(this, &CReminderNotifyDlg::onChange_Date);

 

 		cmbTimeAgain.OnKillFocus = Callback(this, &CReminderNotifyDlg::onKillFocus_TimeAgain);

 		cmbRemindAgainIn.OnKillFocus = Callback(this, &CReminderNotifyDlg::onKillFocus_RemindAgain);

diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 65fd559948..66a0ac71ef 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -93,12 +93,12 @@ static void JabberAdHoc_RefreshFrameScroll(HWND hwndDlg, JabberAdHocData * dat)
 

 void CJabberProto::OnIqResult_ListOfCommands(const TiXmlElement *iqNode, CJabberIqInfo *pInfo)

 {

-	SendMessage(GetWindowFromIq(pInfo), JAHM_COMMANDLISTRESULT, 0, (LPARAM)iqNode->DeepClone(0));

+	SendMessage(GetWindowFromIq(pInfo), JAHM_COMMANDLISTRESULT, 0, (LPARAM)iqNode);

 }

 

 void CJabberProto::OnIqResult_CommandExecution(const TiXmlElement *iqNode, CJabberIqInfo *pInfo)

 {

-	SendMessage(GetWindowFromIq(pInfo), JAHM_PROCESSRESULT, (WPARAM)iqNode->DeepClone(0), 0);

+	SendMessage(GetWindowFromIq(pInfo), JAHM_PROCESSRESULT, 0, (WPARAM)iqNode);

 }

 

 void CJabberProto::AdHoc_RequestListOfCommands(char *szResponder, HWND hwndDlg)

@@ -417,7 +417,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc(HWND hwndDlg, UINT msg, WPARA
 		return dat->proto->AdHoc_OnJAHMCommandListResult(hwndDlg, (TiXmlElement*)lParam, dat);

 

 	case JAHM_PROCESSRESULT:

-		return dat->proto->AdHoc_OnJAHMProcessResult(hwndDlg, (TiXmlElement*)wParam, dat);

+		return dat->proto->AdHoc_OnJAHMProcessResult(hwndDlg, (TiXmlElement*)lParam, dat);

 

 	case WM_MOUSEWHEEL:

 		{

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 985be14ea9..0eaf3012df 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -222,7 +222,7 @@ void CJabberProto::GcLogShowInformation(JABBER_LIST_ITEM *item, pResourceStatus
 			}

 

 			if (name)

-				buf.Format(Translate("Role of %s was changed to '%s'."), user->m_szResourceName, name);

+				buf.Format(TranslateU("Role of %s was changed to '%s'."), user->m_szResourceName, name);

 		}

 		break;

 	}

diff --git a/src/mir_app/src/ei_services.cpp b/src/mir_app/src/ei_services.cpp
index cecff12090..65cab195c6 100644
--- a/src/mir_app/src/ei_services.cpp
+++ b/src/mir_app/src/ei_services.cpp
@@ -259,7 +259,7 @@ int ClistExtraClick(WPARAM hContact, LPARAM lParam)
 HANDLE hEventExtraImageListRebuilding, hEventExtraImageApplying, hEventExtraClick;
 
 static bool bImageCreated = false;
-static HIMAGELIST hExtraImageList;
+static HIMAGELIST hExtraImageList = nullptr;
 
 MIR_APP_DLL(HANDLE) ExtraIcon_AddIcon(HICON hIcon)
 {
@@ -493,4 +493,9 @@ void UnloadExtraIconsModule(void)
 
 	for (auto &it : registeredExtraIcons)
 		delete it;
+
+	if (hExtraImageList) {
+		ImageList_Destroy(hExtraImageList);
+		hExtraImageList = nullptr;
+	}
 }