# HG changeset patch # User Mark Doliner # Date 1314074278 0 # Node ID 5c174d124e29d53d87e8c196607dd3ef7f7e8bdb # Parent 61ce89013291e0e29b3b7ab5b419a4a50e0e6ed1 Hide-a-Struct diff -r 61ce89013291 -r 5c174d124e29 ChangeLog.API --- a/ChangeLog.API Tue Aug 23 04:32:43 2011 +0000 +++ b/ChangeLog.API Tue Aug 23 04:37:58 2011 +0000 @@ -64,6 +64,7 @@ purple_util_fetch_url_request_len, insetad. * PurpleConnectionUiOps.report_disconnect_reason * struct _GtkIMHtmlFontDetail + * struct _PurpleRequestField version 2.10.0: libpurple: diff -r 61ce89013291 -r 5c174d124e29 libpurple/request.c --- a/libpurple/request.c Tue Aug 23 04:32:43 2011 +0000 +++ b/libpurple/request.c Tue Aug 23 04:37:58 2011 +0000 @@ -42,6 +42,92 @@ } 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) diff -r 61ce89013291 -r 5c174d124e29 libpurple/request.h --- a/libpurple/request.h Tue Aug 23 04:32:43 2011 +0000 +++ b/libpurple/request.h Tue Aug 23 04:37:58 2011 +0000 @@ -96,95 +96,6 @@ } 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. */