Revision 2a271b0a4c27ed8273e153322907ede77bc65587
datallah at pidgin.im
datallah at pidgin.im
Wed Mar 21 14:34:08 EDT 2007
o -----------------------------------------------------------------
|\ Revision: 2a271b0a4c27ed8273e153322907ede77bc65587
| | Ancestor: 74177ab1f5003a87ec15dcfda14924e5ea2ba0ec
| | Ancestor: 77b04659d074ab08ac7984a049d67eaaf0bb2761
| | Author: datallah at pidgin.im
| | Date: 2007-03-19T17:48:56
| | Branch: im.pidgin.pidgin
| |
| | Modified files:
| | .mtn-ignore pidgin/plugins/perl/common/GtkAccount.xs
| | pidgin/plugins/perl/common/GtkBlist.xs
| | pidgin/plugins/perl/common/GtkConn.xs
| | pidgin/plugins/perl/common/GtkConv.xs
| | pidgin/plugins/perl/common/GtkConvWin.xs
| | pidgin/plugins/perl/common/GtkDebug.xs
| | pidgin/plugins/perl/common/GtkDialogs.xs
| | pidgin/plugins/perl/common/GtkFt.xs
| | pidgin/plugins/perl/common/GtkLog.xs
| | pidgin/plugins/perl/common/GtkPounce.xs
| | pidgin/plugins/perl/common/GtkPrivacy.xs
| | pidgin/plugins/perl/common/GtkRoomlist.xs
| | pidgin/plugins/perl/common/GtkSavedStatuses.xs
| | pidgin/plugins/perl/common/GtkSession.xs
| | pidgin/plugins/perl/common/GtkSound.xs
| | pidgin/plugins/perl/common/GtkStatusBox.xs
| | pidgin/plugins/perl/common/GtkThemes.xs
| | pidgin/plugins/perl/common/GtkUI.pm
| | pidgin/plugins/perl/common/GtkUI.xs
| | pidgin/plugins/perl/common/GtkUtils.xs
| | pidgin/plugins/perl/common/Makefile.PL.in
| | pidgin/plugins/perl/common/gtkmodule.h
| | pidgin/plugins/perl/common/typemap
| |
| | ChangeLog:
| |
| | merge of '74177ab1f5003a87ec15dcfda14924e5ea2ba0ec'
| | and '77b04659d074ab08ac7984a049d67eaaf0bb2761'
| |
| | ============================================================
| | --- .mtn-ignore b98fe7d7a8db0a3c4f5841aa2385a45c294ee828
| | +++ .mtn-ignore edf81dee2017bfe2b1e453c1b99c2db1d6184287
| | @@ -18,17 +18,17 @@ configure
| | config.status
| | config.sub
| | configure
| | -console/gaim-text
| | -console/libgnt/gntmarshal.c
| | -console/libgnt/gntmarshal.h
| | +finch/finch
| | +finch/libgnt/gntmarshal.c
| | +finch/libgnt/gntmarshal.h
| | depcomp
| | doc/gaim-text.1
| | -doc/gaim.1
| | +doc/pidgin.1
| | gaim.apspec
| | -gaim.desktop
| | +pidgin.desktop
| | gaim.service
| | gaim.spec
| | -pidgin/gaim
| | +pidgin/pidgin
| | pidgin/plugins/musicmessaging/music-messaging-bindings.c
| | pidgin/plugins/perl/common/Makefile.PL
| | pidgin/win32/pidgin_dll_rc.rc
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkAccount.xs 334a8671032a23eed79d738be3824c7eaccd363e
| | +++ pidgin/plugins/perl/common/GtkAccount.xs 5e40e5c494a67a60027166846a8924c7f771bd28
| | @@ -1,9 +1,9 @@ PROTOTYPES: ENABLE
| | #include "gtkmodule.h"
| |
| | MODULE = Pidgin::Account PACKAGE = Pidgin::Account PREFIX = pidgin_account_
| | PROTOTYPES: ENABLE
| |
| | -Gaim::Handle
| | +Purple::Handle
| | pidgin_account_get_handle()
| |
| | MODULE = Pidgin::Account PACKAGE = Pidgin::Account::Dialog PREFIX = pidgin_account_dialog_
| | @@ -12,7 +12,7 @@ pidgin_account_dialog_show(type, account
| | void
| | pidgin_account_dialog_show(type, account)
| | Pidgin::Account::Dialog::Type type
| | - Gaim::Account account
| | + Purple::Account account
| |
| | MODULE = Pidgin::Account PACKAGE = Pidgin::Account::Window PREFIX = pidgin_accounts_window_
| | PROTOTYPES: ENABLE
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkBlist.xs ce1a5bac2a116b81840d497b5eacd3c9f03ab41b
| | +++ pidgin/plugins/perl/common/GtkBlist.xs df96a3fee3aaffec4505683ceee252dd95d5f5c6
| | @@ -1,9 +1,9 @@ PROTOTYPES: ENABLE
| | #include "gtkmodule.h"
| |
| | MODULE = Pidgin::BuddyList PACKAGE = Pidgin::BuddyList PREFIX = pidgin_blist_
| | PROTOTYPES: ENABLE
| |
| | -Gaim::Handle
| | +Purple::Handle
| | pidgin_blist_get_handle()
| |
| | Pidgin::BuddyList
| | @@ -11,14 +11,14 @@ pidgin_blist_refresh(list)
| |
| | void
| | pidgin_blist_refresh(list)
| | - Gaim::BuddyList list
| | + Purple::BuddyList list
| |
| | void
| | pidgin_blist_update_refresh_timeout()
| |
| | gboolean
| | pidgin_blist_node_is_contact_expanded(node)
| | - Gaim::BuddyList::Node node
| | + Purple::BuddyList::Node node
| |
| | void
| | pidgin_blist_toggle_visibility()
| | @@ -35,7 +35,7 @@ PPCODE:
| | GList *l;
| | PPCODE:
| | for (l = pidgin_blist_get_sort_methods(); l != NULL; l = l->next) {
| | - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::BuddyList::SortMethod")));
| | + XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::BuddyList::SortMethod")));
| | }
| |
| | void
| | @@ -72,5 +72,5 @@ pidgin_blist_update_account_error_state(
| |
| | void
| | pidgin_blist_update_account_error_state(account, message)
| | - Gaim::Account account
| | + Purple::Account account
| | const char * message
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkConn.xs 8f10c12301d83c0b3a2dc290bbfc806514af05d4
| | +++ pidgin/plugins/perl/common/GtkConn.xs 980b7fe7fe9ea2b412c2722e06e8b11dd4843e1a
| | @@ -1,7 +1,7 @@ PROTOTYPES: ENABLE
| | #include "gtkmodule.h"
| |
| | MODULE = Pidgin::Connection PACKAGE = Pidgin::Connection PREFIX = pidgin_connection_
| | PROTOTYPES: ENABLE
| |
| | -Gaim::Handle
| | +Purple::Handle
| | pidgin_connection_get_handle()
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkConv.xs 1051aa8f4041302e5d246d73a7f03e3d357863eb
| | +++ pidgin/plugins/perl/common/GtkConv.xs c7fb407a1508f77ce6d11829579937b4fe6bfd6e
| | @@ -5,19 +5,19 @@ pidgin_conv_update_buddy_icon(conv)
| |
| | void
| | pidgin_conv_update_buddy_icon(conv)
| | - Gaim::Conversation conv
| | + Purple::Conversation conv
| |
| | void
| | pidgin_conv_switch_active_conversation(conv)
| | - Gaim::Conversation conv
| | + Purple::Conversation conv
| |
| | void
| | pidgin_conv_update_buttons_by_protocol(conv)
| | - Gaim::Conversation conv
| | + Purple::Conversation conv
| |
| | void
| | pidgin_conv_present_conversation(conv)
| | - Gaim::Conversation conv
| | + Purple::Conversation conv
| |
| | Pidgin::Conversation::Window
| | pidgin_conv_get_window(conv)
| | @@ -25,7 +25,7 @@ pidgin_conv_new(class, conv)
| |
| | void
| | pidgin_conv_new(class, conv)
| | - Gaim::Conversation conv
| | + Purple::Conversation conv
| | C_ARGS:
| | conv
| |
| | @@ -35,10 +35,10 @@ pidgin_conv_get_gtkconv(conv)
| |
| | void
| | pidgin_conv_get_gtkconv(conv)
| | - Gaim::Conversation conv
| | + Purple::Conversation conv
| | PPCODE:
| | if (conv != NULL && PIDGIN_IS_PIDGIN_CONVERSATION(conv))
| | - XPUSHs(sv_2mortal(gaim_perl_bless_object(
| | + XPUSHs(sv_2mortal(purple_perl_bless_object(
| | PIDGIN_CONVERSATION(conv),
| | "Pidgin::Conversation")));
| |
| | @@ -47,10 +47,10 @@ pidgin_conversations_find_unseen_list(ty
| |
| | void
| | pidgin_conversations_find_unseen_list(type, min_state, hidden_only, max_count)
| | - Gaim::ConversationType type
| | - Gaim::UnseenState min_state
| | + Purple::ConversationType type
| | + Pidgin::UnseenState min_state
| | gboolean hidden_only
| | guint max_count
| |
| | -Gaim::Handle
| | +Purple::Handle
| | pidgin_conversations_get_handle()
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkConvWin.xs e3a46b73315db1469cf5b3d336ec5afd73530a7b
| | +++ pidgin/plugins/perl/common/GtkConvWin.xs 310597ee385cb3755ce81db4981fefd3b8ca67a6
| | @@ -47,13 +47,13 @@ pidgin_conv_window_get_active_gtkconv(wi
| | pidgin_conv_window_get_active_gtkconv(win)
| | Pidgin::Conversation::Window win
| |
| | -Gaim::Conversation
| | +Purple::Conversation
| | pidgin_conv_window_get_active_conversation(win)
| | Pidgin::Conversation::Window win
| |
| | gboolean
| | pidgin_conv_window_is_active_conversation(conv)
| | - Gaim::Conversation conv
| | + Purple::Conversation conv
| |
| | gboolean
| | pidgin_conv_window_has_focus(win)
| | @@ -71,7 +71,7 @@ PPCODE:
| | GList *l;
| | PPCODE:
| | for (l = pidgin_conv_window_get_gtkconvs(win); l != NULL; l = l->next) {
| | - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::Conversation")));
| | + XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::Conversation")));
| | }
| |
| | guint
| | @@ -80,11 +80,11 @@ pidgin_conv_window_first_with_type(type)
| |
| | Pidgin::Conversation::Window
| | pidgin_conv_window_first_with_type(type)
| | - Gaim::ConversationType type
| | + Purple::ConversationType type
| |
| | Pidgin::Conversation::Window
| | pidgin_conv_window_last_with_type(type)
| | - Gaim::ConversationType type
| | + Purple::ConversationType type
| |
| | MODULE = Pidgin::Conversation::Window PACKAGE = Pidgin::Conversation::Placement PREFIX = pidgin_conv_placement_
| | PROTOTYPES: ENABLE
| | @@ -95,14 +95,14 @@ PPCODE:
| | GList *l;
| | PPCODE:
| | for (l = pidgin_conv_placement_get_options(); l != NULL; l = l->next) {
| | - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
| | + XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
| | }
| |
| | void
| | pidgin_conv_placement_add_fnc(id, name, fnc)
| | const char * id
| | const char * name
| | - Gaim::Conversation::PlacementFunc fnc
| | + Pidgin::Conversation::PlacementFunc fnc
| |
| | void
| | pidgin_conv_placement_remove_fnc(id)
| | @@ -112,15 +112,15 @@ pidgin_conv_placement_get_name(id)
| | pidgin_conv_placement_get_name(id)
| | const char * id
| |
| | -Gaim::Conversation::PlacementFunc
| | +Pidgin::Conversation::PlacementFunc
| | pidgin_conv_placement_get_fnc(id)
| | const char * id
| |
| | void
| | pidgin_conv_placement_set_current_func(func)
| | - Gaim::Conversation::PlacementFunc func
| | + Pidgin::Conversation::PlacementFunc func
| |
| | -Gaim::Conversation::PlacementFunc
| | +Pidgin::Conversation::PlacementFunc
| | pidgin_conv_placement_get_current_func()
| |
| | void
| | @@ -136,5 +136,5 @@ PPCODE:
| | GList *l;
| | PPCODE:
| | for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
| | - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
| | + XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
| | }
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkDebug.xs b46dfba70c9248986fc774b8212f989f68b75b57
| | +++ pidgin/plugins/perl/common/GtkDebug.xs 59be7616704137f10f96e2c635c1cb96ad01bcc2
| | @@ -1,9 +1,9 @@ PROTOTYPES: ENABLE
| | #include "gtkmodule.h"
| |
| | MODULE = Pidgin::Debug PACKAGE = Pidgin::Debug PREFIX = pidgin_debug_
| | PROTOTYPES: ENABLE
| |
| | -Gaim::Handle
| | +Purple::Handle
| | pidgin_debug_get_handle()
| |
| | MODULE = Pidgin::Debug PACKAGE = Pidgin::Debug::Window PREFIX = pidgin_debug_window_
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkDialogs.xs 86145d5e3791e0f5871523043c1a1578b7607dba
| | +++ pidgin/plugins/perl/common/GtkDialogs.xs 7755c14e9c30b9c22e244d639a890f3ac8fb86c1
| | @@ -14,7 +14,7 @@ pidgindialogs_im_with_user(account, user
| |
| | void
| | pidgindialogs_im_with_user(account, username)
| | - Gaim::Account account
| | + Purple::Account account
| | const char * username
| |
| | void
| | @@ -25,28 +25,28 @@ pidgindialogs_alias_contact(contact)
| |
| | void
| | pidgindialogs_alias_contact(contact)
| | - Gaim::BuddyList::Contact contact
| | + Purple::BuddyList::Contact contact
| |
| | void
| | pidgindialogs_alias_buddy(buddy)
| | - Gaim::BuddyList::Buddy buddy
| | + Purple::BuddyList::Buddy buddy
| |
| | void
| | pidgindialogs_alias_chat(chat)
| | - Gaim::BuddyList::Chat chat
| | + Purple::BuddyList::Chat chat
| |
| | void
| | pidgindialogs_remove_buddy(buddy)
| | - Gaim::BuddyList::Buddy buddy
| | + Purple::BuddyList::Buddy buddy
| |
| | void
| | pidgindialogs_remove_group(group)
| | - Gaim::BuddyList::Group group
| | + Purple::BuddyList::Group group
| |
| | void
| | pidgindialogs_remove_chat(chat)
| | - Gaim::BuddyList::Chat chat
| | + Purple::BuddyList::Chat chat
| |
| | void
| | pidgindialogs_remove_contact(contact)
| | + Purple::BuddyList::Contact contact
| | - Gaim::BuddyList::Contact contact
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkFt.xs 169599cbf21b66279746b1a1e4f64677e0c6d5b1
| | +++ pidgin/plugins/perl/common/GtkFt.xs c594cc64307b6ef1d6f40ae83f80bf6dee0869c7
| | @@ -32,19 +32,19 @@ pidginxfer_dialog_add_xfer(dialog, xfer)
| | void
| | pidginxfer_dialog_add_xfer(dialog, xfer)
| | Pidgin::Xfer::Dialog dialog
| | - Gaim::Xfer xfer
| | + Purple::Xfer xfer
| |
| | void
| | pidginxfer_dialog_remove_xfer(dialog, xfer)
| | Pidgin::Xfer::Dialog dialog
| | - Gaim::Xfer xfer
| | + Purple::Xfer xfer
| |
| | void
| | pidginxfer_dialog_cancel_xfer(dialog, xfer)
| | Pidgin::Xfer::Dialog dialog
| | - Gaim::Xfer xfer
| | + Purple::Xfer xfer
| |
| | void
| | pidginxfer_dialog_update_xfer(dialog, xfer)
| | Pidgin::Xfer::Dialog dialog
| | + Purple::Xfer xfer
| | - Gaim::Xfer xfer
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkLog.xs 26aee3082eb6da5a0ed95202b3f82d7b795c3af2
| | +++ pidgin/plugins/perl/common/GtkLog.xs a863426ab3c376cb9bd9e60db9927053d6690efc
| | @@ -1,20 +1,20 @@ PROTOTYPES: ENABLE
| | #include "gtkmodule.h"
| |
| | MODULE = Pidgin::Log PACKAGE = Pidgin::Log PREFIX = pidgin_log_
| | PROTOTYPES: ENABLE
| |
| | -Gaim::Handle
| | +Purple::Handle
| | pidgin_log_get_handle()
| |
| | void
| | pidgin_log_show(type, screenname, account)
| | - Gaim::LogType type
| | + Purple::LogType type
| | const char * screenname
| | - Gaim::Account account
| | + Purple::Account account
| |
| | void
| | pidgin_log_show_contact(contact)
| | - Gaim::BuddyList::Contact contact
| | + Purple::BuddyList::Contact contact
| |
| | MODULE = Pidgin::Log PACKAGE = Pidgin::SysLog PREFIX = pidgin_syslog_
| | PROTOTYPES: ENABLE
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkPounce.xs 637a7dcc9bd5a0dbb54a1a019528de4441baa661
| | +++ pidgin/plugins/perl/common/GtkPounce.xs 040cc997ac43db56ae2e7c3123627951afab3be2
| | @@ -5,14 +5,14 @@ pidgin_pounce_editor_show(account, name,
| |
| | void
| | pidgin_pounce_editor_show(account, name, cur_pounce)
| | - Gaim::Account account
| | + Purple::Account account
| | const char * name
| | - Gaim::Pounce cur_pounce
| | + Purple::Pounce cur_pounce
| |
| | MODULE = Pidgin::Pounce PACKAGE = Pidgin::Pounces PREFIX = pidgin_pounces_
| | PROTOTYPES: ENABLE
| |
| | -Gaim::Handle
| | +Purple::Handle
| | pidgin_pounces_get_handle()
| |
| | MODULE = Pidgin::Pounce PACKAGE = Pidgin::Pounces::Manager PREFIX = pidgin_pounces_manager_
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkPrivacy.xs d30c8f16f060740c6c7ef9abd7d43abdc68597b8
| | +++ pidgin/plugins/perl/common/GtkPrivacy.xs 61d63a55a3d9f393770b4ef467e02f3d1c4972f5
| | @@ -5,12 +5,12 @@ pidgin_request_add_permit(account, name)
| |
| | void
| | pidgin_request_add_permit(account, name)
| | - Gaim::Account account
| | + Purple::Account account
| | const char * name
| |
| | void
| | pidgin_request_add_block(account, name)
| | - Gaim::Account account
| | + Purple::Account account
| | const char * name
| |
| | MODULE = Pidgin::Privacy PACKAGE = Pidgin::Privacy::Dialog PREFIX = pidgin_privacy_dialog_
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkRoomlist.xs bdcbfbae2a21a20ff2eda6761bfcf69c4a718c99
| | +++ pidgin/plugins/perl/common/GtkRoomlist.xs fe6b04b65115ff9afe5eb5ab0a45e5796c7bbf68
| | @@ -14,4 +14,4 @@ pidgin_roomlist_dialog_show_with_account
| |
| | void
| | pidgin_roomlist_dialog_show_with_account(account)
| | + Purple::Account account
| | - Gaim::Account account
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkSavedStatuses.xs 387fccba98f6267d73854b4a8421a6a4faa9bf07
| | +++ pidgin/plugins/perl/common/GtkSavedStatuses.xs 74b8c26016abe31f6e8af9d114e4593bb72b4eb7
| | @@ -1,9 +1,9 @@ PROTOTYPES: ENABLE
| | #include "gtkmodule.h"
| |
| | MODULE = Pidgin::Status PACKAGE = Pidgin::Status PREFIX = pidgin_status_
| | PROTOTYPES: ENABLE
| |
| | -Gaim::Handle
| | +Purple::Handle
| | pidgin_status_get_handle()
| |
| | MODULE = Pidgin::Status PACKAGE = Pidgin::Status::Editor PREFIX = pidgin_status_editor_
| | @@ -12,7 +12,7 @@ pidgin_status_editor_show(edit, status)
| | void
| | pidgin_status_editor_show(edit, status)
| | gboolean edit
| | - Gaim::SavedStatus status
| | + Purple::SavedStatus status
| |
| | MODULE = Pidgin::Status PACKAGE = Pidgin::Status::Window PREFIX = pidgin_status_window_
| | PROTOTYPES: ENABLE
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkSession.xs 330332ccb005d44ad565b9eab1d0f705f0b8b677
| | +++ pidgin/plugins/perl/common/GtkSession.xs 6f812283d584cee64c37cd13415c63731ee4e8d8
| | @@ -1,6 +1,6 @@
| | #include "gtkmodule.h"
| |
| | -MODULE = Gaim::GtkUI::Session PACKAGE = Gaim::GtkUI::Session PREFIX = gaim_gtk_session_
| | +MODULE = Purple::GtkUI::Session PACKAGE = Purple::GtkUI::Session PREFIX = gaim_gtk_session_
| | PROTOTYPES: ENABLE
| |
| | void
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkSound.xs 594e93bdea018d194450627bd1818694fcf4ebbf
| | +++ pidgin/plugins/perl/common/GtkSound.xs 584ecb225282891886bba074afd13b36528cf392
| | @@ -5,11 +5,11 @@ pidgin_sound_get_event_option(event)
| |
| | const char *
| | pidgin_sound_get_event_option(event)
| | - Gaim::SoundEventID event
| | + Purple::SoundEventID event
| |
| | const char *
| | pidgin_sound_get_event_label(event)
| | - Gaim::SoundEventID event
| | + Purple::SoundEventID event
| |
| | -Gaim::Handle
| | +Purple::Handle
| | pidgin_sound_get_handle()
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkStatusBox.xs 51581634b360ff5e3436b56541984114fa620105
| | +++ pidgin/plugins/perl/common/GtkStatusBox.xs d59b7f00d09284bafd68d0176b8c6ec118a620e2
| | @@ -8,7 +8,7 @@ pidgin_status_box_new_with_account(accou
| |
| | Gtk::Widget
| | pidgin_status_box_new_with_account(account)
| | - Gaim::Account account
| | + Purple::Account account
| |
| | void
| | pidgin_status_box_add(status_box, type, pixbuf, text, sec_text, data)
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkThemes.xs 5f16db9a7f84b4f3043018afc868026e60c6a97a
| | +++ pidgin/plugins/perl/common/GtkThemes.xs 69fdbe94405647da47edac1b0e45c701a300b965
| | @@ -24,5 +24,5 @@ PPCODE:
| | GSList *l;
| | PPCODE:
| | for (l = pidginthemes_get_proto_smileys(id); l != NULL; l = l->next) {
| | - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::IMHtml::Smiley")));
| | + XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::IMHtml::Smiley")));
| | }
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkUI.pm 9c7582404b87bf9a4cd2fbb179e6c0e5c8887bad
| | +++ pidgin/plugins/perl/common/GtkUI.pm 0a702709908acf9f3f9b52b91bff31a4f1c1ff6d
| | @@ -1,4 +1,4 @@
| | -package Gaim::GtkUI;
| | +package Purple::GtkUI;
| |
| | use 5.008;
| | use strict;
| | @@ -7,37 +7,37 @@ our $VERSION = '0.01';
| |
| | our $VERSION = '0.01';
| |
| | -use Gaim;
| | +use Purple;
| |
| | require XSLoader;
| | -XSLoader::load('Gaim::GtkUI', $VERSION);
| | +XSLoader::load('Purple::GtkUI', $VERSION);
| |
| | 1;
| | __END__
| |
| | =head1 NAME
| |
| | -Gaim::GtkUI - Perl extension for the Gaim instant messenger.
| | +Purple::GtkUI - Perl extension for the Pidgin instant messenger.
| |
| | =head1 SYNOPSIS
| |
| | - use Gaim::GtkUI;
| | + use Purple::GtkUI;
| |
| | =head1 ABSTRACT
| |
| | This module provides the interface for using perl scripts as plugins in
| | - Gaim, with access to the Gaim Gtk interface functions.
| | + Pidgin, with access to the Pidgin Gtk interface functions.
| |
| | =head1 DESCRIPTION
| |
| | -This module provides the interface for using perl scripts as plugins in Gaim,
| | -with access to the Gaim Gtk interface functions. With this, developers can
| | -write perl scripts that can be loaded in Gaim as plugins. The script can
| | -interact with IMs, chats, accounts, the buddy list, gaim signals, and more.
| | +This module provides the interface for using perl scripts as plugins in Pidgin,
| | +with access to the Pidgin Gtk interface functions. With this, developers can
| | +write perl scripts that can be loaded in Pidgin as plugins. The script can
| | +interact with IMs, chats, accounts, the buddy list, pidgin signals, and more.
| |
| | -The API for the perl interface is very similar to that of the Gaim C API,
| | -which can be viewed at http://gaim.sourceforge.net/api/ or in the header files
| | -in the Gaim source tree.
| | +The API for the perl interface is very similar to that of the Pidgin C API,
| | +which can be viewed at http://developer.pidgin.im/doxygen/ or in the header files
| | +in the Pidgin source tree.
| |
| | =head1 FUNCTIONS
| |
| | @@ -46,11 +46,11 @@ in the Gaim source tree.
| | =back
| |
| | =head1 SEE ALSO
| | -Gaim C API documentation - http://gaim.sourceforge.net/api/
| | +Pidgin C API documentation - http://developer.pidgin.im/doxygen/
| |
| | -The Gaim perl module.
| | +The Pidgin perl module.
| |
| | -Gaim website - http://gaim.sourceforge.net/
| | +Pidgin website - http://pidgin.im/
| |
| | =head1 AUTHOR
| |
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkUI.xs 472a62fd4595ed9ca7e0c02fa57ee529ed22453c
| | +++ pidgin/plugins/perl/common/GtkUI.xs 05d23229eaf1c1e368baab82e6921b004e8cd300
| | @@ -1,60 +1,60 @@
| | #include "gtkmodule.h"
| |
| | /* Prototypes for the BOOT section below. */
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Account);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__BuddyList);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Connection);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Conversation);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Conversation__Window);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Debug);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Dialogs);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__IMHtml);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__IMHtmlToolbar);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Log);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__MenuTray);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Plugin);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__PluginPref);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Pounce);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Prefs);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Privacy);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Roomlist);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Status);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Account);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__BuddyList);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Connection);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Conversation);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Conversation__Window);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Debug);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Dialogs);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__IMHtml);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__IMHtmlToolbar);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Log);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__MenuTray);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Plugin);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__PluginPref);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Pounce);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Prefs);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Privacy);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Roomlist);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Status);
| | #ifndef _WIN32
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Session);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Session);
| | #endif
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Sound);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__StatusBox);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Themes);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Utils);
| | -GAIM_PERL_BOOT_PROTO(GtkUI__Xfer);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Sound);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__StatusBox);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Themes);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Utils);
| | +PURPLE_PERL_BOOT_PROTO(GtkUI__Xfer);
| |
| | -MODULE = Gaim::GtkUI PACKAGE = Gaim::GtkUI PREFIX = pidgin_
| | +MODULE = Purple::GtkUI PACKAGE = Purple::GtkUI PREFIX = pidgin_
| | PROTOTYPES: ENABLE
| |
| | BOOT:
| | - GAIM_PERL_BOOT(GtkUI__Account);
| | - GAIM_PERL_BOOT(GtkUI__BuddyList);
| | - GAIM_PERL_BOOT(GtkUI__Connection);
| | - GAIM_PERL_BOOT(GtkUI__Conversation);
| | - GAIM_PERL_BOOT(GtkUI__Conversation__Window);
| | - GAIM_PERL_BOOT(GtkUI__Debug);
| | - GAIM_PERL_BOOT(GtkUI__Dialogs);
| | - GAIM_PERL_BOOT(GtkUI__IMHtml);
| | - GAIM_PERL_BOOT(GtkUI__IMHtmlToolbar);
| | - GAIM_PERL_BOOT(GtkUI__Log);
| | - GAIM_PERL_BOOT(GtkUI__MenuTray);
| | - GAIM_PERL_BOOT(GtkUI__Plugin);
| | - GAIM_PERL_BOOT(GtkUI__PluginPref);
| | - GAIM_PERL_BOOT(GtkUI__Pounce);
| | - GAIM_PERL_BOOT(GtkUI__Prefs);
| | - GAIM_PERL_BOOT(GtkUI__Privacy);
| | - GAIM_PERL_BOOT(GtkUI__Roomlist);
| | - GAIM_PERL_BOOT(GtkUI__Status);
| | + PURPLE_PERL_BOOT(GtkUI__Account);
| | + PURPLE_PERL_BOOT(GtkUI__BuddyList);
| | + PURPLE_PERL_BOOT(GtkUI__Connection);
| | + PURPLE_PERL_BOOT(GtkUI__Conversation);
| | + PURPLE_PERL_BOOT(GtkUI__Conversation__Window);
| | + PURPLE_PERL_BOOT(GtkUI__Debug);
| | + PURPLE_PERL_BOOT(GtkUI__Dialogs);
| | + PURPLE_PERL_BOOT(GtkUI__IMHtml);
| | + PURPLE_PERL_BOOT(GtkUI__IMHtmlToolbar);
| | + PURPLE_PERL_BOOT(GtkUI__Log);
| | + PURPLE_PERL_BOOT(GtkUI__MenuTray);
| | + PURPLE_PERL_BOOT(GtkUI__Plugin);
| | + PURPLE_PERL_BOOT(GtkUI__PluginPref);
| | + PURPLE_PERL_BOOT(GtkUI__Pounce);
| | + PURPLE_PERL_BOOT(GtkUI__Prefs);
| | + PURPLE_PERL_BOOT(GtkUI__Privacy);
| | + PURPLE_PERL_BOOT(GtkUI__Roomlist);
| | + PURPLE_PERL_BOOT(GtkUI__Status);
| | #ifndef _WIN32
| | - GAIM_PERL_BOOT(GtkUI__Session);
| | + PURPLE_PERL_BOOT(GtkUI__Session);
| | #endif
| | + PURPLE_PERL_BOOT(GtkUI__Sound);
| | + PURPLE_PERL_BOOT(GtkUI__StatusBox);
| | + PURPLE_PERL_BOOT(GtkUI__Themes);
| | + PURPLE_PERL_BOOT(GtkUI__Utils);
| | + PURPLE_PERL_BOOT(GtkUI__Xfer);
| | - GAIM_PERL_BOOT(GtkUI__Sound);
| | - GAIM_PERL_BOOT(GtkUI__StatusBox);
| | - GAIM_PERL_BOOT(GtkUI__Themes);
| | - GAIM_PERL_BOOT(GtkUI__Utils);
| | - GAIM_PERL_BOOT(GtkUI__Xfer);
| | ============================================================
| | --- pidgin/plugins/perl/common/GtkUtils.xs 76fccbde5afcccef59e69052c7dd067f29397ae7
| | +++ pidgin/plugins/perl/common/GtkUtils.xs 7cc99f6dc4f4890e170df7e394e8c6e41e73ec96
| | @@ -12,5 +12,5 @@ pidgin_convert_buddy_icon(plugin, path)
| |
| | gchar_own *
| | pidgin_convert_buddy_icon(plugin, path)
| | - Gaim::Plugin plugin
| | + Purple::Plugin plugin
| | const char * path
| | ============================================================
| | --- pidgin/plugins/perl/common/Makefile.PL.in 21a9e1c71d8e857177392b2b5cfd519fa83b752f
| | +++ pidgin/plugins/perl/common/Makefile.PL.in 2538f0bef390234c86d5564c03ca043c9a87e52f
| | @@ -1,15 +1,15 @@ WriteMakefile(
| | use 5.006;
| | use ExtUtils::MakeMaker;
| |
| | WriteMakefile(
| | - 'NAME' => 'Gaim::GtkUI',
| | + 'NAME' => 'Purple::GtkUI',
| | 'VERSION_FROM' => '@srcdir@/GtkUI.pm', # finds $VERSION
| | ($] >= 5.005 ? ## Add these new keywords supported since 5.005
| | ('ABSTRACT_FROM' => '@srcdir@/GtkUI.pm', # finds $ABSTRACT
| | - 'AUTHOR' => 'Gaim <http://gaim.sourceforge.net/>') : ()),
| | + 'AUTHOR' => 'Pidgin <http://pidgin.im/>') : ()),
| | 'DEFINE' => '@DEBUG_CFLAGS@',
| | 'INC' => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple -I at top_srcdir@/pidgin @GTK_CFLAGS@',
| | -# 'PREREQ_PM' => { 'Gaim' => '@VERSION@'},
| | +# 'PREREQ_PM' => { 'Pidgin' => '@VERSION@'},
| | # Do this because the MakeMaker Makefile is dumb, and on clean it moves
| | # Makefile to the default setting for MAKEFILE_OLD which is Makefile.old
| | # but this breaks running make clean more than once in a row.
| | ============================================================
| | --- pidgin/plugins/perl/common/gtkmodule.h a438b573be2ab9e46b2f4c72e9a4154078bab9cd
| | +++ pidgin/plugins/perl/common/gtkmodule.h 4178e210b597473408bd1ac727cbc1ffa97afcb0
| | @@ -49,11 +49,11 @@ typedef PidginConversation * Pidgin__Co
| |
| | /* gtkconv.h */
| | typedef PidginConversation * Pidgin__Conversation;
| | -typedef PurpleUnseenState Purple__UnseenState;
| | +typedef PidginUnseenState Pidgin__UnseenState;
| |
| | /* gtkconvwin.h */
| | typedef PidginWindow * Pidgin__Conversation__Window;
| | -typedef PurpleConvPlacementFunc Purple__Conversation__PlacementFunc;
| | +typedef PidginConvPlacementFunc Pidgin__Conversation__PlacementFunc;
| |
| | /* gtkft.h */
| | typedef PidginXferDialog * Pidgin__Xfer__Dialog;
| | ============================================================
| | --- pidgin/plugins/perl/common/typemap 936493dc933323c624461ee01e74b8910be59191
| | +++ pidgin/plugins/perl/common/typemap a1d8ffdb869cdbdfcf4f71590b212ffc4b403e4b
| | @@ -1,20 +1,19 @@ TYPEMAP
| | TYPEMAP
| | -Gaim::Conversation::PlacementFunc T_GaimObj
| | -Gaim::UnseenState T_IV
| | -Gaim::ButtonOrientation T_IV
| |
| | Pidgin::Account::Dialog::Type T_IV
| | -Pidgin::BuddyList T_GaimObj
| | -Pidgin::BuddyList::SortFunction T_GaimObj
| | -Pidgin::Conversation T_GaimObj
| | -Pidgin::Conversation::Window T_GaimObj
| | -Pidgin::Xfer::Dialog T_GaimObj
| | -Pidgin::IMHtml T_GaimObj
| | +Pidgin::BuddyList T_PurpleObj
| | +Pidgin::BuddyList::SortFunction T_PurpleObj
| | +Pidgin::Conversation T_PurpleObj
| | +Pidgin::Conversation::PlacementFunc T_PurpleObj
| | +Pidgin::Conversation::Window T_PurpleObj
| | +Pidgin::Xfer::Dialog T_PurpleObj
| | +Pidgin::IMHtml T_PurpleObj
| | Pidgin::IMHtml::Buttons T_IV
| | -Pidgin::IMHtml::Funcs T_GaimObj
| | -Pidgin::IMHtml::Scalable T_GaimObj
| | -Pidgin::IMHtml::Smiley T_GaimObj
| | +Pidgin::IMHtml::Funcs T_PurpleObj
| | +Pidgin::IMHtml::Scalable T_PurpleObj
| | +Pidgin::IMHtml::Smiley T_PurpleObj
| | Pidgin::IMHtml::Options T_IV
| | +Pidgin::IMHtmlToolbar T_PurpleObj
| | +Pidgin::MenuTray T_PurpleObj
| | +Pidgin::StatusBox T_PurpleObj
| | +Pidgin::UnseenState T_IV
| | -Pidgin::IMHtmlToolbar T_GaimObj
| | -Pidgin::MenuTray T_GaimObj
| | -Pidgin::StatusBox T_GaimObj
To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 2a271b0a4c27ed8273e153322907ede77bc65587
More information about the Commits
mailing list