From 20efdef6653f3db4a542069f7a1382c5c3a0afe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20P=C3=B6sel?= <robyer@seznam.cz>
Date: Fri, 29 Mar 2013 18:24:05 +0000
Subject: Facebook: Fixed canceling friendship

git-svn-id: http://svn.miranda-ng.org/main/trunk@4244 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/FacebookRM/src/communication.cpp | 6 +++++-
 protocols/FacebookRM/src/contacts.cpp      | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'protocols/FacebookRM')

diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index 6f4d94a7ff..ace8c0176d 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -385,7 +385,11 @@ std::string facebook_client::choose_action( int request_type, std::string* data,
 
 	case FACEBOOK_REQUEST_DELETE_FRIEND:
 	{
-		return "/ajax/profile/removefriend.php?__a=1";
+		std::string action = "/ajax/profile/removefriendconfirm.php?__a=1";
+		if (get_data != NULL) {
+			action += *get_data;
+		}
+		return action;
 	}
 
 	case FACEBOOK_REQUEST_REQUEST_FRIEND:
diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp
index 2422c187e0..ba9107d79e 100644
--- a/protocols/FacebookRM/src/contacts.cpp
+++ b/protocols/FacebookRM/src/contacts.cpp
@@ -185,13 +185,15 @@ void FacebookProto::DeleteContactFromServer(void *data)
 	std::string id = (*(std::string*)data);
 	delete data;
 	
-	std::string query = "norefresh=false&lsd=";
+	std::string query = "norefresh=true&unref=button_dropdown&confirmed=1&phstamp=0&__a=1";
 	query += "&fb_dtsg=" + facy.dtsg_;
 	query += "&uid=" + id;
 	query += "&__user=" + facy.self_.user_id;	
 
+	std::string get_query = "norefresh=true&unref=button_dropdown&uid=" + id;
+	
 	// Get unread inbox threads
-	http::response resp = facy.flap( FACEBOOK_REQUEST_DELETE_FRIEND, &query );
+	http::response resp = facy.flap( FACEBOOK_REQUEST_DELETE_FRIEND, &query, &get_query );
 
 	// Process result data
 	facy.validate_response(&resp);
-- 
cgit v1.2.3