fixes #1776 (remove MS_URL_SENDURL "SRUrl/SendCommand")

5 files changed, 3 insertions, 38 deletions

diff --git a/plugins/QuickContacts/res/resource.rc b/plugins/QuickContacts/res/resource.rc
index c01c88e081..dd676d7732 100644
--- a/plugins/QuickContacts/res/resource.rc
+++ b/plugins/QuickContacts/res/resource.rc
@@ -74,12 +74,11 @@ BEGIN
     CONTROL         "",IDC_MESSAGE,"MButtonClass",0x0,41,36,17,15,

                     0x18000000L

     CONTROL         "",IDC_FILE,"MButtonClass",0x0,83,36,17,15,0x18000000L

-    CONTROL         "",IDC_URL,"MButtonClass",0x0,104,36,17,15,0x18000000L

-    CONTROL         "",IDC_USERINFO,"MButtonClass",0x0,125,36,17,15,

+    CONTROL         "",IDC_USERINFO,"MButtonClass",0x0,104,36,17,15,

                     0x18000000L

-    CONTROL         "",IDC_HISTORY,"MButtonClass",0x0,146,36,17,15,

+    CONTROL         "",IDC_HISTORY,"MButtonClass",0x0,125,36,17,15,

                     0x18000000L

-    CONTROL         "",IDC_MENU,"MButtonClass",0x0,167,36,17,15,0x18000000L

+    CONTROL         "",IDC_MENU,"MButtonClass",0x0,146,36,17,15,0x18000000L

 END

 

 

@@ -117,7 +116,6 @@ BEGIN
     "H",            HOTKEY_HISTORY,         VIRTKEY, CONTROL, NOINVERT

     "I",            HOTKEY_INFO,            VIRTKEY, CONTROL, NOINVERT

     "M",            HOTKEY_MENU,            VIRTKEY, CONTROL, NOINVERT

-    "U",            HOTKEY_URL,             VIRTKEY, CONTROL, NOINVERT

 END

 

 #ifdef APSTUDIO_INVOKED

diff --git a/plugins/QuickContacts/src/dialog.cpp b/plugins/QuickContacts/src/dialog.cpp
index c01d155eac..c0f386018a 100644
--- a/plugins/QuickContacts/src/dialog.cpp
+++ b/plugins/QuickContacts/src/dialog.cpp
@@ -225,7 +225,6 @@ void EnableButtons(HWND hwndDlg, MCONTACT hContact)
 	if (hContact == NULL) {
 		EnableWindow(GetDlgItem(hwndDlg, IDC_MESSAGE), FALSE);
 		EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), FALSE);
-		EnableWindow(GetDlgItem(hwndDlg, IDC_URL), FALSE);
 		EnableWindow(GetDlgItem(hwndDlg, IDC_USERINFO), FALSE);
 		EnableWindow(GetDlgItem(hwndDlg, IDC_HISTORY), FALSE);
 		EnableWindow(GetDlgItem(hwndDlg, IDC_MENU), FALSE);
@@ -247,7 +246,6 @@ void EnableButtons(HWND hwndDlg, MCONTACT hContact)
 
 		EnableWindow(GetDlgItem(hwndDlg, IDC_MESSAGE), caps & PF1_IMSEND ? TRUE : FALSE);
 		EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), caps & PF1_FILESEND ? TRUE : FALSE);
-		EnableWindow(GetDlgItem(hwndDlg, IDC_URL), caps & PF1_URLSEND ? TRUE : FALSE);
 		EnableWindow(GetDlgItem(hwndDlg, IDC_USERINFO), TRUE);
 		EnableWindow(GetDlgItem(hwndDlg, IDC_HISTORY), TRUE);
 		EnableWindow(GetDlgItem(hwndDlg, IDC_MENU), TRUE);
@@ -518,7 +516,6 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			FillCheckbox(hwndDlg, IDC_SHOW_ALL_CONTACTS, LPGENW("Show all contacts"), NULL);
 			FillButton(hwndDlg, IDC_MESSAGE, LPGENW("Send message"), nullptr, Skin_LoadIcon(SKINICON_EVENT_MESSAGE));
 			FillButton(hwndDlg, IDC_FILE, LPGENW("Send file"), NULL, Skin_LoadIcon(SKINICON_EVENT_FILE));
-			FillButton(hwndDlg, IDC_URL, LPGENW("Send URL"), NULL, Skin_LoadIcon(SKINICON_EVENT_URL));
 			FillButton(hwndDlg, IDC_USERINFO, LPGENW("Open user info"), NULL, Skin_LoadIcon(SKINICON_OTHER_USERDETAILS));
 			FillButton(hwndDlg, IDC_HISTORY, LPGENW("Open history"), NULL, Skin_LoadIcon(SKINICON_OTHER_HISTORY));
 			FillButton(hwndDlg, IDC_MENU, LPGENW("Open contact menu"), NULL, Skin_LoadIcon(SKINICON_OTHER_DOWNARROW));
@@ -604,27 +601,6 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			}
 			break;
 
-		case HOTKEY_URL:
-		case IDC_URL:
-			{
-				MCONTACT hContact = GetSelectedContact(hwndDlg);
-				if (hContact == NULL) {
-					SetDlgItemText(hwndDlg, IDC_USERNAME, L"");
-					SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME));
-					break;
-				}
-
-				// Is button enabled?
-				if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_URL)))
-					break;
-
-				CallService(MS_URL_SENDURL, hContact, 0);
-
-				g_plugin.setDword("LastSentTo", hContact);
-				SendMessage(hwndDlg, WM_CLOSE, 0, 0);
-			}
-			break;
-
 		case HOTKEY_INFO:
 		case IDC_USERINFO:
 			{
diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp
index e6039dc83e..90d827652e 100644
--- a/plugins/QuickContacts/src/quickcontacts.cpp
+++ b/plugins/QuickContacts/src/quickcontacts.cpp
@@ -74,12 +74,6 @@ static int ModulesLoaded(WPARAM, LPARAM)
 	hkd.szDescription.w = LPGENW("Send file");

 	g_plugin.addHotkey(&hkd);

 

-	hkd.lParam = HOTKEY_URL;

-	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'U');

-	hkd.pszName = "Quick Contacts/URL";

-	hkd.szDescription.w = LPGENW("Send URL");

-	g_plugin.addHotkey(&hkd);

-

 	hkd.lParam = HOTKEY_INFO;

 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'I');

 	hkd.pszName = "Quick Contacts/Info";

diff --git a/plugins/QuickContacts/src/resource.h b/plugins/QuickContacts/src/resource.h
index 38fd6df5cb..04d0a8bb23 100644
--- a/plugins/QuickContacts/src/resource.h
+++ b/plugins/QuickContacts/src/resource.h
@@ -19,12 +19,10 @@
 #define IDC_GROUP_COLUMN                1062

 #define IDC_FILE                        1063

 #define IDC_GROUP_LEFT                  1063

-#define IDC_URL                         1064

 #define IDC_USERINFO                    1065

 #define IDC_HISTORY                     1066

 #define IDC_MENU                        1067

 #define HOTKEY_FILE                     40001

-#define HOTKEY_URL                      40002

 #define HOTKEY_INFO                     40003

 #define HOTKEY_HISTORY                  40004

 #define HOTKEY_ALL_CONTACTS             40005

diff --git a/plugins/QuickContacts/src/stdafx.h b/plugins/QuickContacts/src/stdafx.h
index a2d7392f14..88dab13406 100644
--- a/plugins/QuickContacts/src/stdafx.h
+++ b/plugins/QuickContacts/src/stdafx.h
@@ -36,7 +36,6 @@ Boston, MA 02111-1307, USA.
 #include <m_database.h>

 #include <m_button.h>

 #include <m_file.h>

-#include <m_url.h>

 #include <m_history.h>

 #include <m_icolib.h>

 #include <m_hotkeys.h>