Facebook: Change some popups types

git-svn-id: http://svn.miranda-ng.org/main/trunk@17096 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 8 insertions, 8 deletions

diff --git a/protocols/FacebookRM/src/connection.cpp b/protocols/FacebookRM/src/connection.cpp
index 3845e50406..ed60abb5c5 100644
--- a/protocols/FacebookRM/src/connection.cpp
+++ b/protocols/FacebookRM/src/connection.cpp
@@ -190,13 +190,13 @@ bool FacebookProto::NegotiateConnection()
 
 	ptrA username(getStringA(FACEBOOK_KEY_LOGIN));
 	if (!username || !mir_strlen(username)) {
-		NotifyEvent(m_tszUserName, TranslateT("Please enter a username."), NULL, FACEBOOK_EVENT_CLIENT);
+		facy.client_notify(TranslateT("Please enter a username."));
 		return false;
 	}
 
 	ptrA password(getStringA(FACEBOOK_KEY_PASS));
 	if (!password || !*password) {
-		NotifyEvent(m_tszUserName, TranslateT("Please enter a password."), NULL, FACEBOOK_EVENT_CLIENT);
+		facy.client_notify(TranslateT("Please enter a password."));
 		return false;
 	}
 
diff --git a/protocols/FacebookRM/src/constants.h b/protocols/FacebookRM/src/constants.h
index 4816dffa74..42f581c755 100644
--- a/protocols/FacebookRM/src/constants.h
+++ b/protocols/FacebookRM/src/constants.h
@@ -101,7 +101,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEFAULT_EVENT_ON_THIS_DAY_ENABLE		0

 

 // Event flags

-#define FACEBOOK_EVENT_CLIENT					0x10000000 // Facebook error or info message

+#define FACEBOOK_EVENT_CLIENT					0x10000000 // Facebook client errors

 #define FACEBOOK_EVENT_NEWSFEED					0x20000000 // Facebook newsfeed (wall) message

 #define FACEBOOK_EVENT_NOTIFICATION				0x40000000 // Facebook new notification

 #define FACEBOOK_EVENT_OTHER					0x80000000 // Facebook other event (poke sent, status update, ...)

diff --git a/protocols/FacebookRM/src/events.cpp b/protocols/FacebookRM/src/events.cpp
index ce35ee55a0..9b6bb9110f 100644
--- a/protocols/FacebookRM/src/events.cpp
+++ b/protocols/FacebookRM/src/events.cpp
@@ -125,7 +125,7 @@ HWND FacebookProto::NotifyEvent(TCHAR* title, TCHAR* info, MCONTACT contact, DWO
 	}
 
 	if (FLAG_CONTAINS(flags, FACEBOOK_EVENT_CLIENT))
-		MessageBox(NULL, info, title, MB_OK | MB_ICONINFORMATION);
+		MessageBox(NULL, info, title, MB_OK | MB_ICONERROR);
 
 	return NULL;
 }
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 74e1a80d81..90e8024f78 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -627,7 +627,7 @@ int FacebookProto::OnPreCreateEvent(WPARAM, LPARAM lParam)
 INT_PTR FacebookProto::CheckNewsfeeds(WPARAM, LPARAM)
 {
 	if (!isOffline()) {
-		facy.client_notify(TranslateT("Loading wall posts..."));
+		NotifyEvent(m_tszUserName, TranslateT("Loading wall posts..."), NULL, FACEBOOK_EVENT_OTHER);
 		ForkThread(&FacebookProto::ProcessFeeds, NULL);
 	}
 	return 0;
@@ -636,7 +636,7 @@ INT_PTR FacebookProto::CheckNewsfeeds(WPARAM, LPARAM)
 INT_PTR FacebookProto::CheckFriendRequests(WPARAM, LPARAM)
 {
 	if (!isOffline()) {
-		facy.client_notify(TranslateT("Loading friendship requests..."));
+		NotifyEvent(m_tszUserName, TranslateT("Loading friendship requests..."), NULL, FACEBOOK_EVENT_OTHER);
 		ForkThread(&FacebookProto::ProcessFriendRequests, NULL);
 	}
 	return 0;
@@ -645,7 +645,7 @@ INT_PTR FacebookProto::CheckFriendRequests(WPARAM, LPARAM)
 INT_PTR FacebookProto::CheckNotifications(WPARAM, LPARAM)
 {
 	if (!isOffline()) {
-		facy.client_notify(TranslateT("Loading notifications..."));
+		NotifyEvent(m_tszUserName, TranslateT("Loading notifications..."), NULL, FACEBOOK_EVENT_OTHER);
 		ForkThread(&FacebookProto::ProcessNotifications, NULL);
 	}
 	return 0;
@@ -654,7 +654,7 @@ INT_PTR FacebookProto::CheckNotifications(WPARAM, LPARAM)
 INT_PTR FacebookProto::CheckOnThisDay(WPARAM, LPARAM)
 {
 	if (!isOffline()) {
-		facy.client_notify(TranslateT("Loading what happened on this day..."));
+		NotifyEvent(m_tszUserName, TranslateT("Loading what happened on this day..."), NULL, FACEBOOK_EVENT_OTHER);
 		ForkThread(&FacebookProto::ProcessOnThisDay, NULL);
 	}
 	return 0;