# HG changeset patch # User Daniel Atallah # Date 1218083162 0 # Node ID e3f30a73a7939839fa9faff0054501003e78b06a # Parent f441a38932a2fd7cfc4438f295b022f6007876d6 Remove various opaque UiOps functions from the perl loader as they aren't useable. diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/Account.xs --- a/libpurple/plugins/perl/common/Account.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/Account.xs Thu Aug 07 04:26:02 2008 +0000 @@ -310,12 +310,5 @@ const char * name const char * protocol -void -purple_accounts_set_ui_ops(ops) - Purple::Account::UiOps ops - -Purple::Account::UiOps -purple_accounts_get_ui_ops() - Purple::Handle purple_accounts_get_handle() diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/BuddyList.xs --- a/libpurple/plugins/perl/common/BuddyList.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/BuddyList.xs Thu Aug 07 04:26:02 2008 +0000 @@ -246,13 +246,6 @@ void purple_blist_request_add_group() -void -purple_blist_set_ui_ops(ops) - Purple::BuddyList::UiOps ops - -Purple::BuddyList::UiOps -purple_blist_get_ui_ops() - Purple::Handle purple_blist_get_handle() diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/Connection.xs --- a/libpurple/plugins/perl/common/Connection.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/Connection.xs Thu Aug 07 04:26:02 2008 +0000 @@ -87,12 +87,5 @@ XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Connection"))); } -void -purple_connections_set_ui_ops(ops) - Purple::Connection::UiOps ops - -Purple::Connection::UiOps -purple_connections_get_ui_ops() - Purple::Handle purple_connections_get_handle() diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/Core.xs --- a/libpurple/plugins/perl/common/Core.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/Core.xs Thu Aug 07 04:26:02 2008 +0000 @@ -19,10 +19,3 @@ const char * purple_core_get_ui() -void -purple_core_set_ui_ops(ops) - Purple::Core::UiOps ops - -Purple::Core::UiOps -purple_core_get_ui_ops() - diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/FT.xs --- a/libpurple/plugins/perl/common/FT.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/FT.xs Thu Aug 07 04:26:02 2008 +0000 @@ -112,10 +112,6 @@ purple_xfer_get_type(xfer) Purple::Xfer xfer -Purple::XferUiOps -purple_xfer_get_ui_ops(xfer) - Purple::Xfer xfer - gboolean purple_xfer_is_canceled(xfer) Purple::Xfer xfer @@ -188,11 +184,4 @@ MODULE = Purple::Xfer PACKAGE = Purple::Xfers PREFIX = purple_xfers_ PROTOTYPES: ENABLE -Purple::XferUiOps -purple_xfers_get_ui_ops() - -void -purple_xfers_set_ui_ops(ops) - Purple::XferUiOps ops - diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/Notify.xs --- a/libpurple/plugins/perl/common/Notify.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/Notify.xs Thu Aug 07 04:26:02 2008 +0000 @@ -93,13 +93,6 @@ Purple::NotifyCloseCallback cb gpointer user_data -Purple::NotifyUiOps -purple_notify_get_ui_ops() - -void -purple_notify_set_ui_ops(ops) - Purple::NotifyUiOps ops - void * purple_notify_message(handle, type, title, primary, secondary, cb, user_data) void * handle diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/Privacy.xs --- a/libpurple/plugins/perl/common/Privacy.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/Privacy.xs Thu Aug 07 04:26:02 2008 +0000 @@ -3,13 +3,6 @@ MODULE = Purple::Privacy PACKAGE = Purple::Privacy PREFIX = purple_privacy_ PROTOTYPES: ENABLE -Purple::Privacy::UiOps -purple_privacy_get_ui_ops() - -void -purple_privacy_set_ui_ops(ops) - Purple::Privacy::UiOps ops - gboolean purple_privacy_permit_add(account, name, local_only) Purple::Account account diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/Request.xs --- a/libpurple/plugins/perl/common/Request.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/Request.xs Thu Aug 07 04:26:02 2008 +0000 @@ -47,7 +47,7 @@ SAVETMPS; PUSHMARK(sp); - XPUSHs(purple_perl_bless_object(fields, "Purple::Request::Fields")); + XPUSHs(sv_2mortal(purple_perl_bless_object(fields, "Purple::Request::Fields"))); PUTBACK; call_sv(gpr->ok_fun, G_EVAL | G_SCALAR); SPAGAIN; @@ -69,7 +69,7 @@ SAVETMPS; PUSHMARK(sp); - XPUSHs(purple_perl_bless_object(fields, "Purple::Request::Fields")); + XPUSHs(sv_2mortal(purple_perl_bless_object(fields, "Purple::Request::Fields"))); PUTBACK; call_sv(gpr->cancel_fun, G_EVAL | G_SCALAR); SPAGAIN; @@ -206,12 +206,6 @@ purple_request_close_with_handle(handle) void * handle -Purple::Request::UiOps -purple_request_get_ui_ops() - -void -purple_request_set_ui_ops(ops) - Purple::Request::UiOps ops MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_request_field_ PROTOTYPES: ENABLE diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/Roomlist.xs --- a/libpurple/plugins/perl/common/Roomlist.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/Roomlist.xs Thu Aug 07 04:26:02 2008 +0000 @@ -45,10 +45,6 @@ purple_roomlist_get_list(gc) Purple::Connection gc -Purple::Roomlist::UiOps -purple_roomlist_get_ui_ops() - - Purple::Roomlist purple_roomlist_new(account) Purple::Account account @@ -95,10 +91,6 @@ gboolean in_progress void -purple_roomlist_set_ui_ops(ops) - Purple::Roomlist::UiOps ops - -void purple_roomlist_show_with_account(account) Purple::Account account diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/Sound.xs --- a/libpurple/plugins/perl/common/Sound.xs Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/Sound.xs Thu Aug 07 04:26:02 2008 +0000 @@ -26,9 +26,6 @@ newCONSTSUB(stash, (char *)civ->name, newSViv(civ->iv)); } -Purple::Sound::UiOps -purple_sound_get_ui_ops() - void purple_sound_play_event(event, account) Purple::SoundEventID event @@ -38,7 +35,3 @@ purple_sound_play_file(filename, account) const char *filename Purple::Account account - -void -purple_sound_set_ui_ops(ops) - Purple::Sound::UiOps ops diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/module.h --- a/libpurple/plugins/perl/common/module.h Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/module.h Thu Aug 07 04:26:02 2008 +0000 @@ -67,14 +67,12 @@ /* account.h */ typedef PurpleAccount * Purple__Account; typedef PurpleAccountOption * Purple__Account__Option; -typedef PurpleAccountUiOps * Purple__Account__UiOps; typedef PurpleAccountUserSplit * Purple__Account__UserSplit; /* blist.h */ typedef PurpleBlistNode * Purple__BuddyList__Node; typedef PurpleBlistNodeFlags Purple__BuddyList__NodeFlags; typedef PurpleBlistNodeType Purple__BuddyList__NodeType; -typedef PurpleBlistUiOps * Purple__BuddyList__UiOps; typedef PurpleBuddyList * Purple__BuddyList; typedef PurpleBuddy * Purple__BuddyList__Buddy; typedef PurpleChat * Purple__BuddyList__Chat; @@ -109,7 +107,6 @@ typedef PurpleConnection * Purple__Connection; typedef PurpleConnectionFlags Purple__ConnectionFlags; typedef PurpleConnectionState Purple__ConnectionState; -typedef PurpleConnectionUiOps * Purple__Connection__UiOps; /* conversation.h */ typedef PurpleConversationType Purple__ConversationType; @@ -118,7 +115,6 @@ typedef PurpleMessageFlags Purple__MessageFlags; typedef PurpleConvChatBuddyFlags Purple__ConvChatBuddyFlags; typedef PurpleConversation * Purple__Conversation; -typedef PurpleConversationUiOps * Purple__Conversation__UiOps; typedef PurpleConvIm * Purple__Conversation__IM; typedef PurpleConvChat * Purple__Conversation__Chat; typedef PurpleConvChatBuddy * Purple__Conversation__ChatBuddy; @@ -126,7 +122,6 @@ /* core.h */ typedef PurpleCore * Purple__Core; -typedef PurpleCoreUiOps * Purple__Core__UiOps; /* debug.h */ typedef PurpleDebugLevel Purple__DebugLevel; @@ -137,13 +132,12 @@ /* eventloop.h */ typedef PurpleInputCondition * Purple__InputCondition; -typedef PurpleEventLoopUiOps * Purple__EventLoopUiOps; /* ft.h */ typedef PurpleXfer * Purple__Xfer; typedef PurpleXferType Purple__XferType; typedef PurpleXferStatusType Purple__XferStatusType; -typedef PurpleXferUiOps * Purple__XferUiOps; + #ifdef PURPLE_GTKPERL /* gtkblish.h */ @@ -194,7 +188,6 @@ typedef PurpleNotifySearchColumn * Purple__NotifySearchColumn; typedef PurpleNotifySearchButton * Purple__NotifySearchButton; typedef PurpleNotifyType Purple__NotifyType; -typedef PurpleNotifyUiOps * Purple__NotifyUiOps; typedef PurpleNotifyUserInfo * Purple__NotifyUserInfo; typedef PurpleNotifyUserInfoEntry * Purple__NotifyUserInfoEntry; @@ -221,7 +214,6 @@ /* privacy.h */ typedef PurplePrivacyType Purple__PrivacyType; -typedef PurplePrivacyUiOps * Purple__Privacy__UiOps; /* proxy.h */ typedef PurpleProxyInfo * Purple__ProxyInfo; @@ -239,7 +231,6 @@ typedef PurpleRequestFieldGroup * Purple__Request__Field__Group; typedef PurpleRequestFieldType Purple__RequestFieldType; typedef PurpleRequestType Purple__RequestType; -typedef PurpleRequestUiOps * Purple__Request__UiOps; /* roomlist.h */ typedef PurpleRoomlist * Purple__Roomlist; @@ -247,7 +238,6 @@ typedef PurpleRoomlistFieldType Purple__RoomlistFieldType; typedef PurpleRoomlistRoom * Purple__Roomlist__Room; typedef PurpleRoomlistRoomType Purple__RoomlistRoomType; -typedef PurpleRoomlistUiOps * Purple__Roomlist__UiOps; /* savedstatuses.h */ typedef PurpleSavedStatus * Purple__SavedStatus; @@ -258,7 +248,6 @@ /* sound.h */ typedef PurpleSoundEventID Purple__SoundEventID; -typedef PurpleSoundUiOps * Purple__Sound__UiOps; /* sslconn.h */ typedef PurpleInputCondition * Purple__Input__Condition; diff -r f441a38932a2 -r e3f30a73a793 libpurple/plugins/perl/common/typemap --- a/libpurple/plugins/perl/common/typemap Thu Aug 07 04:10:22 2008 +0000 +++ b/libpurple/plugins/perl/common/typemap Thu Aug 07 04:26:02 2008 +0000 @@ -40,7 +40,6 @@ Purple::Account T_PurpleObj Purple::Account::Option T_PurpleObj -Purple::Account::UiOps T_PurpleObj Purple::Account::UserSplit T_PurpleObj Purple::Buddy::Icon T_PurpleObj @@ -53,7 +52,6 @@ Purple::BuddyList::Node T_PurpleObj Purple::BuddyList::NodeFlags T_IV Purple::BuddyList::NodeType T_IV -Purple::BuddyList::UiOps T_PurpleObj Purple::Cipher T_PurpleObj Purple::CipherCaps T_IV @@ -64,14 +62,11 @@ Purple::Cmd::Priority T_IV Purple::Cmd::Ret T_IV Purple::Connection T_PurpleObj -Purple::Connection::UiOps T_PurpleObj Purple::Conversation T_PurpleObj Purple::Conversation::Chat T_PurpleObj Purple::Conversation::ChatBuddy T_PurpleObj Purple::Conversation::IM T_PurpleObj -Purple::Conversation::UiOps T_PurpleObj Purple::Core T_PurpleObj -Purple::Core::UiOps T_PurpleObj Purple::Desktop::Item T_PurpleObj Purple::DesktopItemType T_IV @@ -99,7 +94,6 @@ Purple::NotifySearchColumn T_PurpleObj Purple::NotifySearchButton T_PurpleObj Purple::NotifyType T_IV -Purple::NotifyUiOps T_PurpleObj Purple::NotifyUserInfo T_PurpleObj Purple::NotifyUserInfoEntry T_PurpleObj @@ -118,7 +112,6 @@ Purple::PounceEvent T_IV Purple::Presence T_PurpleObj Purple::PrivacyType T_IV -Purple::Privacy::UiOps T_PurpleObj Purple::ProtocolOptions T_IV Purple::ProxyInfo T_PurpleObj Purple::ProxyType T_IV @@ -128,12 +121,10 @@ Purple::Request::Field T_PurpleObj Purple::Request::Fields T_PurpleObj Purple::Request::Field::Group T_PurpleObj -Purple::Request::UiOps T_PurpleObj Purple::Roomlist T_PurpleObj Purple::Roomlist::Room T_PurpleObj Purple::Roomlist::Field T_PurpleObj -Purple::Roomlist::UiOps T_PurpleObj Purple::RoomlistFieldType T_IV Purple::RoomlistRoomType T_IV @@ -142,7 +133,6 @@ Purple::SavedStatus::Sub T_PurpleObj const Purple::SavedStatus::Sub T_PurpleObj Purple::SoundEventID T_IV -Purple::Sound::UiOps T_PurpleObj Purple::Input::Condition T_PurpleObj Purple::SslErrorType T_IV @@ -168,7 +158,6 @@ Purple::Xfer T_PurpleObj Purple::XferType T_IV Purple::XferStatusType T_IV -Purple::XferUiOps T_IV Purple::XMLNode T_PurpleObj XMLNode::Type T_IV