diff options
| author | watcherhd <watcherhd@e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb> | 2012-02-01 14:22:03 +0000 |
|---|---|---|
| committer | watcherhd <watcherhd@e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb> | 2012-02-01 14:22:03 +0000 |
| commit | b164d030ace150aa292e8009d2d55c05005072b0 (patch) | |
| tree | b13cae024ab290376571d4516b1905dc08c77053 | |
| parent | ed96cbca8bedc8e27c00db8ced0fa01a37c38ee1 (diff) | |
FacebookRM: version bump
Reworked options
Added Photos and Links newsfeed types
Fixed setting newsfeed type
Updated copyrights.
git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@267 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb
32 files changed, 190 insertions, 274 deletions
diff --git a/FacebookRM/avatars.h b/FacebookRM/avatars.h index 99e02e7..18f8e1c 100644 --- a/FacebookRM/avatars.h +++ b/FacebookRM/avatars.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/avatars.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/build.h b/FacebookRM/build.h index e409157..a49e385 100644 --- a/FacebookRM/build.h +++ b/FacebookRM/build.h @@ -1 +1 @@ -#define __BUILD 2068
+#define __BUILD 2061
diff --git a/FacebookRM/chat.cpp b/FacebookRM/chat.cpp index 8e0e007..a7c2ca5 100644 --- a/FacebookRM/chat.cpp +++ b/FacebookRM/chat.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2011 Robert Pösel
+Copyright © 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
+
*/
#include "common.h"
@@ -214,6 +215,22 @@ void FacebookProto::AddChat(const char *id, const char *name) mir_free(const_cast<TCHAR*>(gcd.ptszID));
}
+/*void FacebookProto::SetTopic(const char *topic)
+{
+ GCDEST gcd = { m_szModuleName };
+ gcd.ptszID = const_cast<TCHAR*>(m_tszUserName);
+ gcd.iType = GC_EVENT_TOPIC;
+
+ GCEVENT gce = {sizeof(gce)};
+ gce.pDest = &gcd;
+ gce.dwFlags = GC_TCHAR;
+ gce.time = ::time(NULL);
+
+ std::string top = Translate(topic);
+ gce.ptszText = mir_a2t(top.c_str());
+ CallServiceSync(MS_GC_EVENT,0, reinterpret_cast<LPARAM>(&gce));
+}
+*/
int FacebookProto::OnJoinChat(WPARAM,LPARAM suppress)
{
@@ -255,22 +272,6 @@ int FacebookProto::OnJoinChat(WPARAM,LPARAM suppress) return 0;
}
-/*void FacebookProto::SetTopic(const char *topic)
-{
- GCDEST gcd = { m_szModuleName };
- gcd.ptszID = const_cast<TCHAR*>(m_tszUserName);
- gcd.iType = GC_EVENT_TOPIC;
-
- GCEVENT gce = {sizeof(gce)};
- gce.pDest = &gcd;
- gce.dwFlags = GC_TCHAR;
- gce.time = ::time(NULL);
-
- std::string top = Translate(topic);
- gce.ptszText = mir_a2t(top.c_str());
- CallServiceSync(MS_GC_EVENT,0, reinterpret_cast<LPARAM>(&gce));
-}
-*/
int FacebookProto::OnLeaveChat(WPARAM,LPARAM)
{
GCDEST gcd = { m_szModuleName };
@@ -287,6 +288,7 @@ int FacebookProto::OnLeaveChat(WPARAM,LPARAM) return 0;
}
+
/*
void FacebookProto::SetChatStatus(int status)
{
@@ -312,17 +314,4 @@ void FacebookProto::SetChatStatus(int status) CallServiceSync(MS_GC_EVENT,SESSION_OFFLINE,reinterpret_cast<LPARAM>(&gce));
}
}
-/*
-void FacebookProto::ClearChat()
-{
- GCDEST gcd = { m_szModuleName };
- gcd.ptszID = const_cast<TCHAR*>(m_tszUserName);
- gcd.iType = GC_EVENT_CONTROL;
-
- GCEVENT gce = {sizeof(gce)};
- gce.dwFlags = GC_TCHAR;
- gce.pDest = &gcd;
-
- CallServiceSync(MS_GC_EVENT,WINDOW_CLEARLOG,reinterpret_cast<LPARAM>(&gce));
-}
*/
\ No newline at end of file diff --git a/FacebookRM/client.h b/FacebookRM/client.h index cff5c09..0ae6dc0 100644 --- a/FacebookRM/client.h +++ b/FacebookRM/client.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/client.h $
-Revision : $Revision: 92 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-20 21:38:59 +0100 (Ät, 20 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/common.h b/FacebookRM/common.h index ce4e572..4fed93e 100644 --- a/FacebookRM/common.h +++ b/FacebookRM/common.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/common.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/communication.cpp b/FacebookRM/communication.cpp index 3b8da48..e819f82 100644 --- a/FacebookRM/communication.cpp +++ b/FacebookRM/communication.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL$
-Revision : $Revision$
-Last change by : $Author$
-Last change on : $Date$
-
*/
#include "common.h"
diff --git a/FacebookRM/connection.cpp b/FacebookRM/connection.cpp index d871ee1..d26b9a3 100644 --- a/FacebookRM/connection.cpp +++ b/FacebookRM/connection.cpp @@ -71,6 +71,10 @@ void FacebookProto::ChangeStatus(void*) }
else if ( old_status == ID_STATUS_OFFLINE )
{ // Login
+ SYSTEMTIME t;
+ GetLocalTime( &t );
+ Log("[%d.%d.%d] Using Facebook Protocol RM %s", t.wDay, t.wMonth, t.wYear, __VERSION_STRING);
+
LOG("***** Beginning SignOn process");
m_iStatus = facy.self_.status_id = ID_STATUS_CONNECTING;
diff --git a/FacebookRM/constants.h b/FacebookRM/constants.h index a9a7844..b53a696 100644 --- a/FacebookRM/constants.h +++ b/FacebookRM/constants.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,25 +18,14 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL$
-Revision : $Revision$
-Last change by : $Author$
-Last change on : $Date$
-
*/
#pragma once
// Version management
#include "build.h"
-#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 0, 7, 0)
-#define __PRODUCT_DWORD PLUGIN_MAKE_VERSION(0, 9, 14, 0)
-#define __VERSION_STRING "0.0.7.0"
-#define __PRODUCT_STRING "0.9.14.0"
-#define __VERSION_VS_FILE 0,0,7,0
-#define __VERSION_VS_PROD 0,9,14,0
-#define __VERSION_VS_FILE_STRING "0, 0, 7, 0"
-#define __VERSION_VS_PROD_STRING "0, 9, 14, 0"
+#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 0, 7, 1)
+#define __VERSION_STRING "0.0.7.1"
// Product management
#define FACEBOOK_NAME "Facebook"
@@ -130,4 +119,7 @@ static const struct { "Most Recent", "lf" },
{ "Status Updates", "app_2915120374" },
{ "Top News", "h" },
+ { "Photos", "app_2305272732_2392950137" },
+ { "Links", "app_2309869772" },
+
};
\ No newline at end of file diff --git a/FacebookRM/contacts.cpp b/FacebookRM/contacts.cpp index 1f0a007..20853c2 100644 --- a/FacebookRM/contacts.cpp +++ b/FacebookRM/contacts.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/contacts.cpp $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#include "common.h"
diff --git a/FacebookRM/db.h b/FacebookRM/db.h index 4c8afcf..5efcefe 100644 --- a/FacebookRM/db.h +++ b/FacebookRM/db.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/db.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/definitions.h b/FacebookRM/definitions.h index 63460be..0679c56 100644 --- a/FacebookRM/definitions.h +++ b/FacebookRM/definitions.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/definitions.h $
-Revision : $Revision: 94 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-02-05 16:57:18 +0100 (so, 05 2 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/dialogs.cpp b/FacebookRM/dialogs.cpp index 309bbad..721ef35 100644 --- a/FacebookRM/dialogs.cpp +++ b/FacebookRM/dialogs.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/dialogs.cpp $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#include "common.h"
@@ -227,23 +222,11 @@ INT_PTR CALLBACK FBOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l DBFreeVariant(&dbv);
}
- LoadDBCheckState(proto, hwnd, IDC_SECURE, FACEBOOK_KEY_FORCE_HTTPS, DEFAULT_FORCE_HTTPS);
- LoadDBCheckState(proto, hwnd, IDC_SECURE_CHANNEL, FACEBOOK_KEY_FORCE_HTTPS_CHANNEL, DEFAULT_FORCE_HTTPS_CHANNEL);
LoadDBCheckState(proto, hwnd, IDC_SET_IGNORE_STATUS, FACEBOOK_KEY_DISABLE_STATUS_NOTIFY, DEFAULT_DISABLE_STATUS_NOTIFY);
LoadDBCheckState(proto, hwnd, IDC_BIGGER_AVATARS, FACEBOOK_KEY_BIG_AVATARS, DEFAULT_BIG_AVATARS);
- LoadDBCheckState(proto, hwnd, IDC_DISCONNECT_CHAT, FACEBOOK_KEY_DISCONNECT_CHAT, DEFAULT_DISCONNECT_CHAT);
- LoadDBCheckState(proto, hwnd, IDC_PARSE_UNREAD, FACEBOOK_KEY_PARSE_MESSAGES, DEFAULT_PARSE_MESSAGES);
- LoadDBCheckState(proto, hwnd, IDC_CLOSE_WINDOWS, FACEBOOK_KEY_CLOSE_WINDOWS_ENABLE, DEFAULT_CLOSE_WINDOWS_ENABLE);
- LoadDBCheckState(proto, hwnd, IDC_SET_STATUS, FACEBOOK_KEY_SET_MIRANDA_STATUS, DEFAULT_SET_MIRANDA_STATUS);
- LoadDBCheckState(proto, hwnd, IDC_LOGGING, FACEBOOK_KEY_LOGGING_ENABLE, DEFAULT_LOGGING_ENABLE);
- LoadDBCheckState(proto, hwnd, IDC_MAP_STATUSES, FACEBOOK_KEY_MAP_STATUSES, DEFAULT_MAP_STATUSES);
LoadDBCheckState(proto, hwnd, IDC_LOAD_MOBILE, FACEBOOK_KEY_LOAD_MOBILE, DEFAULT_LOAD_MOBILE);
- LoadDBCheckState(proto, hwnd, IDC_GROUPCHATS, FACEBOOK_KEY_ENABLE_GROUPCHATS, DEFAULT_ENABLE_GROUPCHATS);
-
-
- EnableWindow(GetDlgItem(hwnd, IDC_SECURE_CHANNEL), IsDlgButtonChecked(hwnd, IDC_SECURE));
- } return TRUE;
+ } return TRUE;
case WM_COMMAND: {
if ( LOWORD( wparam ) == IDC_NEWACCOUNTLINK )
@@ -257,16 +240,13 @@ INT_PTR CALLBACK FBOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l EnableWindow(GetDlgItem(hwnd, IDC_SECURE_CHANNEL), IsDlgButtonChecked(hwnd, IDC_SECURE));
}
- if (LOWORD(wparam) == IDC_SECURE_CHANNEL && IsDlgButtonChecked(hwnd, IDC_SECURE_CHANNEL))
- MessageBox( hwnd, TranslateT("Note: Make sure you have disabled 'Validate SSL certificates' option in Network options to work properly."), proto->m_tszUserName, MB_OK );
-
if ((LOWORD(wparam)==IDC_UN || LOWORD(wparam)==IDC_PW || LOWORD(wparam)==IDC_GROUP) &&
(HIWORD(wparam)!=EN_CHANGE || (HWND)lparam!=GetFocus()))
return 0;
else
SendMessage(GetParent(hwnd),PSM_CHANGED,0,0);
- } break;
+ } break;
case WM_NOTIFY:
if ( reinterpret_cast<NMHDR*>(lparam)->code == PSN_APPLY )
@@ -289,16 +269,69 @@ INT_PTR CALLBACK FBOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l else
DBDeleteContactSetting(NULL,proto->m_szModuleName,FACEBOOK_KEY_DEF_GROUP);
+ StoreDBCheckState(proto, hwnd, IDC_SET_IGNORE_STATUS, FACEBOOK_KEY_DISABLE_STATUS_NOTIFY);
+ StoreDBCheckState(proto, hwnd, IDC_BIGGER_AVATARS, FACEBOOK_KEY_BIG_AVATARS);
+ StoreDBCheckState(proto, hwnd, IDC_LOAD_MOBILE, FACEBOOK_KEY_LOAD_MOBILE);
+
+ return TRUE;
+ }
+ break;
+
+ }
+
+ return FALSE;
+}
+
+INT_PTR CALLBACK FBOptionsAdvancedProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam )
+{
+ FacebookProto *proto = reinterpret_cast<FacebookProto*>(GetWindowLong(hwnd,GWLP_USERDATA));
+
+ switch ( message )
+ {
+
+ case WM_INITDIALOG:
+ {
+ TranslateDialogDefault(hwnd);
+
+ proto = reinterpret_cast<FacebookProto*>(lparam);
+ SetWindowLong(hwnd,GWLP_USERDATA,lparam);
+
+ LoadDBCheckState(proto, hwnd, IDC_SECURE, FACEBOOK_KEY_FORCE_HTTPS, DEFAULT_FORCE_HTTPS);
+ LoadDBCheckState(proto, hwnd, IDC_SECURE_CHANNEL, FACEBOOK_KEY_FORCE_HTTPS_CHANNEL, DEFAULT_FORCE_HTTPS_CHANNEL);
+ LoadDBCheckState(proto, hwnd, IDC_DISCONNECT_CHAT, FACEBOOK_KEY_DISCONNECT_CHAT, DEFAULT_DISCONNECT_CHAT);
+ LoadDBCheckState(proto, hwnd, IDC_PARSE_UNREAD, FACEBOOK_KEY_PARSE_MESSAGES, DEFAULT_PARSE_MESSAGES);
+ LoadDBCheckState(proto, hwnd, IDC_CLOSE_WINDOWS, FACEBOOK_KEY_CLOSE_WINDOWS_ENABLE, DEFAULT_CLOSE_WINDOWS_ENABLE);
+ LoadDBCheckState(proto, hwnd, IDC_SET_STATUS, FACEBOOK_KEY_SET_MIRANDA_STATUS, DEFAULT_SET_MIRANDA_STATUS);
+ LoadDBCheckState(proto, hwnd, IDC_LOGGING, FACEBOOK_KEY_LOGGING_ENABLE, DEFAULT_LOGGING_ENABLE);
+ LoadDBCheckState(proto, hwnd, IDC_MAP_STATUSES, FACEBOOK_KEY_MAP_STATUSES, DEFAULT_MAP_STATUSES);
+ LoadDBCheckState(proto, hwnd, IDC_GROUPCHATS, FACEBOOK_KEY_ENABLE_GROUPCHATS, DEFAULT_ENABLE_GROUPCHATS);
+
+ EnableWindow(GetDlgItem(hwnd, IDC_SECURE_CHANNEL), IsDlgButtonChecked(hwnd, IDC_SECURE));
+
+ } return TRUE;
+
+ case WM_COMMAND: {
+ if ( LOWORD( wparam ) == IDC_SECURE ) {
+ EnableWindow(GetDlgItem(hwnd, IDC_SECURE_CHANNEL), IsDlgButtonChecked(hwnd, IDC_SECURE));
+ }
+
+ if (LOWORD(wparam) == IDC_SECURE_CHANNEL && IsDlgButtonChecked(hwnd, IDC_SECURE_CHANNEL))
+ MessageBox( hwnd, TranslateT("Note: Make sure you have disabled 'Validate SSL certificates' option in Network options to work properly."), proto->m_tszUserName, MB_OK );
+
+ SendMessage(GetParent(hwnd),PSM_CHANGED,0,0);
+
+ } break;
+
+ case WM_NOTIFY:
+ if ( reinterpret_cast<NMHDR*>(lparam)->code == PSN_APPLY )
+ {
StoreDBCheckState(proto, hwnd, IDC_SECURE, FACEBOOK_KEY_FORCE_HTTPS);
StoreDBCheckState(proto, hwnd, IDC_CLOSE_WINDOWS, FACEBOOK_KEY_CLOSE_WINDOWS_ENABLE);
StoreDBCheckState(proto, hwnd, IDC_LOGGING, FACEBOOK_KEY_LOGGING_ENABLE);
StoreDBCheckState(proto, hwnd, IDC_SECURE_CHANNEL, FACEBOOK_KEY_FORCE_HTTPS_CHANNEL);
- StoreDBCheckState(proto, hwnd, IDC_SET_IGNORE_STATUS, FACEBOOK_KEY_DISABLE_STATUS_NOTIFY);
- StoreDBCheckState(proto, hwnd, IDC_BIGGER_AVATARS, FACEBOOK_KEY_BIG_AVATARS);
StoreDBCheckState(proto, hwnd, IDC_DISCONNECT_CHAT, FACEBOOK_KEY_DISCONNECT_CHAT);
StoreDBCheckState(proto, hwnd, IDC_PARSE_UNREAD, FACEBOOK_KEY_PARSE_MESSAGES);
StoreDBCheckState(proto, hwnd, IDC_MAP_STATUSES, FACEBOOK_KEY_MAP_STATUSES);
- StoreDBCheckState(proto, hwnd, IDC_LOAD_MOBILE, FACEBOOK_KEY_LOAD_MOBILE);
StoreDBCheckState(proto, hwnd, IDC_GROUPCHATS, FACEBOOK_KEY_ENABLE_GROUPCHATS);
BOOL setStatus = IsDlgButtonChecked(hwnd, IDC_SET_STATUS);
@@ -321,6 +354,7 @@ INT_PTR CALLBACK FBOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l return FALSE;
}
+
INT_PTR CALLBACK FBEventsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam )
{
FacebookProto *proto = reinterpret_cast<FacebookProto*>(GetWindowLong(hwnd,GWLP_USERDATA));
@@ -412,7 +446,9 @@ INT_PTR CALLBACK FBEventsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lp case WM_NOTIFY:
{
if ( reinterpret_cast<NMHDR*>(lparam)->code == PSN_APPLY )
- {
+ {
+ DBWriteContactSettingByte(NULL, proto->m_szModuleName, FACEBOOK_KEY_FEED_TYPE, SendDlgItemMessage(hwnd, IDC_FEED_TYPE, CB_GETCURSEL, 0, 0));
+
StoreDBCheckState(proto, hwnd, IDC_SYSTRAY_NOTIFY, FACEBOOK_KEY_SYSTRAY_NOTIFY);
StoreDBCheckState(proto, hwnd, IDC_NOTIFICATIONS_ENABLE, FACEBOOK_KEY_EVENT_NOTIFICATIONS_ENABLE);
diff --git a/FacebookRM/dialogs.h b/FacebookRM/dialogs.h index fbaa8ff..1917027 100644 --- a/FacebookRM/dialogs.h +++ b/FacebookRM/dialogs.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/dialogs.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
@@ -30,4 +25,5 @@ Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $ INT_PTR CALLBACK FBAccountProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam );
INT_PTR CALLBACK FBMindProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam );
INT_PTR CALLBACK FBOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam );
+INT_PTR CALLBACK FBOptionsAdvancedProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam );
INT_PTR CALLBACK FBEventsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam );
diff --git a/FacebookRM/entities.h b/FacebookRM/entities.h index c09c20d..e6fea18 100644 --- a/FacebookRM/entities.h +++ b/FacebookRM/entities.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/entities.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/events.cpp b/FacebookRM/events.cpp index d4937cb..967d878 100644 --- a/FacebookRM/events.cpp +++ b/FacebookRM/events.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/events.cpp $
-Revision : $Revision: 94 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-02-05 16:57:18 +0100 (so, 05 2 2011) $
-
*/
#include "common.h"
diff --git a/FacebookRM/facebook.rc b/FacebookRM/facebook.rc index 8b8ba2a..a329a8e 100644 --- a/FacebookRM/facebook.rc +++ b/FacebookRM/facebook.rc @@ -88,43 +88,26 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,159,44,50,14
END
-IDD_OPTIONS DIALOGEX 0, 0, 305, 254
+IDD_OPTIONS DIALOGEX 0, 0, 305, 238
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "User Details",IDC_STATIC,50,7,224,52
- LTEXT "E-mail:",IDC_STATIC,59,17,60,8
- EDITTEXT IDC_UN,123,15,144,13,ES_AUTOHSCROLL
- LTEXT "Password:",IDC_STATIC,59,30,60,8
- EDITTEXT IDC_PW,123,28,144,13,ES_PASSWORD | ES_AUTOHSCROLL
+ GROUPBOX "User Details",IDC_STATIC,7,7,291,60
+ LTEXT "E-mail:",IDC_STATIC,17,19,61,8
+ EDITTEXT IDC_UN,84,17,123,13,ES_AUTOHSCROLL
+ LTEXT "Password:",IDC_STATIC,17,35,61,8
+ EDITTEXT IDC_PW,84,33,123,13,ES_PASSWORD | ES_AUTOHSCROLL
CONTROL "Create a new Facebook account",IDC_NEWACCOUNTLINK,
- "Hyperlink",WS_TABSTOP,123,44,144,10
- LTEXT "Default group:",IDC_STATIC,59,75,60,8
- EDITTEXT IDC_GROUP,123,75,144,13,ES_AUTOHSCROLL
+ "Hyperlink",WS_TABSTOP,84,52,123,10
+ LTEXT "Default group:",IDC_STATIC,17,85,61,8
+ EDITTEXT IDC_GROUP,84,84,123,13,ES_AUTOHSCROLL
CONTROL "Automatically set 'Ignore status change' flag",IDC_SET_IGNORE_STATUS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,90,208,10
- GROUPBOX "Contacts Settings",IDC_STATIC,50,62,224,64
- CONTROL "Use bigger avatars",IDC_BIGGER_AVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,101,208,10
- GROUPBOX "Advanced Settings",IDC_STATIC,50,128,224,117
- CONTROL "Force secure (HTTPS) connection",IDC_SECURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,149,208,10
- CONTROL "Post Miranda statuses to Wall",IDC_SET_STATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,59,172,208,10
- CONTROL "Enable logging for debugging purposes",IDC_LOGGING,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,138,208,10
- CONTROL "Use secure connection also for channel requests",IDC_SECURE_CHANNEL,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,69,160,198,10
- CONTROL "Also disconnect chat when going to offline",IDC_DISCONNECT_CHAT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,184,208,10
- CONTROL "Get unread messages on login (EXPERIMENTAL)",IDC_PARSE_UNREAD,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,220,208,10
- CONTROL "Automatically close chat windows (on website)",IDC_CLOSE_WINDOWS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,196,208,10
- CONTROL "Map non-standard statuses to Invisible (instead of Online)",IDC_MAP_STATUSES,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,208,208,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,271,10
+ GROUPBOX "Contacts Settings",IDC_STATIC,7,72,291,70
+ CONTROL "Use bigger avatars",IDC_BIGGER_AVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,114,271,10
CONTROL "Load contacts with 'On the Mobile' status",IDC_LOAD_MOBILE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,112,208,10
- CONTROL "Enable groupchats support (EXPERIMENTAL)",IDC_GROUPCHATS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,232,208,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,127,271,10
END
IDD_OPTIONS_EVENTS DIALOGEX 0, 0, 305, 217
@@ -169,6 +152,30 @@ BEGIN COMBOBOX IDC_FEED_TYPE,169,153,90,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
END
+IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 305, 238
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ GROUPBOX "Advanced Settings",IDC_STATIC,7,7,291,126
+ CONTROL "Force secure (HTTPS) connection",IDC_SECURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,32,267,10
+ CONTROL "Post Miranda statuses to Wall",IDC_SET_STATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,17,56,267,10
+ CONTROL "Enable logging for debugging purposes",IDC_LOGGING,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,20,267,10
+ CONTROL "Use secure connection also for channel requests",IDC_SECURE_CHANNEL,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,44,252,10
+ CONTROL "Also disconnect chat when going to offline",IDC_DISCONNECT_CHAT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,68,267,10
+ CONTROL "Get unread messages on login (EXPERIMENTAL)",IDC_PARSE_UNREAD,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,104,267,10
+ CONTROL "Automatically close chat windows (on website)",IDC_CLOSE_WINDOWS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,80,267,10
+ CONTROL "Map non-standard statuses to Invisible (instead of Online)",IDC_MAP_STATUSES,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,92,267,10
+ CONTROL "Enable groupchats support (EXPERIMENTAL)",IDC_GROUPCHATS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,116,267,10
+END
+
/////////////////////////////////////////////////////////////////////////////
//
@@ -193,16 +200,14 @@ BEGIN IDD_OPTIONS, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 298
- VERTGUIDE, 50
- VERTGUIDE, 59
- VERTGUIDE, 69
- VERTGUIDE, 119
- VERTGUIDE, 123
- VERTGUIDE, 267
- VERTGUIDE, 274
+ VERTGUIDE, 17
+ VERTGUIDE, 78
+ VERTGUIDE, 84
+ VERTGUIDE, 207
+ VERTGUIDE, 288
+ VERTGUIDE, 298
TOPMARGIN, 7
- BOTTOMMARGIN, 247
+ BOTTOMMARGIN, 231
END
IDD_OPTIONS_EVENTS, DIALOG
@@ -229,6 +234,19 @@ BEGIN HORZGUIDE, 95
HORZGUIDE, 97
END
+
+ IDD_OPTIONS_ADVANCED, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 298
+ VERTGUIDE, 17
+ VERTGUIDE, 32
+ VERTGUIDE, 119
+ VERTGUIDE, 123
+ VERTGUIDE, 284
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 231
+ END
END
#endif // APSTUDIO_INVOKED
@@ -239,8 +257,8 @@ END //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION __VERSION_VS_FILE
- PRODUCTVERSION __VERSION_VS_PROD
+ FILEVERSION 0,0,7,1
+ PRODUCTVERSION 0,9,14,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -256,12 +274,12 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "Facebook protocol plugin for Miranda IM"
- VALUE "FileVersion", __VERSION_VS_FILE_STRING
+ VALUE "FileVersion", "0, 0, 7, 1"
VALUE "InternalName", "Facebook RM"
- VALUE "LegalCopyright", "Copyright © 2009-2011 Michal Zelinka, 2011 Robert Pösel"
+ VALUE "LegalCopyright", "Copyright © 2009-2011 Michal Zelinka, 2011-2012 Robert Pösel"
VALUE "OriginalFilename", "facebook.dll"
VALUE "ProductName", "Facebook Protocol RM"
- VALUE "ProductVersion", __VERSION_VS_PROD_STRING
+ VALUE "ProductVersion", "0, 0, 7, 1"
END
END
BLOCK "VarFileInfo"
diff --git a/FacebookRM/http.cpp b/FacebookRM/http.cpp index 9dab625..853e6b8 100644 --- a/FacebookRM/http.cpp +++ b/FacebookRM/http.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/http.cpp $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#include "common.h"
diff --git a/FacebookRM/http.h b/FacebookRM/http.h index e7c4144..1dd4174 100644 --- a/FacebookRM/http.h +++ b/FacebookRM/http.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/http.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/json.cpp b/FacebookRM/json.cpp index bd69c75..93fa30e 100644 --- a/FacebookRM/json.cpp +++ b/FacebookRM/json.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/json.cpp $
-Revision : $Revision: 94 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-02-05 16:57:18 +0100 (so, 05 2 2011) $
-
*/
#include "common.h"
diff --git a/FacebookRM/json.h b/FacebookRM/json.h index 6227c78..e2a55b2 100644 --- a/FacebookRM/json.h +++ b/FacebookRM/json.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/json.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/list.hpp b/FacebookRM/list.hpp index b9d091e..597a2b4 100644 --- a/FacebookRM/list.hpp +++ b/FacebookRM/list.hpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/list.hpp $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/main.cpp b/FacebookRM/main.cpp index 550fa31..ec72a6b 100644 --- a/FacebookRM/main.cpp +++ b/FacebookRM/main.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL$
-Revision : $Revision$
-Last change by : $Author$
-Last change on : $Date$
-
*/
#include "common.h"
diff --git a/FacebookRM/messages.cpp b/FacebookRM/messages.cpp index 7578550..b4c6459 100644 --- a/FacebookRM/messages.cpp +++ b/FacebookRM/messages.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/messages.cpp $
-Revision : $Revision: 95 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-02-07 18:19:39 +0100 (po, 07 2 2011) $
-
*/
#include "common.h"
diff --git a/FacebookRM/process.cpp b/FacebookRM/process.cpp index 48430df..e3d0192 100644 --- a/FacebookRM/process.cpp +++ b/FacebookRM/process.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright � 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/process.cpp $
-Revision : $Revision: 92 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-20 21:38:59 +0100 (Ät, 20 1 2011) $
-
*/
#include "common.h"
diff --git a/FacebookRM/proto.cpp b/FacebookRM/proto.cpp index f54ceee..5ecd067 100644 --- a/FacebookRM/proto.cpp +++ b/FacebookRM/proto.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/proto.cpp $
-Revision : $Revision: 93 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-25 20:50:51 +0100 (út, 25 1 2011) $
-
*/
#include "common.h"
@@ -50,7 +45,6 @@ FacebookProto::FacebookProto(const char* proto_name,const TCHAR* username) CreateProtoService(m_szModuleName, PS_GETAVATARINFO, &FacebookProto::GetAvatarInfo, this);
CreateProtoService(m_szModuleName, PS_GETAVATARCAPS, &FacebookProto::GetAvatarCaps, this);
- // TODO RM: group chats
CreateProtoService(m_szModuleName, PS_JOINCHAT, &FacebookProto::OnJoinChat, this);
CreateProtoService(m_szModuleName, PS_LEAVECHAT, &FacebookProto::OnLeaveChat, this);
@@ -87,8 +81,6 @@ FacebookProto::FacebookProto(const char* proto_name,const TCHAR* username) mir_free(profile);
hAvatarFolder_ = FoldersRegisterCustomPath(m_szModuleName, "Avatars", def_avatar_folder_.c_str());
- Log("Loaded Facebook Protocol RM %s", __VERSION_STRING);
-
// Set all contacts offline -- in case we crashed
SetAllContactStatuses( ID_STATUS_OFFLINE );
}
@@ -337,12 +329,18 @@ int FacebookProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.position = 271828;
odp.ptszGroup = LPGENT("Network");
- odp.ptszTab = LPGENT("Account && Integration");
+ odp.ptszTab = LPGENT("Account");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pfnDlgProc = FBOptionsProc;
CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
-
+
odp.position = 271829;
+ odp.ptszTab = LPGENT("Advanced");
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_ADVANCED);
+ odp.pfnDlgProc = FBOptionsAdvancedProc;
+ CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
+
+ odp.position = 271830;
if(ServiceExists(MS_POPUP_ADDPOPUPT))
odp.ptszGroup = LPGENT("Popups");
odp.ptszTab = LPGENT("Events");
diff --git a/FacebookRM/proto.h b/FacebookRM/proto.h index b6fd3d8..e792b09 100644 --- a/FacebookRM/proto.h +++ b/FacebookRM/proto.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/proto.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/resource.h b/FacebookRM/resource.h index 50a0638..14ff2d1 100644 --- a/FacebookRM/resource.h +++ b/FacebookRM/resource.h @@ -10,6 +10,7 @@ #define IDD_MIND 112
#define IDD_OPTIONS 113
#define IDD_OPTIONS_EVENTS 114
+#define IDD_OPTIONS_ADVANCED 115
#define IDC_UN 1001
#define IDC_PW 1002
#define IDC_NEWACCOUNTLINK 1003
@@ -23,12 +24,9 @@ #define IDC_DISCONNECT_CHAT 1028
#define IDC_PARSE_UNREAD 1029
#define IDC_BIGGER_AVATARS 1030
-#define IDC_CLOSE_CHAT 1031
#define IDC_CLOSE_WINDOWS 1031
#define IDC_MAP_STATUSES 1032
-#define IDC_BIGGER_AVATARS2 1033
#define IDC_LOAD_MOBILE 1033
-#define IDC_PARSE_UNREAD2 1034
#define IDC_GROUPCHATS 1034
#define IDC_NOTIFICATIONS_ENABLE 1041
#define IDC_FEEDS_ENABLE 1042
diff --git a/FacebookRM/stubs.cpp b/FacebookRM/stubs.cpp index 254cfac..4cf01cd 100644 --- a/FacebookRM/stubs.cpp +++ b/FacebookRM/stubs.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/stubs.cpp $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#include "common.h"
diff --git a/FacebookRM/theme.cpp b/FacebookRM/theme.cpp index 6e919ae..7bc62a2 100644 --- a/FacebookRM/theme.cpp +++ b/FacebookRM/theme.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/theme.cpp $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#include "common.h"
diff --git a/FacebookRM/theme.h b/FacebookRM/theme.h index 5eccc91..4330c35 100644 --- a/FacebookRM/theme.h +++ b/FacebookRM/theme.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/theme.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
diff --git a/FacebookRM/utils.cpp b/FacebookRM/utils.cpp index 5d32091..71062c3 100644 --- a/FacebookRM/utils.cpp +++ b/FacebookRM/utils.cpp @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/utils.cpp $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#include "common.h"
diff --git a/FacebookRM/utils.h b/FacebookRM/utils.h index f7fe1c8..6d9acb5 100644 --- a/FacebookRM/utils.h +++ b/FacebookRM/utils.h @@ -3,7 +3,7 @@ Facebook plugin for Miranda Instant Messenger
_____________________________________________
-Copyright © 2009-11 Michal Zelinka
+Copyright © 2009-11 Michal Zelinka, 2011-12 Robert Pösel
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-File name : $HeadURL: http://eternityplugins.googlecode.com/svn/trunk/facebook/utils.h $
-Revision : $Revision: 91 $
-Last change by : $Author: n3weRm0re.ewer $
-Last change on : $Date: 2011-01-08 11:10:34 +0100 (so, 08 1 2011) $
-
*/
#pragma once
|