cpw.darkrain42.xmpp.disco: 568f57b0: Fix compilation errors and add padding t...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 568f57b01d395f44b7b247252107d08d5f22c5d3
Ancestor: 34ef45492c89646f26de9bbebdbfdfa3274f4880
Author: paul at darkrain42.org
Date: 2009-03-29T20:54:30
Branch: im.pidgin.cpw.darkrain42.xmpp.disco
URL: http://d.pidgin.im/viewmtn/revision/info/568f57b01d395f44b7b247252107d08d5f22c5d3

Modified files:
        libpurple/disco.c libpurple/disco.h
        libpurple/protocols/jabber/disco.c

ChangeLog: 

Fix compilation errors and add padding to UI ops. My bad...

-------------- next part --------------
============================================================
--- libpurple/disco.c	7b08cba2694eab268ca987664f70a6b9ff9738e5
+++ libpurple/disco.c	f50e8ef193cbac22c0efcb20aa687463bba57eab
@@ -255,3 +255,8 @@ void purple_disco_set_ui_ops(PurpleDisco
 {
 	ops = ui_ops;
 }
+
+PurpleDiscoUiOps *purple_disco_get_ui_ops(void)
+{
+	return ops;
+}
============================================================
--- libpurple/disco.h	125a34d5559fa6a1c03be08aa0d22ca5709cf35f
+++ libpurple/disco.h	c681311b65457246b7e67378f5231ec4abe26a27
@@ -71,11 +71,11 @@ typedef enum
 	PURPLE_DISCO_SERVICE_TYPE_ICQ,
 	PURPLE_DISCO_SERVICE_TYPE_IRC,
 	PURPLE_DISCO_SERVICE_TYPE_MAIL,
-	PURPLE_DISCO_SERVICE_TYPE_MSN
+	PURPLE_DISCO_SERVICE_TYPE_MSN,
 	PURPLE_DISCO_SERVICE_TYPE_USER,
 	PURPLE_DISCO_SERVICE_TYPE_QQ,
 	PURPLE_DISCO_SERVICE_TYPE_XMPP,
-	PURPLE_DISCO_SERVICE_TYPE_YAHOO,
+	PURPLE_DISCO_SERVICE_TYPE_YAHOO
 } PurpleDiscoServiceType;
 
 /**
@@ -99,11 +99,19 @@ struct _PurpleDiscoUiOps {
 };
 
 struct _PurpleDiscoUiOps {
-	void (*dialog_show_with_account)(PurpleAccount* account); /**< Force the ui to pop up a dialog */
-	void (*create)(PurpleDiscoList *list); /**< Init ui resources */
-	void (*destroy)(PurpleDiscoList *list); /**< Free ui resources */
+	/** Ask the UI to display a dialog for the specified account.
+	 */
+	void (*dialog_show_with_account)(PurpleAccount* account);
+	void (*create)(PurpleDiscoList *list); /**< Sets UI-specific data on a disco list */
+	void (*destroy)(PurpleDiscoList *list); /**< Free UI-specific data on the disco list */
 	void (*add_service)(PurpleDiscoList *list, PurpleDiscoService *service, PurpleDiscoService *parent); /**< Add service to dialog */
 	void (*in_progress)(PurpleDiscoList *list, gboolean in_progress); /**< Set progress to dialog */
+
+	/* Padding */
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 #ifdef __cplusplus
@@ -197,6 +205,13 @@ void purple_disco_set_ui_ops(PurpleDisco
 void purple_disco_set_ui_ops(PurpleDiscoUiOps *ui_ops);
 
 /**
+ * Returns the service discovery UI operations structure.
+ *
+ * @return A filled-out PurpleDiscoUiOps structure.
+ */
+PurpleDiscoUiOps *purple_disco_get_ui_ops(void);
+
+/**
  * Register service
  * @param gc Connection
  * @param service The service that will be registered
============================================================
--- libpurple/protocols/jabber/disco.c	3c28e89b2da670795e9d7b655457a72a1cdd2ea5
+++ libpurple/protocols/jabber/disco.c	af969afb5a168212b09766f300374838de94a767
@@ -580,7 +580,7 @@ jabber_disco_category_from_string(const 
 	else if (!strcasecmp(str, "conference"))
 		return PURPLE_DISCO_SERVICE_CAT_MUC;
 
-	return PURPLE_DISCO_SERVICE_CAT_NONE;
+	return PURPLE_DISCO_SERVICE_CAT_OTHER;
 }
 
 static PurpleDiscoServiceType