Jabber:

- roster editor extracted to the separate source module;
- fixes #1881 (first column's text is set improperly, thus creating problems on roster upload);
- roster editor rewritten to UI classes

1 files changed, 8 insertions, 17 deletions

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index b2b0ed2a3e..fb20d8838f 100755
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -42,6 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 struct CJabberProto;

 class CJabberMucJidListDlg;

+class CRosterEditorDlg;

 

 class CJabberFormDlg;

 typedef void (CJabberProto::*JABBER_FORM_SUBMIT_FUNC)(CJabberFormDlg *pDlg, void *userdata);

@@ -52,14 +53,6 @@ typedef UNIQUE_MAP<wchar_t, TCharKeyCmp> U_TCHAR_MAP;
 

 #define JABBER_DEFAULT_RECENT_COUNT 10

 

-struct ROSTERREQUSERDATA

-{

-	HWND hwndDlg;

-	BYTE bRRAction;

-	BOOL bReadyToDownload;

-	BOOL bReadyToUpload;

-};

-

 struct TFilterInfo

 {

 	enum Type { T_JID, T_XMLNS, T_ANY, T_OFF };

@@ -663,20 +656,11 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	CMStringA ExtractImage(const TiXmlElement *node);

 	const char* GetSoftName(const char *wszName);

 

-	//---- jabber_opt.cpp ----------------------------------------------------------------

-	INT_PTR  __cdecl OnMenuHandleRosterControl(WPARAM wParam, LPARAM lParam);

-

-	void   _RosterExportToFile(HWND hwndDlg);

-	void   _RosterImportFromFile(HWND hwndDlg);

-	void   _RosterSendRequest(HWND hwndDlg, BYTE rrAction);

-	void   _RosterHandleGetRequest(const TiXmlElement *node, CJabberIqInfo*);

-

 	//---- jabber_password.cpp --------------------------------------------------------------

 

 	INT_PTR    __cdecl OnMenuHandleChangePassword(WPARAM wParam, LPARAM lParam);

 

 	//---- jabber_privacy.cpp ------------------------------------------------------------

-	ROSTERREQUSERDATA rrud;

 

 	INT_PTR __cdecl menuSetPrivacyList(WPARAM wParam, LPARAM lParam, LPARAM iList);

 	INT_PTR __cdecl OnMenuHandlePrivacyLists(WPARAM wParam, LPARAM lParam);

@@ -708,6 +692,13 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 

 	int    RcGetUnreadEventsCount(void);

 

+	//---- jabber_rostereditor.cpp -------------------------------------------------------

+

+	CRosterEditorDlg *m_hwndRosterEditor;

+

+	INT_PTR  __cdecl OnMenuHandleRosterControl(WPARAM wParam, LPARAM lParam);

+	void   _RosterHandleGetRequest(const TiXmlElement *node, CJabberIqInfo*);

+

 	//---- jabber_search.cpp -------------------------------------------------------------

 

 	void   SearchReturnResults(HANDLE id, void* pvUsersInfo, U_TCHAR_MAP *pmAllFields);