Mercurial > pidgin.yaz
changeset 18644:a5b37b3f02c6
merge of 'ba1886a94b2131f499b71e5c939807d4df199b08'
and 'f4d2e27ee5bc44bb6d4d834730822b698a4dc534'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 25 Jul 2007 21:01:21 +0000 |
| parents | 075c8dab16e2 (diff) 3bf2e6cb8e35 (current diff) |
| children | 9e55f853a6fa |
| files | |
| diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/perl/common/Account.xs Wed Jul 25 03:54:29 2007 +0000 +++ b/libpurple/plugins/perl/common/Account.xs Wed Jul 25 21:01:21 2007 +0000 @@ -307,6 +307,9 @@ } g_list_free(list); +void +purple_accounts_restore_current_statuses() + Purple::Account purple_accounts_find(name, protocol) const char * name
--- a/libpurple/plugins/perl/common/BuddyIcon.xs Wed Jul 25 03:54:29 2007 +0000 +++ b/libpurple/plugins/perl/common/BuddyIcon.xs Wed Jul 25 21:01:21 2007 +0000 @@ -45,6 +45,10 @@ int *width int *height +char * +purple_buddy_icon_get_full_path(icon); + Purple::Buddy::Icon icon + MODULE = Purple::Buddy::Icon PACKAGE = Purple::Buddy::Icons PREFIX = purple_buddy_icons_ PROTOTYPES: ENABLE
--- a/pidgin/gtkprefs.c Wed Jul 25 03:54:29 2007 +0000 +++ b/pidgin/gtkprefs.c Wed Jul 25 21:01:21 2007 +0000 @@ -994,7 +994,7 @@ pidgin_prefs_checkbox(_("Show _formatting on incoming messages"), PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox); - iconpref1 = pidgin_prefs_checkbox(_("Show Buddy _Details"), + iconpref1 = pidgin_prefs_checkbox(strchr(_("/Buddies/Show Buddy _Details")+1,'/')+1, PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", vbox); iconpref2 = pidgin_prefs_checkbox(_("Enable buddy ic_on animation"), PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons", vbox);