From 4bb5a1db945eb4027279213201e91da33351fb7e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 7 Jul 2012 14:46:18 +0000
Subject: MS_SYSTEM_GETCONTACTINFO in UserInfoEx is made persistent

git-svn-id: http://svn.miranda-ng.org/main/trunk@812 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/UserInfoEx/Res/resource.h  |  2 --
 plugins/UserInfoEx/Res/resource.rc | 22 ++++++++++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'plugins/UserInfoEx/Res')

diff --git a/plugins/UserInfoEx/Res/resource.h b/plugins/UserInfoEx/Res/resource.h
index 8958ebfbb3..1419fcc501 100644
--- a/plugins/UserInfoEx/Res/resource.h
+++ b/plugins/UserInfoEx/Res/resource.h
@@ -181,9 +181,7 @@
 #define TXT_HISTORY1                    1551
 #define GROUP_STATS                     1553
 #define BTN_BROWSEDIR                   1555
-#define CHECK_OPT_GETCONTACTINFO_ENABLED 1560
 #define CHECK_OPT_AUTOTIMEZONE          1561
-#define CHECK_OPT_GETCONTACTINFO_ENABLED2 1562
 #define CHECK_OPT_SREMAIL_ENABLED       1562
 #define CHECK_OPT_SENDSMS_MENUITEMS3    1563
 #define IDNONE                          1565
diff --git a/plugins/UserInfoEx/Res/resource.rc b/plugins/UserInfoEx/Res/resource.rc
index f2dd16759e..167327e714 100644
--- a/plugins/UserInfoEx/Res/resource.rc
+++ b/plugins/UserInfoEx/Res/resource.rc
@@ -15,10 +15,8 @@
 // Neutral resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
+#pragma code_page(1251)
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -345,11 +343,9 @@ BEGIN
     GROUPBOX        "MetaContacts",STATIC_OPT_METAGROUP,3,52,303,32
     CONTROL         "Scan SubContacts for missing information",CHECK_OPT_METASCAN,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,67,290,10
-    CONTROL         "Enable extended 'GetContactInfo' module (*)",CHECK_OPT_GETCONTACTINFO_ENABLED,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,93,275,10
     CONTROL         "Enable extended 'send/receive email' service (*)",CHECK_OPT_SREMAIL_ENABLED,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,107,275,10
-    CONTROL         "Use Windows Timezone",CHECK_OPT_AUTOTIMEZONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,122,275,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,91,275,10
+    CONTROL         "Use Windows Timezone",CHECK_OPT_AUTOTIMEZONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,106,275,10
     LTEXT           "(*) Requires Miranda to be restarted.",IDC_STATIC,11,207,167,8
     PUSHBUTTON      "Reset factory defaults",BTN_OPT_RESET,209,204,95,14
 END
@@ -571,13 +567,17 @@ CURSOR_ADDGROUP         CURSOR                  "dragcopy.cur"
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_OPT_REMINDER, DIALOG
     BEGIN
         VERTGUIDE, 144
         VERTGUIDE, 290
     END
+
+    IDD_OPT_ADVANCED, DIALOG
+    BEGIN
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -586,13 +586,11 @@ END
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Deutsch (Deutschland) resources
+// German (Germany) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-#ifdef _WIN32
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -624,7 +622,7 @@ END
 //
 
 IDB_FLAGSPNG            PNG                     "flags.png"
-#endif    // Deutsch (Deutschland) resources
+#endif    // German (Germany) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
-- 
cgit v1.2.3