pidgin: b7a866ec: Hide-a-Struct

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: b7a866ecc5b4c0101311c4fe6bd15d27cd2a15a8
Parent:   c08b2df23a05ff9d6bf18ff352784afb431dba6b
Author:   markdoliner at pidgin.im
Date:     08/23/11 00:37:58
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b7a866ecc5b4c0101311c4fe6bd15d27cd2a15a8

Changelog: 

Hide-a-Struct

Changes against parent c08b2df23a05ff9d6bf18ff352784afb431dba6b

  patched  ChangeLog.API
  patched  libpurple/request.c
  patched  libpurple/request.h

-------------- next part --------------
============================================================
--- libpurple/request.c	c3bffd1695fd47406da8b1723c1b7cf196738292
+++ libpurple/request.c	1bbf1c436ed3cd37d44e7e57bc0b25bc292576f2
@@ -42,7 +42,93 @@ typedef struct
 
 } PurpleRequestInfo;
 
+/**
+ * A request field.
+ */
+struct _PurpleRequestField
+{
+	PurpleRequestFieldType type;
+	PurpleRequestFieldGroup *group;
 
+	char *id;
+	char *label;
+	char *type_hint;
+
+	gboolean visible;
+	gboolean required;
+
+	union
+	{
+		struct
+		{
+			gboolean multiline;
+			gboolean masked;
+			gboolean editable;
+			char *default_value;
+			char *value;
+
+		} string;
+
+		struct
+		{
+			int default_value;
+			int value;
+
+		} integer;
+
+		struct
+		{
+			gboolean default_value;
+			gboolean value;
+
+		} boolean;
+
+		struct
+		{
+			int default_value;
+			int value;
+
+			GList *labels;
+
+		} choice;
+
+		struct
+		{
+			GList *items;
+			GList *icons;
+			GHashTable *item_data;
+			GList *selected;
+			GHashTable *selected_table;
+
+			gboolean multiple_selection;
+
+		} list;
+
+		struct
+		{
+			PurpleAccount *default_account;
+			PurpleAccount *account;
+			gboolean show_all;
+
+			PurpleFilterAccountFunc filter_func;
+
+		} account;
+
+		struct
+		{
+			unsigned int scale_x;
+			unsigned int scale_y;
+			const char *buffer;
+			gsize size;
+		} image;
+
+	} u;
+
+	void *ui_data;
+	char *tooltip;
+
+};
+
 PurpleRequestFields *
 purple_request_fields_new(void)
 {
============================================================
--- libpurple/request.h	a23823bdef393da5bbd160e88f8b14ee5c124984
+++ libpurple/request.h	d9b1562006b44b4b448d3b4cdde618e35e1ef2ab
@@ -96,96 +96,7 @@ typedef struct
 
 } PurpleRequestFieldGroup;
 
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_REQUEST_C_)
 /**
- * A request field.
- */
-struct _PurpleRequestField
-{
-	PurpleRequestFieldType type;
-	PurpleRequestFieldGroup *group;
-
-	char *id;
-	char *label;
-	char *type_hint;
-
-	gboolean visible;
-	gboolean required;
-
-	union
-	{
-		struct
-		{
-			gboolean multiline;
-			gboolean masked;
-			gboolean editable;
-			char *default_value;
-			char *value;
-
-		} string;
-
-		struct
-		{
-			int default_value;
-			int value;
-
-		} integer;
-
-		struct
-		{
-			gboolean default_value;
-			gboolean value;
-
-		} boolean;
-
-		struct
-		{
-			int default_value;
-			int value;
-
-			GList *labels;
-
-		} choice;
-
-		struct
-		{
-			GList *items;
-			GList *icons;
-			GHashTable *item_data;
-			GList *selected;
-			GHashTable *selected_table;
-
-			gboolean multiple_selection;
-
-		} list;
-
-		struct
-		{
-			PurpleAccount *default_account;
-			PurpleAccount *account;
-			gboolean show_all;
-
-			PurpleFilterAccountFunc filter_func;
-
-		} account;
-
-		struct
-		{
-			unsigned int scale_x;
-			unsigned int scale_y;
-			const char *buffer;
-			gsize size;
-		} image;
-
-	} u;
-
-	void *ui_data;
-	char *tooltip;
-
-};
-#endif
-
-/**
  * Request UI operations.
  */
 typedef struct
============================================================
--- ChangeLog.API	9a6c3ca09547cc2894354ca1dcdcb0dfea4d6aa8
+++ ChangeLog.API	d0f039eb637238904b4411b9abdb3aab63053db8
@@ -64,6 +64,7 @@ version 3.0.0 (??/??/????):
 		  purple_util_fetch_url_request_len, insetad.
 		* PurpleConnectionUiOps.report_disconnect_reason
 		* struct _GtkIMHtmlFontDetail
+		* struct _PurpleRequestField
 
 version 2.10.0:
 	libpurple: