Mercurial > pidgin
changeset 12808:59ce7a35a22b
[gaim-migrate @ 15155]
Lots of whitespace changes, with some returned object class stuff thrown in
for good measure. I'm getting to the end of my changes.
committer: Tailor Script <tailor@pidgin.im>
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Tue, 10 Jan 2006 07:49:37 +0000 |
| parents | d6df6eb13ecf |
| children | d43f374b352b |
| files | plugins/perl/common/Request.xs plugins/perl/common/module.h plugins/perl/common/typemap |
| diffstat | 3 files changed, 348 insertions(+), 385 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/perl/common/Request.xs Tue Jan 10 05:49:48 2006 +0000 +++ b/plugins/perl/common/Request.xs Tue Jan 10 07:49:37 2006 +0000 @@ -20,25 +20,26 @@ } GaimPerlRequestData; /********************************************************/ -/* */ -/* Callback function that calls a perl subroutine */ -/* */ -/* The void * field data is being used as a way to hide */ -/* the perl sub's name in a GaimPerlRequestData */ -/* */ +/* */ +/* Callback function that calls a perl subroutine */ +/* */ +/* The void * field data is being used as a way to hide */ +/* the perl sub's name in a GaimPerlRequestData */ +/* */ /********************************************************/ -static void gaim_perl_request_ok_cb(void * data, GaimRequestFields *fields) { - +static void +gaim_perl_request_ok_cb(void * data, GaimRequestFields *fields) +{ GaimPerlRequestData *gpr = (GaimPerlRequestData *)data; dSP; ENTER; SAVETMPS; PUSHMARK(sp); - + XPUSHs(gaim_perl_bless_object(fields, "Gaim::Request::Fields")); PUTBACK; - + call_pv(gpr->ok_cb, G_EVAL | G_SCALAR); SPAGAIN; @@ -47,7 +48,9 @@ LEAVE; } -static void gaim_perl_request_cancel_cb(void * data, GaimRequestFields *fields) { +static void +gaim_perl_request_cancel_cb(void * data, GaimRequestFields *fields) +{ GaimPerlRequestData *gpr = (GaimPerlRequestData *)data; @@ -55,7 +58,7 @@ ENTER; SAVETMPS; PUSHMARK(sp); - + XPUSHs(gaim_perl_bless_object(fields, "Gaim::Request::Fields")); PUTBACK; call_pv(gpr->cancel_cb, G_EVAL | G_SCALAR); @@ -87,18 +90,18 @@ GaimPerlRequestData *gpr; STRLEN len; char *basename, *package; - + basename = g_path_get_basename(handle->path); gaim_perl_normalize_script_name(basename); package = g_strdup_printf("Gaim::Script::%s", basename); gpr = g_new(GaimPerlRequestData, 1); gpr->ok_cb = g_strdup_printf("%s::%s", package, SvPV(ok_cb, len)); gpr->cancel_cb = g_strdup_printf("%s::%s", package, SvPV(cancel_cb, len)); - + RETVAL = gaim_request_input(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(gaim_perl_request_ok_cb), cancel_text, G_CALLBACK(gaim_perl_request_cancel_cb), gpr); OUTPUT: RETVAL - + void * gaim_request_file(handle, title, filename, savedialog, ok_cb, cancel_cb) Gaim::Plugin handle @@ -122,7 +125,6 @@ RETVAL = gaim_request_file(handle, title, filename, savedialog, G_CALLBACK(gaim_perl_request_ok_cb), G_CALLBACK(gaim_perl_request_cancel_cb), gpr); OUTPUT: RETVAL - void * gaim_request_fields(handle, title, primary, secondary, fields, ok_text, ok_cb, cancel_text, cancel_cb) @@ -139,7 +141,7 @@ GaimPerlRequestData *gpr; STRLEN len; char *basename, *package; - + basename = g_path_get_basename(handle->path); gaim_perl_normalize_script_name(basename); package = g_strdup_printf("Gaim::Script::%s", basename); @@ -160,6 +162,9 @@ gaim_request_close_with_handle(handle) void * handle +MODULE = Gaim::Request PACKAGE = Gaim::Request::Field PREFIX = gaim_request_field_ +PROTOTYPES: ENABLE + Gaim::Account gaim_request_field_account_get_default_value(field) Gaim::Request::Field field @@ -172,7 +177,7 @@ OUTPUT: RETVAL -gboolean +gboolean gaim_request_field_account_get_show_all(field) Gaim::Request::Field field @@ -186,27 +191,27 @@ const char *text Gaim::Account account -void +void gaim_request_field_account_set_default_value(field, default_value) Gaim::Request::Field field Gaim::Account default_value -void +void gaim_request_field_account_set_show_all(field, show_all) Gaim::Request::Field field gboolean show_all -void +void gaim_request_field_account_set_value(field, value) Gaim::Request::Field field Gaim::Account value -gboolean +gboolean gaim_request_field_bool_get_default_value(field) Gaim::Request::Field field -gboolean +gboolean gaim_request_field_bool_get_value(field) Gaim::Request::Field field @@ -216,22 +221,22 @@ const char *text gboolean default_value -void +void gaim_request_field_bool_set_default_value(field, default_value) Gaim::Request::Field field gboolean default_value -void +void gaim_request_field_bool_set_value(field, value) Gaim::Request::Field field gboolean value -void +void gaim_request_field_choice_add(field, label) Gaim::Request::Field field const char *label -int +int gaim_request_field_choice_get_default_value(field) Gaim::Request::Field field @@ -239,16 +244,13 @@ gaim_request_field_choice_get_labels(field) Gaim::Request::Field field PREINIT: - GList *l; + GList *l; PPCODE: - for (l = gaim_request_field_choice_get_labels(field); l != NULL; l = l->next) { - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); - } + for (l = gaim_request_field_choice_get_labels(field); l != NULL; l = l->next) { + XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); + } - - - -int +int gaim_request_field_choice_get_value(field) Gaim::Request::Field field @@ -258,17 +260,17 @@ const char *text int default_value -void +void gaim_request_field_choice_set_default_value(field, default_value) Gaim::Request::Field field int default_value -void +void gaim_request_field_choice_set_value(field, value) Gaim::Request::Field field int value -void +void gaim_request_field_destroy(field) Gaim::Request::Field field @@ -288,40 +290,11 @@ gaim_request_field_get_type_hint(field) Gaim::Request::Field field -void -gaim_request_field_group_add_field(group, field) - Gaim::Request::Field::Group group - Gaim::Request::Field field - -void -gaim_request_field_group_destroy(group) - Gaim::Request::Field::Group group - -void -gaim_request_field_group_get_fields(group) - Gaim::Request::Field::Group group -PREINIT: - GList *l; -PPCODE: - for (l = gaim_request_field_group_get_fields(group); l != NULL; l = l->next) { - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); - } - - - -const char * -gaim_request_field_group_get_title(group) - Gaim::Request::Field::Group group - -Gaim::Request::Field::Group -gaim_request_field_group_new(title) - const char *title - -int +int gaim_request_field_int_get_default_value(field) Gaim::Request::Field field -int +int gaim_request_field_int_get_value(field) Gaim::Request::Field field @@ -331,21 +304,21 @@ const char *text int default_value -void +void gaim_request_field_int_set_default_value(field, default_value) Gaim::Request::Field field int default_value -void +void gaim_request_field_int_set_value(field, value) Gaim::Request::Field field int value -gboolean +gboolean gaim_request_field_is_required(field) Gaim::Request::Field field -gboolean +gboolean gaim_request_field_is_visible(field) Gaim::Request::Field field @@ -354,18 +327,18 @@ const char *id const char *text -void +void gaim_request_field_list_add(field, item, data) Gaim::Request::Field field const char *item - void * data + void * data -void +void gaim_request_field_list_add_selected(field, item) Gaim::Request::Field field const char *item -void +void gaim_request_field_list_clear_selected(field) Gaim::Request::Field field @@ -378,13 +351,13 @@ gaim_request_field_list_get_items(field) Gaim::Request::Field field PREINIT: - const GList *l; + const GList *l; PPCODE: - for (l = gaim_request_field_list_get_items(field); l != NULL; l = l->next) { - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); - } + for (l = gaim_request_field_list_get_items(field); l != NULL; l = l->next) { + XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); + } -gboolean +gboolean gaim_request_field_list_get_multi_select(field) Gaim::Request::Field field @@ -392,14 +365,13 @@ gaim_request_field_list_get_selected(field) Gaim::Request::Field field PREINIT: - const GList *l; + const GList *l; PPCODE: - for (l = gaim_request_field_list_get_selected(field); l != NULL; l = l->next) { - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); - } + for (l = gaim_request_field_list_get_selected(field); l != NULL; l = l->next) { + XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); + } - -gboolean +gboolean gaim_request_field_list_is_selected(field, item) Gaim::Request::Field field const char *item @@ -409,7 +381,7 @@ const char *id const char *text -void +void gaim_request_field_list_set_multi_select(field, multi_select) Gaim::Request::Field field gboolean multi_select @@ -420,22 +392,22 @@ const char *text Gaim::RequestFieldType type -void +void gaim_request_field_set_label(field, label) Gaim::Request::Field field const char *label -void +void gaim_request_field_set_required(field, required) Gaim::Request::Field field gboolean required -void +void gaim_request_field_set_type_hint(field, type_hint) Gaim::Request::Field field const char *type_hint -void +void gaim_request_field_set_visible(field, visible) Gaim::Request::Field field gboolean visible @@ -448,15 +420,15 @@ gaim_request_field_string_get_value(field) Gaim::Request::Field field -gboolean +gboolean gaim_request_field_string_is_editable(field) Gaim::Request::Field field -gboolean +gboolean gaim_request_field_string_is_masked(field) Gaim::Request::Field field -gboolean +gboolean gaim_request_field_string_is_multiline(field) Gaim::Request::Field field @@ -467,40 +439,80 @@ const char *default_value gboolean multiline -void +void gaim_request_field_string_set_default_value(field, default_value) Gaim::Request::Field field const char *default_value -void +void gaim_request_field_string_set_editable(field, editable) Gaim::Request::Field field gboolean editable -void +void gaim_request_field_string_set_masked(field, masked) Gaim::Request::Field field gboolean masked -void +void gaim_request_field_string_set_value(field, value) Gaim::Request::Field field const char *value -void +Gaim::Request::UiOps +gaim_request_get_ui_ops() + +void +gaim_request_set_ui_ops(ops) + Gaim::Request::UiOps ops + +MODULE = Gaim::Request PACKAGE = Gaim::Request::Field::Group PREFIX = gaim_request_field_group_ +PROTOTYPES: ENABLE + +void +gaim_request_field_group_add_field(group, field) + Gaim::Request::Field::Group group + Gaim::Request::Field field + +void +gaim_request_field_group_destroy(group) + Gaim::Request::Field::Group group + +void +gaim_request_field_group_get_fields(group) + Gaim::Request::Field::Group group +PREINIT: + GList *l; +PPCODE: + for (l = gaim_request_field_group_get_fields(group); l != NULL; l = l->next) { + XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); + } + +const char * +gaim_request_field_group_get_title(group) + Gaim::Request::Field::Group group + +Gaim::Request::Field::Group +gaim_request_field_group_new(title) + const char *title + +MODULE = Gaim::Request PACKAGE = Gaim::Request::Fields PREFIX = gaim_request_fields_ +PROTOTYPES: ENABLE + +void gaim_request_fields_add_group(fields, group) Gaim::Request::Fields fields Gaim::Request::Field::Group group -gboolean +gboolean gaim_request_fields_all_required_filled(fields) Gaim::Request::Fields fields -void +void gaim_request_fields_destroy(fields) Gaim::Request::Fields fields -gboolean +gboolean gaim_request_fields_exists(fields, id) Gaim::Request::Fields fields const char *id @@ -510,12 +522,12 @@ Gaim::Request::Fields fields const char *id -gboolean +gboolean gaim_request_fields_get_bool(fields, id) Gaim::Request::Fields fields const char *id -int +int gaim_request_fields_get_choice(fields, id) Gaim::Request::Fields fields const char *id @@ -529,15 +541,13 @@ gaim_request_fields_get_groups(fields) Gaim::Request::Fields fields PREINIT: - GList *l; + GList *l; PPCODE: - for (l = gaim_request_fields_get_groups(fields); l != NULL; l = l->next) { - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); - } + for (l = gaim_request_fields_get_groups(fields); l != NULL; l = l->next) { + XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Request::Field::Group"))); + } - - -int +int gaim_request_fields_get_integer(fields, id) Gaim::Request::Fields fields const char *id @@ -546,33 +556,21 @@ gaim_request_fields_get_required(fields) Gaim::Request::Fields fields PREINIT: - const GList *l; + const GList *l; PPCODE: - for (l = gaim_request_fields_get_required(fields); l != NULL; l = l->next) { - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem"))); - } - - + for (l = gaim_request_fields_get_required(fields); l != NULL; l = l->next) { + XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Request::Field"))); + } const char * gaim_request_fields_get_string(fields, id) Gaim::Request::Fields fields const char *id -gboolean +gboolean gaim_request_fields_is_field_required(fields, id) Gaim::Request::Fields fields const char *id Gaim::Request::Fields gaim_request_fields_new() - - -Gaim::Request::UiOps -gaim_request_get_ui_ops() - - -void -gaim_request_set_ui_ops(ops) - Gaim::Request::UiOps ops -
--- a/plugins/perl/common/module.h Tue Jan 10 05:49:48 2006 +0000 +++ b/plugins/perl/common/module.h Tue Jan 10 07:49:37 2006 +0000 @@ -57,202 +57,194 @@ #include "value.h" #include "xmlnode.h" - /* account.h */ -typedef GaimAccount * Gaim__Account; -typedef GaimAccountOption * Gaim__Account__Option; -typedef GaimAccountUiOps * Gaim__Account__UiOps; -typedef GaimAccountUserSplit * Gaim__Account__UserSplit; +/* account.h */ +typedef GaimAccount * Gaim__Account; +typedef GaimAccountOption * Gaim__Account__Option; +typedef GaimAccountUiOps * Gaim__Account__UiOps; +typedef GaimAccountUserSplit * Gaim__Account__UserSplit; - /* blist.h */ -typedef GaimBlistNode * Gaim__BuddyList__Node; -typedef GaimBlistNodeAction * Gaim__BuddyList__Node__Action; -typedef GaimBlistUiOps * Gaim__BuddyList__UiOps; +/* blist.h */ +typedef GaimBlistNode * Gaim__BuddyList__Node; +typedef GaimBlistNodeAction * Gaim__BuddyList__Node__Action; typedef GaimBlistNodeFlags Gaim__BlistNodeFlags; -typedef GaimBuddyList * Gaim__BuddyList; -typedef GaimBuddy * Gaim__BuddyList__Buddy; -typedef GaimChat * Gaim__BuddyList__Chat; -typedef GaimContact * Gaim__BuddyList__Contact; -typedef GaimGroup * Gaim__BuddyList__Group; +typedef GaimBlistUiOps * Gaim__BuddyList__UiOps; +typedef GaimBuddyList * Gaim__BuddyList; +typedef GaimBuddy * Gaim__BuddyList__Buddy; +typedef GaimChat * Gaim__BuddyList__Chat; +typedef GaimContact * Gaim__BuddyList__Contact; +typedef GaimGroup * Gaim__BuddyList__Group; - /* buddyicon.h */ -typedef GaimBuddyIcon * Gaim__Buddy__Icon; +/* buddyicon.h */ +typedef GaimBuddyIcon * Gaim__Buddy__Icon; - /* cipher.h */ +/* cipher.h */ +typedef GaimCipher * Gaim__Cipher; typedef GaimCipherCaps Gaim__CipherCaps; -typedef GaimCipher * Gaim__Cipher; +typedef GaimCipherContext * Gaim__Cipher__Context; typedef GaimCipherOps * Gaim__Cipher__Ops; -typedef GaimCipherContext * Gaim__Cipher__Context; - /* cmds.h */ -typedef GaimCmdId Gaim__CmdId; +/* cmds.h */ +typedef GaimCmdId Gaim__CmdId; - /* connection.h */ +/* connection.h */ +typedef GaimConnection * Gaim__Connection; typedef GaimConnectionFlags Gaim__ConnectionFlags; typedef GaimConnectionState Gaim__ConnectionState; -typedef GaimConnection * Gaim__Connection; -typedef GaimConnectionUiOps * Gaim__Connection__UiOps; +typedef GaimConnectionUiOps * Gaim__Connection__UiOps; - /* converstaion.h */ -typedef GaimConversationType Gaim__ConversationType; -typedef GaimUnseenState Gaim__UnseenState; +/* conversation.h */ +typedef GaimConversationType Gaim__ConversationType; +typedef GaimUnseenState Gaim__UnseenState; typedef GaimConvUpdateType Gaim__ConvUpdateType; typedef GaimTypingState Gaim__TypingState; -typedef GaimMessageFlags Gaim__MessageFlags; -typedef GaimConvChatBuddyFlags Gaim__ConvChatBuddyFlags; -//typedef GaimConvWindowUiOps * Gaim__ConvWindow__UiOps; -//typedef GaimConvWindow * Gaim__ConvWindow; -typedef GaimConversationUiOps * Gaim__Conversation__UiOps; -typedef GaimConversation * Gaim__Conversation; -typedef GaimConvIm * Gaim__Conversation__IM; -typedef GaimConvChat * Gaim__Conversation__Chat; -typedef GaimConvChatBuddy * Gaim__Conversation__ChatBuddy; +typedef GaimMessageFlags Gaim__MessageFlags; +typedef GaimConvChatBuddyFlags Gaim__ConvChatBuddyFlags; +typedef GaimConversation * Gaim__Conversation; +typedef GaimConversationUiOps * Gaim__Conversation__UiOps; +typedef GaimConvIm * Gaim__Conversation__IM; +typedef GaimConvChat * Gaim__Conversation__Chat; +typedef GaimConvChatBuddy * Gaim__Conversation__ChatBuddy; - /* debug.h */ -typedef GaimDebugLevel Gaim__DebugLevel; +/* debug.h */ +typedef GaimDebugLevel Gaim__DebugLevel; - /* desktopitem.h */ -typedef GaimDesktopItem * Gaim__DesktopItem; -typedef GaimDesktopItemType Gaim__DesktopItemType; +/* desktopitem.h */ +typedef GaimDesktopItem * Gaim__DesktopItem; +typedef GaimDesktopItemType Gaim__DesktopItemType; - /* eventloop.h */ -typedef GaimInputCondition * Gaim__InputCondition; -typedef GaimEventLoopUiOps * Gaim__EventLoopUiOps; +/* eventloop.h */ +typedef GaimInputCondition * Gaim__InputCondition; +typedef GaimEventLoopUiOps * Gaim__EventLoopUiOps; - /* ft.h */ -typedef GaimXfer * Gaim__Xfer; -typedef GaimXferType Gaim__XferType; -typedef GaimXferStatusType Gaim__XferStatusType; -typedef GaimXferUiOps * Gaim__XferUiOps; +/* ft.h */ +typedef GaimXfer * Gaim__Xfer; +typedef GaimXferType Gaim__XferType; +typedef GaimXferStatusType Gaim__XferStatusType; +typedef GaimXferUiOps * Gaim__XferUiOps; - /* gtkblish.h */ +/* gtkblish.h */ typedef GaimGtkBuddyList * Gaim__GTK__BuddyList; -typedef GaimStatusIconSize Gaim__StatusIconSize; +typedef GaimStatusIconSize Gaim__StatusIconSize; - - /* gtkutils.h */ +/* gtkutils.h */ typedef GaimButtonOrientation Gaim__ButtonOrientation; typedef GaimButtonStyle Gaim__ButtonStyle; #ifndef _WIN32 typedef GaimBrowserPlace Gaim__BrowserPlace; #endif /* _WIN32 */ - /* gtkconv.h */ +/* gtkconv.h */ +typedef GaimGtkConversation * Gaim__GTK__Conversation; typedef GdkPixbuf * Gaim__GDK__Pixbuf; typedef GtkWidget * Gaim__GTK__Widget; -typedef GaimGtkConversation * Gaim__GTK__Conversation; - /* gtkutils.h */ -typedef GtkSelectionData * Gaim__GTK__SelectionData; +/* gtkutils.h */ typedef GtkFileSelection * Gaim__GTK__FileSelection; +typedef GtkSelectionData * Gaim__GTK__SelectionData; typedef GtkTextView * Gaim__GTK__TextView; - /* gtkconn.h */ +/* gtkconn.h */ - /* imgstore.h */ -typedef GaimStoredImage * Gaim__StoredImage; +/* imgstore.h */ +typedef GaimStoredImage * Gaim__StoredImage; - /* log.h */ -typedef GaimLog * Gaim__Log; -typedef GaimLogLogger * Gaim__Log__Logger; -typedef GaimLogCommonLoggerData * Gaim__LogCommonLoggerData; -typedef GaimLogSet * Gaim__LogSet; -typedef GaimLogType Gaim__LogType; -typedef GaimLogReadFlags * Gaim__Log__ReadFlags; +/* log.h */ +typedef GaimLog * Gaim__Log; +typedef GaimLogCommonLoggerData * Gaim__LogCommonLoggerData; +typedef GaimLogLogger * Gaim__Log__Logger; +typedef GaimLogReadFlags * Gaim__Log__ReadFlags; +typedef GaimLogSet * Gaim__LogSet; +typedef GaimLogType Gaim__LogType; - /* notify.h */ +/* notify.h */ typedef GaimNotifyCloseCallback Gaim__NotifyCloseCallback; -typedef GaimNotifyType Gaim__NotifyType; -typedef GaimNotifyMsgType Gaim__NotifyMsgType; +typedef GaimNotifyMsgType Gaim__NotifyMsgType; typedef GaimNotifySearchButtonType Gaim__NotifySearchButtonType; typedef GaimNotifySearchResults * Gaim__NotifySearchResults; typedef GaimNotifySearchColumn * Gaim__NotifySearchColumn; typedef GaimNotifySearchButton * Gaim__NotifySearchButton; +typedef GaimNotifyType Gaim__NotifyType; typedef GaimNotifyUiOps * Gaim__NotifyUiOps; - /* plugin.h */ -typedef GaimPlugin * Gaim__Plugin; +/* plugin.h */ +typedef GaimPlugin * Gaim__Plugin; +typedef GaimPluginAction * Gaim__Plugin__Action; +typedef GaimPluginInfo * Gaim__PluginInfo; +typedef GaimPluginLoaderInfo * Gaim__PluginLoaderInfo; typedef GaimPluginType Gaim__PluginType; -typedef GaimPluginInfo * Gaim__PluginInfo; -typedef GaimPluginUiInfo * Gaim__PluginUiInfo; -typedef GaimPluginLoaderInfo * Gaim__PluginLoaderInfo; -typedef GaimPluginAction * Gaim__Plugin__Action; +typedef GaimPluginUiInfo * Gaim__PluginUiInfo; - /* pluginpref.h */ -typedef GaimPluginPrefFrame * Gaim__PluginPref__Frame; -typedef GaimPluginPref * Gaim__PluginPref; -typedef GaimPluginPrefType Gaim__PluginPrefType; +/* pluginpref.h */ +typedef GaimPluginPref * Gaim__PluginPref; +typedef GaimPluginPrefFrame * Gaim__PluginPref__Frame; +typedef GaimPluginPrefType Gaim__PluginPrefType; - /* pounce.h */ -typedef GaimPounce * Gaim__Pounce; -typedef GaimPounceEvent Gaim__PounceEvent; - +/* pounce.h */ +typedef GaimPounce * Gaim__Pounce; +typedef GaimPounceEvent Gaim__PounceEvent; - /* prefs.h */ -typedef GaimPrefType Gaim__PrefType; +/* prefs.h */ +typedef GaimPrefType Gaim__PrefType; - /* privacy.h */ -typedef GaimPrivacyType Gaim__PrivacyType; -typedef GaimPrivacyUiOps * Gaim__Privacy__UiOps; - - /* proxy.h */ -typedef GaimProxyType Gaim__ProxyType; -typedef GaimProxyInfo * Gaim__ProxyInfo; +/* privacy.h */ +typedef GaimPrivacyType Gaim__PrivacyType; +typedef GaimPrivacyUiOps * Gaim__Privacy__UiOps; +/* proxy.h */ +typedef GaimProxyInfo * Gaim__ProxyInfo; +typedef GaimProxyType Gaim__ProxyType; - /* prpl.h */ -typedef GaimBuddyIconSpec * Gaim__Buddy__Icon__Spec; -typedef GaimPluginProtocolInfo * Gaim__PluginProtocolInfo; -typedef GaimIconScaleRules Gaim__IconScaleRules; -typedef GaimProtocolOptions Gaim__ProtocolOptions; +/* prpl.h */ +typedef GaimBuddyIconSpec * Gaim__Buddy__Icon__Spec; +typedef GaimIconScaleRules Gaim__IconScaleRules; +typedef GaimPluginProtocolInfo * Gaim__PluginProtocolInfo; +typedef GaimProtocolOptions Gaim__ProtocolOptions; - /* request.h */ -typedef GaimRequestType Gaim__RequestType; -typedef GaimRequestFieldType Gaim__RequestFieldType; +/* request.h */ +typedef GaimRequestField * Gaim__Request__Field; typedef GaimRequestFields * Gaim__Request__Fields; typedef GaimRequestFieldGroup * Gaim__Request__Field__Group; -typedef GaimRequestField * Gaim__Request__Field; +typedef GaimRequestFieldType Gaim__RequestFieldType; +typedef GaimRequestType Gaim__RequestType; typedef GaimRequestUiOps * Gaim__Request__UiOps; - /* roomlist.h */ - -typedef GaimRoomlist * Gaim__Roomlist; -typedef GaimRoomlistRoom * Gaim__Roomlist__Room; -typedef GaimRoomlistField * Gaim__Roomlist__Field; -typedef GaimRoomlistUiOps * Gaim__Roomlist__UiOps; -typedef GaimRoomlistRoomType Gaim__RoomlistRoomType; -typedef GaimRoomlistFieldType Gaim__RoomlistFieldType; +/* roomlist.h */ +typedef GaimRoomlist * Gaim__Roomlist; +typedef GaimRoomlistField * Gaim__Roomlist__Field; +typedef GaimRoomlistFieldType Gaim__RoomlistFieldType; +typedef GaimRoomlistRoom * Gaim__Roomlist__Room; +typedef GaimRoomlistRoomType Gaim__RoomlistRoomType; +typedef GaimRoomlistUiOps * Gaim__Roomlist__UiOps; - /* savedstatuses.h */ -typedef GaimSavedStatus * Gaim__SavedStatus; -typedef GaimSavedStatusSub * Gaim__SavedStatusSub; +/* savedstatuses.h */ +typedef GaimSavedStatus * Gaim__SavedStatus; +typedef GaimSavedStatusSub * Gaim__SavedStatusSub; - /* sound.h */ -typedef GaimSoundEventID Gaim__SoundEventID; -typedef GaimSoundUiOps * Gaim__Sound__UiOps; +/* sound.h */ +typedef GaimSoundEventID Gaim__SoundEventID; +typedef GaimSoundUiOps * Gaim__Sound__UiOps; - /* sslconn.h */ -typedef GaimSslConnection * Gaim__Ssl__Connection; -typedef GaimInputCondition * Gaim__Input__Condition; -typedef GaimSslErrorType Gaim__SslErrorType; +/* sslconn.h */ +typedef GaimInputCondition * Gaim__Input__Condition; +typedef GaimSslConnection * Gaim__Ssl__Connection; +typedef GaimSslErrorType Gaim__SslErrorType; typedef GaimSslOps * Gaim__Ssl__Ops; - /* status.h */ -typedef GaimStatusType * Gaim__StatusType; -typedef GaimStatusAttr * Gaim__StatusAttr; -typedef GaimPresence * Gaim__Presence; -typedef GaimStatus * Gaim__Status; -typedef GaimPresenceContext Gaim__PresenceContext; -typedef GaimStatusPrimitive Gaim__StatusPrimitive; +/* status.h */ +typedef GaimPresence * Gaim__Presence; +typedef GaimPresenceContext Gaim__PresenceContext; +typedef GaimStatus * Gaim__Status; +typedef GaimStatusAttr * Gaim__StatusAttr; +typedef GaimStatusPrimitive Gaim__StatusPrimitive; +typedef GaimStatusType * Gaim__StatusType; typedef GaimStringref * Gaim__Stringref; - /* value.h */ +/* value.h */ typedef GaimValue * Gaim__Value; - /* xmlnode.h */ -typedef xmlnode * Gaim__XMLNode; -typedef XMLNodeType XMLNode__Type; +/* xmlnode.h */ +typedef xmlnode * Gaim__XMLNode; +typedef XMLNodeType XMLNode__Type; - - /* other.h */ - +/* other.h */
--- a/plugins/perl/common/typemap Tue Jan 10 05:49:48 2006 +0000 +++ b/plugins/perl/common/typemap Tue Jan 10 07:49:37 2006 +0000 @@ -6,12 +6,12 @@ const guint8 * T_PTR guint8 T_IV guint8 * T_PTR -time_t T_IV -gboolean T_BOOL +time_t T_IV +gboolean T_BOOL gpointer T_GaimObj gconstpointer T_PTR const gchar * T_PV -const char * T_PV +const char * T_PV const char ** T_PTR char ** T_PTR gchar T_IV @@ -26,9 +26,9 @@ Gaim::GTK::Widget * T_PTR GCallback T_PTR va_list T_PTR -GString * T_PTR +GString * T_PTR GData * T_PTR -GData ** T_PTR +GData ** T_PTR const unsigned char * T_PTR const struct tm * T_PTR xmlnode * T_PTR @@ -36,46 +36,38 @@ gssize T_IV const void * T_PTR -Gaim::Account T_GaimObj -Gaim::Account::Option T_GaimObj +Gaim::Account T_GaimObj +Gaim::Account::Option T_GaimObj Gaim::Account::UiOps T_GaimObj Gaim::Account::UserSplit T_GaimObj - Gaim::BlistNodeFlags T_IV -Gaim::Buddy::Icon T_GaimObj +Gaim::Buddy::Icon T_GaimObj Gaim::Buddy::Icon::Spec T_GaimObj -Gaim::BuddyList T_GaimObj -Gaim::BuddyList::Group T_GaimObj -Gaim::BuddyList::Buddy T_GaimObj -Gaim::BuddyList::Chat T_GaimObj -Gaim::BuddyList::Contact T_GaimObj -Gaim::BuddyList::Node T_GaimObj +Gaim::BuddyList T_GaimObj +Gaim::BuddyList::Buddy T_GaimObj +Gaim::BuddyList::Chat T_GaimObj +Gaim::BuddyList::Contact T_GaimObj +Gaim::BuddyList::Group T_GaimObj +Gaim::BuddyList::Node T_GaimObj Gaim::BuddyList::Node::Action T_GaimObj Gaim::BuddyList::UiOps T_GaimObj - Gaim::Cipher T_GaimObj +Gaim::CipherCaps T_IV Gaim::Cipher::Ops T_GaimObj Gaim::Cipher::Context T_GaimObj -Gaim::CipherCaps T_IV -Gaim::CmdId T_IV -Gaim::Connection T_GaimObj +Gaim::CmdId T_IV +Gaim::Connection T_GaimObj Gaim::Connection::UiOps T_GaimObj -Gaim::ConvWindow::UiOps T_GaimObj +Gaim::Conversation T_GaimObj +Gaim::Conversation::Chat T_GaimObj +Gaim::Conversation::ChatBuddy T_GaimObj +Gaim::Conversation::IM T_GaimObj Gaim::Conversation::UiOps T_GaimObj -Gaim::Conversation T_GaimObj -Gaim::Conversation::Chat T_GaimObj -Gaim::Conversation::IM T_GaimObj -Gaim::ConvWindow T_GaimObj -Gaim::Conversation::ChatBuddy T_GaimObj -Gaim::ConvImFlags T_IV -Gaim::ConvChatFlags T_IV - -Gaim::Desktop::Item T_GaimObj -Gaim::DesktopItemType T_IV - +Gaim::Desktop::Item T_GaimObj +Gaim::DesktopItemType T_IV Gaim::GTK::BuddyList T_GaimObj Gaim::GDK::Pixbuf T_GaimObj @@ -85,138 +77,119 @@ Gaim::GTK::SelectionData T_GaimObj Gaim::GTK::TextView T_GaimObj - -Gaim::IconScaleRules T_IV -Gaim::IM T_GaimObj - +Gaim::IconScaleRules T_IV Gaim::Log T_GaimObj -Gaim::Log::Logger T_GaimObj -Gaim::Log::CommonLoggerData T_GaimObj -Gaim::Log::Set T_GaimObj -Gaim::LogType T_IV -Gaim::Log::ReadFlags T_GaimObj - +Gaim::LogType T_IV +Gaim::Log::CommonLoggerData T_GaimObj +Gaim::Log::Logger T_GaimObj +Gaim::Log::ReadFlags T_GaimObj +Gaim::Log::Set T_GaimObj Gaim::NotifyCloseCallback T_PTR -Gaim::NotifyType T_IV -Gaim::NotifyMsgType T_IV +Gaim::NotifyMsgType T_IV Gaim::NotifySearchButtonType T_IV Gaim::NotifySearchResults T_GaimObj Gaim::NotifySearchColumn T_GaimObj Gaim::NotifySearchButton T_GaimObj +Gaim::NotifyType T_IV Gaim::NotifyUiOps T_GaimObj -Gaim::Plugin T_GaimObj -Gaim::Plugin::Info T_GaimObj -Gaim::PluginUiInfo T_GaimObj -Gaim::Plugin::Loader::Info T_GaimObj -Gaim::Plugin::Action T_GaimObj -Gaim::Plugin::Protocol::Info T_GaimObj -Gaim::PluginType T_IV -Gaim::PrefType T_IV -Gaim::PluginPref::Frame T_GaimObj -Gaim::PluginPref T_GaimObj -Gaim::PluginPrefType T_IV -Gaim::Pounce T_GaimObj -Gaim::PounceEvent T_IV +Gaim::Plugin T_GaimObj +Gaim::PluginType T_IV +Gaim::PluginUiInfo T_GaimObj +Gaim::Plugin::Action T_GaimObj +Gaim::Plugin::Info T_GaimObj +Gaim::Plugin::Loader::Info T_GaimObj +Gaim::Plugin::Protocol::Info T_GaimObj +Gaim::PrefType T_IV +Gaim::PluginPref T_GaimObj +Gaim::PluginPrefType T_IV +Gaim::PluginPref::Frame T_GaimObj +Gaim::Pounce T_GaimObj +Gaim::PounceEvent T_IV Gaim::Presence T_GaimObj -Gaim::PrivacyType T_IV +Gaim::PrivacyType T_IV Gaim::Privacy::UiOps T_GaimObj -Gaim::ProtocolOptions T_IV -Gaim::ProxyType T_IV +Gaim::ProtocolOptions T_IV Gaim::ProxyInfo T_GaimObj - +Gaim::ProxyType T_IV -Gaim::RequestType T_IV -Gaim::RequestFieldType T_IV -Gaim::Request::Fields T_GaimObj -Gaim::Request::Field T_GaimObj -Gaim::Request::Field::Group T_GaimObj -Gaim::Request::UiOps T_GaimObj +Gaim::RequestFieldType T_IV +Gaim::RequestType T_IV +Gaim::Request::Field T_GaimObj +Gaim::Request::Fields T_GaimObj +Gaim::Request::Field::Group T_GaimObj +Gaim::Request::UiOps T_GaimObj + +Gaim::Roomlist T_GaimObj +Gaim::Roomlist::Room T_GaimObj +Gaim::Roomlist::Field T_GaimObj +Gaim::Roomlist::UiOps T_GaimObj +Gaim::RoomlistFieldType T_IV +Gaim::RoomlistRoomType T_IV -Gaim::Roomlist T_GaimObj -Gaim::Roomlist::Room T_GaimObj -Gaim::Roomlist::Field T_GaimObj -Gaim::Roomlist::UiOps T_GaimObj -Gaim::RoomlistRoomType T_IV -Gaim::RoomlistFieldType T_IV +Gaim::SavedStatus T_GaimObj +Gaim::SavedStatusSub T_GaimObj +Gaim::SoundEventID T_IV +Gaim::Sound::UiOps T_GaimObj -Gaim::SavedStatus T_GaimObj -Gaim::SavedStatusSub T_GaimObj -Gaim::SoundEventID T_IV -Gaim::Sound::UiOps T_GaimObj +Gaim::Input::Condition T_GaimObj +Gaim::SslErrorType T_IV +Gaim::Ssl::Connection T_GaimObj +Gaim::Ssl::Ops T_GaimObj -Gaim::Ssl::Connection T_GaimObj -Gaim::Input::Condition T_GaimObj -Gaim::SslErrorType T_IV -Gaim::Ssl::Ops T_GaimObj - +Gaim::Presence T_GaimObj +Gaim::PresenceContext T_IV Gaim::Status T_GaimObj +Gaim::StatusAttr T_GaimObj +Gaim::StatusPrimitive T_IV Gaim::StatusType T_GaimObj const Gaim::StatusType T_GaimObj -Gaim::StatusAttr T_GaimObj -Gaim::Presence T_GaimObj -Gaim::PresenceContext T_IV -Gaim::StatusPrimitive T_IV - -Gaim::StoredImage T_GaimObj +Gaim::StoredImage T_GaimObj Gaim::Stringref T_GaimObj Gaim::Value T_GaimObj -Gaim::Xfer T_GaimObj -Gaim::XferType T_IV -Gaim::XferStatusType T_IV +Gaim::Xfer T_GaimObj +Gaim::XferType T_IV +Gaim::XferStatusType T_IV Gaim::XferUiOps T_IV -Gaim::XMLNode T_GaimObj -XMLNode::Type T_IV - - - - +Gaim::XMLNode T_GaimObj +XMLNode::Type T_IV - - +/* enums */ - /* enums */ +/* cipher.h */ - /* cipher.h */ - +/* blist.h */ - /* blist.h */ - - - - /* debug.h */ -Gaim::DebugLevel T_IV +/* debug.h */ +Gaim::DebugLevel T_IV - /* conversation.h */ +/* conversation.h */ +Gaim::ConvChatBuddyFlags T_IV +Gaim::ConvUpdateType T_IV +Gaim::ConversationType T_IV +Gaim::MessageFlags T_IV +Gaim::TypingState T_IV Gaim::UnseenState T_IV -Gaim::ConversationType T_IV -Gaim::ConvUpdateType T_IV -Gaim::TypingState T_IV -Gaim::MessageFlags T_IV -Gaim::ConvChatBuddyFlags T_IV - /* connection.h */ +/* connection.h */ Gaim::ConnectionFlags T_IV Gaim::ConnectionState T_IV - /* gtkutils.h */ -Gaim::ButtonOrientation T_IV -Gaim::ButtonStyle T_IV -Gaim::BrowserPlace T_IV - - +/* gtkutils.h */ +Gaim::ButtonOrientation T_IV +Gaim::ButtonStyle T_IV +Gaim::BrowserPlace T_IV INPUT T_GaimObj $var = gaim_perl_ref_object($arg) - OUTPUT T_GaimObj