Changeset 6181 for trunk/licq/include/licq_icqd.h

Timestamp:

05/05/08 16:31:53 (7 months ago)

Author:

emostar

Message:

Add the patch by Sergey Kononenko (Message-ID: <20080122012616.48112055@…>)
Included the following additions:

• Add support for AIM (not all users yet)
• Fix a few memory leaks
• Rename SSBI to BART
• Add constants for BART Types
• Add support to qt4-gui
• Use boost in a few cases

Files:

• trunk/licq/include/licq_icqd.h (modified) (10 diffs)

trunk/licq/include/licq_icqd.h

@@ -43 +43 @@
 class INetSocket;
 class ProxyServer;
+class COscarService;
 class CReverseConnectToUserData;
 class CMSN;
@@ -300 +301 @@
     const char *szFaxNumber, const char *szAddress, const char *szCellularNumber,
     const char *szZipCode, unsigned short nCountryCode, bool bHideEmail);
+
+  unsigned long ProtoRequestPicture(const char *szId, unsigned long nPPID);
 
   unsigned long ProtoOpenSecureChannel(const char *szId, unsigned long nPPID);
@@ -476 +479 @@
   void icqTypingNotification(const char *_szId, bool _bActive);
   void icqCheckInvisible(const char *_szId);
+  void icqRequestService(unsigned short nFam);
 
   // Visible/Invisible/Ignore list functions
@@ -516 +520 @@
   char *ProtoPluginName(unsigned long);
 
+  EDaemonStatus Status() { return m_eStatus; }
+
   void PluginUIViewEvent(const char *szId, unsigned long nPPID ) {
     PushPluginSignal(new CICQSignal(SIGNAL_UI_VIEWEVENT, 0, szId, nPPID, 0));
@@ -569 +575 @@
   // Proxy options
   void InitProxy();
+  ProxyServer *CreateProxy();
   bool ProxyEnabled() {  return m_bProxyEnabled;  }
+  ProxyServer *GetProxy() {  return m_xProxy;  }
   void SetProxyEnabled(bool b) {  m_bProxyEnabled = b;  }
   unsigned short ProxyType() {  return m_nProxyType;  }
@@ -611 +619 @@
   // ICQ options
   bool UseServerContactList()         { return m_bUseSS; }
+  bool UseServerSideBuddyIcons()      { return m_bUseBART; }
   bool SendTypingNotification()       { return m_bSendTN; }
 
-  void SetUseServerContactList(bool b)   { m_bUseSS = b; }
-  void SetSendTypingNotification(bool b) { m_bSendTN = b; }
+  void SetUseServerContactList(bool b)    { m_bUseSS = b; }
+  void SetUseServerSideBuddyIcons(bool b);
+  void SetSendTypingNotification(bool b)  { m_bSendTN = b; }
 
   // Misc functions
@@ -702 +712 @@
   ProxyServer *m_xProxy;
 
+  // Services
+  COscarService *m_xBARTService;
+
   // Misc
   bool m_bUseSS; // server side list
+  bool m_bUseBART; // server side buddy icons
   bool m_bSendTN; // Send typing notifications
   bool m_bReconnectAfterUinClash; // reconnect after uin has been used from another location?
@@ -731 +745 @@
             thread_ping,
             thread_updateusers,
+            thread_ssbiservice,
             thread_shutdown;
 
@@ -764 +779 @@
   bool hasServerEvent(unsigned long);
   void ProcessDoneEvent(ICQEvent *);
+  void PushEvent(ICQEvent *);
   void PushExtendedEvent(ICQEvent *);
   void PushPluginSignal(CICQSignal *);
@@ -832 +848 @@
   friend void *ProcessRunningEvent_Client_tep(void *p);
   friend void *ProcessRunningEvent_Server_tep(void *p);
+  friend void *OscarServiceSendQueue_tep(void *p);
   friend void *Shutdown_tep(void *p);
   friend void *ConnectToServer_tep(void *s);
   friend class ICQUser;
   friend class CSocketManager;
+  friend class COscarService;
   friend class CChatManager;
   friend class CFileTransferManager;