diff libpurple/protocols/jabber/jabber.h @ 19697:481749fc0b6b

merge of '1c7910841138381c841363256ca3c7905b1f26b0' and '5818cbd5fe95d6a167f1555b882526f36790b141'

--- a/libpurple/protocols/jabber/jabber.h	Thu Sep 06 04:08:41 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Mon Sep 10 13:57:15 2007 +0000
@@ -12,38 +12,38 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA	 02111-1307	 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_H_
 #define _PURPLE_JABBER_H_
 
 typedef enum {
-	JABBER_CAP_NONE			  = 0,
-	JABBER_CAP_XHTML		  = 1 << 0,
-	JABBER_CAP_COMPOSING	  = 1 << 1,
-	JABBER_CAP_SI			  = 1 << 2,
-	JABBER_CAP_SI_FILE_XFER	  = 1 << 3,
-	JABBER_CAP_BYTESTREAMS	  = 1 << 4,
-	JABBER_CAP_IBB			  = 1 << 5,
-	JABBER_CAP_CHAT_STATES	  = 1 << 6,
-	JABBER_CAP_IQ_SEARCH	  = 1 << 7,
-	JABBER_CAP_IQ_REGISTER	  = 1 << 8,
-	
+	JABBER_CAP_NONE           = 0,
+	JABBER_CAP_XHTML          = 1 << 0,
+	JABBER_CAP_COMPOSING      = 1 << 1,
+	JABBER_CAP_SI             = 1 << 2,
+	JABBER_CAP_SI_FILE_XFER   = 1 << 3,
+	JABBER_CAP_BYTESTREAMS    = 1 << 4,
+	JABBER_CAP_IBB            = 1 << 5,
+	JABBER_CAP_CHAT_STATES    = 1 << 6,
+	JABBER_CAP_IQ_SEARCH      = 1 << 7,
+	JABBER_CAP_IQ_REGISTER    = 1 << 8,
+
 	/* Google Talk extensions: 
-	* http://code.google.com/apis/talk/jep_extensions/extensions.html
-	*/
-	JABBER_CAP_GMAIL_NOTIFY	  = 1 << 9,
+	 * http://code.google.com/apis/talk/jep_extensions/extensions.html
+	 */
+	JABBER_CAP_GMAIL_NOTIFY   = 1 << 9,
 	JABBER_CAP_GOOGLE_ROSTER  = 1 << 10,
-	
+
 	JABBER_CAP_PING			  = 1 << 11,
 	JABBER_CAP_ADHOC		  = 1 << 12,
 	
-	JABBER_CAP_RETRIEVED	  = 1 << 31
+	JABBER_CAP_RETRIEVED      = 1 << 31
 } JabberCapabilities;
 
 typedef struct _JabberStream JabberStream;
@@ -159,16 +159,16 @@
 	int sasl_state;
 	int sasl_maxbuf;
 	GString *sasl_mechs;
-	
+
 	gboolean unregistration;
 	PurpleAccountUnregistrationCb unregistration_cb;
 	void *unregistration_user_data;
 	
 	gboolean vcard_fetched;
-	
+
 	/* does the local server support PEP? */
 	gboolean pep;
-	
+
 	/* Is Buzz enabled? */
 	gboolean allowBuzz;