Changes in protocols/jabber/jabber.h [9da0bbf:0da65d5]

File:

• protocols/jabber/jabber.h (modified) (7 diffs)

protocols/jabber/jabber.h

@@ -32 +32 @@
 typedef enum
 {
-        JFLAG_STREAM_STARTED = 1,       /* Set when we detected the beginning of the stream
+        JFLAG_STREAM_STARTED = 1,       /* Set when we detected the beginning of the stream
                                            and want to do auth. */
-        JFLAG_AUTHENTICATED = 2,        /* Set when we're successfully authenticatd. */
-        JFLAG_STREAM_RESTART = 4,       /* Set when we want to restart the stream (after
+        JFLAG_AUTHENTICATED = 2,        /* Set when we're successfully authenticatd. */
+        JFLAG_STREAM_RESTART = 4,       /* Set when we want to restart the stream (after
                                            SASL or TLS). */
-        JFLAG_WAIT_SESSION = 8,         /* Set if we sent a <session> tag and need a reply
+        JFLAG_WAIT_SESSION = 8,         /* Set if we sent a <session> tag and need a reply
                                            before we continue. */
-        JFLAG_WAIT_BIND = 16,           /* ... for <bind> tag. */
-        JFLAG_WANT_TYPING = 32,         /* Set if we ever sent a typing notification, this
+        JFLAG_WAIT_BIND = 16,           /* ... for <bind> tag. */
+        JFLAG_WANT_TYPING = 32,         /* Set if we ever sent a typing notification, this
                                            activates all XEP-85 related code. */
-        JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
 } jabber_flags_t;
 
@@ -51 +50 @@
         JBFLAG_DOES_XEP85 = 2,          /* Set this when the resource seems to support
                                            XEP85 (typing notification shite). */
-        JBFLAG_IS_CHATROOM = 4,         /* It's convenient to use this JID thingy for
-                                           groupchat state info too. */
-        JBFLAG_IS_ANONYMOUS = 8,        /* For anonymous chatrooms, when we don't have
-                                           have a real JID. */
 } jabber_buddy_flags_t;
+
+#define JABBER_PORT_DEFAULT "5222"
+#define JABBER_PORT_MIN 5220
+#define JABBER_PORT_MAX 5229
 
 struct jabber_data
@@ -102 +101 @@
         char *resource;
         
-        char *ext_jid; /* The JID to use in BitlBee. The real JID if possible, */
-                       /* otherwise something similar to the conference JID. */
-        
         int priority;
         struct jabber_away_state *away_state;
@@ -114 +110 @@
         struct jabber_buddy *next;
 };
-
-struct jabber_chat
-{
-        int flags;
-        char *name;
-        char *my_full_jid; /* Separate copy because of case sensitivity. */
-        struct jabber_buddy *me;
-};
-
-#define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
-
-#define JABBER_PORT_DEFAULT "5222"
-#define JABBER_PORT_MIN 5220
-#define JABBER_PORT_MAX 5229
 
 /* Prefixes to use for packet IDs (mainly for IQ packets ATM). Usually the
@@ -150 +132 @@
 #define XMLNS_TIME         "jabber:iq:time"                     /* XEP-0090 */
 #define XMLNS_VCARD        "vcard-temp"                         /* XEP-0054 */
-#define XMLNS_DELAY        "jabber:x:delay"                     /* XEP-0091 */
 #define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"  /* 0085 */
 #define XMLNS_DISCOVER     "http://jabber.org/protocol/disco#info"  /* 0030 */
-#define XMLNS_MUC          "http://jabber.org/protocol/muc"     /* XEP-0045 */
-#define XMLNS_MUC_USER     "http://jabber.org/protocol/muc#user"/* XEP-0045 */
 
 /* iq.c */
@@ -185 +164 @@
 const struct jabber_away_state *jabber_away_state_by_name( char *name );
 void jabber_buddy_ask( struct im_connection *ic, char *handle );
-char *jabber_normalize( const char *orig );
+char *jabber_normalize( char *orig );
 
 typedef enum
 {
         GET_BUDDY_CREAT = 1,    /* Try to create it, if necessary. */
-        GET_BUDDY_EXACT = 2,    /* Get an exact match (only makes sense with bare JIDs). */
-        GET_BUDDY_FIRST = 4,    /* No selection, simply get the first resource for this JID. */
+        GET_BUDDY_EXACT = 2,    /* Get an exact message (only makes sense with bare JIDs). */
 } get_buddy_flags_t;
 
 struct jabber_buddy *jabber_buddy_add( struct im_connection *ic, char *full_jid );
 struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid, get_buddy_flags_t flags );
-struct jabber_buddy *jabber_buddy_by_ext_jid( struct im_connection *ic, char *jid, get_buddy_flags_t flags );
 int jabber_buddy_remove( struct im_connection *ic, char *full_jid );
 int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid );
-struct groupchat *jabber_chat_by_name( struct im_connection *ic, const char *name );
-time_t jabber_get_timestamp( struct xt_node *xt );
 
 extern const struct jabber_away_state jabber_away_state_list[];
@@ -218 +193 @@
 gboolean sasl_supported( struct im_connection *ic );
 
-/* conference.c */
-struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password );
-void jabber_chat_free( struct groupchat *c );
-int jabber_chat_msg( struct groupchat *ic, char *message, int flags );
-int jabber_chat_leave( struct groupchat *c, const char *reason );
-void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bud, struct xt_node *node );
-void jabber_chat_pkt_message( struct im_connection *ic, struct jabber_buddy *bud, struct xt_node *node );
-
 #endif