diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-03 15:16:37 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-03 15:16:37 +0000 |
| commit | 78f8991554dd09d2e7f7efcdd9dcacf18f75f428 (patch) | |
| tree | ef50761216cd51b0da6cb17b3ca1199de10fb6cf /protocols/JabberG/jabber_list.h | |
| parent | cfe2d8b10186a7ed42ba0dffd75528a38bee1435 (diff) | |
old svn info removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@735 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/jabber_list.h')
| -rw-r--r-- | protocols/JabberG/jabber_list.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/protocols/JabberG/jabber_list.h b/protocols/JabberG/jabber_list.h index bd14a52fd3..c2ee0409e8 100644 --- a/protocols/JabberG/jabber_list.h +++ b/protocols/JabberG/jabber_list.h @@ -2,7 +2,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright ( C ) 2002-04 Santithorn Bunchua
-Copyright ( C ) 2005-11 George Hazan
+Copyright ( C ) 2005-12 George Hazan
Copyright ( C ) 2007 Maxim Mluhov
This program is free software; you can redistribute it and/or
@@ -19,10 +19,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-Revision : $Revision: 13833 $
-Last change on : $Date: 2011-09-04 19:48:36 +0300 (Вс, 04 сен 2011) $
-Last change by : $Author: borkra $
-
*/
#ifndef _JABBER_LIST_H_
@@ -64,9 +60,8 @@ typedef enum { ROLE_MODERATOR
} JABBER_GC_ROLE;
-typedef enum { // initial default to RSMODE_LASTSEEN
+typedef enum { // initial default to RSMODE_SERVER
RSMODE_SERVER, // always let server decide ( always send correspondence without resouce name )
- RSMODE_LASTSEEN, // use the last seen resource ( or let server decide if haven't seen anything yet )
RSMODE_MANUAL // specify resource manually ( see the defaultResource field - must not be NULL )
} JABBER_RESOURCE_MODE;
@@ -118,7 +113,7 @@ struct JABBER_RESOURCE_STATUS JabberCapsBits jcbManualDiscoveredCaps;
// XEP-0085 gone event support
- BOOL bMessageSessionActive;
+ BOOL uMessageSessionActive;
JABBER_XEP0232_SOFTWARE_INFO* pSoftwareInfo;
};
@@ -133,8 +128,8 @@ struct JABBER_LIST_ITEM int resourceCount;
JABBER_RESOURCE_STATUS *resource;
JABBER_RESOURCE_STATUS itemResource; // resource for jids without /resource node
- int lastSeenResource; // index to resource[x] which was last seen active
- int manualResource; // manually set index to resource[x]
+ JABBER_RESOURCE_STATUS *lastSeenResource; // index to resource[x] which was last seen active
+ JABBER_RESOURCE_STATUS *manualResource; // manually set index to resource[x]
// int defaultResource; // index to resource[x] which is the default, negative ( -1 ) means no resource is chosen yet
JABBER_RESOURCE_MODE resourceMode;
JABBER_SUBSCRIPTION subscription;
@@ -161,7 +156,7 @@ struct JABBER_LIST_ITEM HWND hwndGcListAdmin;
HWND hwndGcListOwner;
int iChatState;
- // BOOL bAutoJoin; // chat sessio was started via auto-join
+ // BOOL bAutoJoin; // chat session was started via auto-join
// LIST_FILE
// jid = string representation of port number
|