Mercurial > pidgin
changeset 16471:9f9941924233
merge of 'd7d0a64f6106322f89cd6f19e0a0a3488e5dc1a8'
and 'f192f0cf37d1326e280639944a16cc974cc75785'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 25 Apr 2007 21:49:58 +0000 |
| parents | 4fc51a87ce42 (current diff) 0fa041c66957 (diff) |
| children | 776acf50d50f |
| files | libpurple/prpl.h |
| diffstat | 5 files changed, 73 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Wed Apr 25 21:48:56 2007 +0000 +++ b/COPYRIGHT Wed Apr 25 21:49:58 2007 +0000 @@ -74,6 +74,7 @@ Todd Cohen Jono Cole Lorenzo Colitti +Jeff Connelly Nathan Conrad Felipe Contreras Alex Converse
--- a/libpurple/plugins/tcl/signal-test.tcl Wed Apr 25 21:48:56 2007 +0000 +++ b/libpurple/plugins/tcl/signal-test.tcl Wed Apr 25 21:49:58 2007 +0000 @@ -1,123 +1,123 @@ -gaim::signal connect [gaim::account handle] account-away { account state message } { - gaim::debug -info "tcl signal" "account-away [gaim::account username $account] \"$state\" \"$message\"" +purple::signal connect [purple::account handle] account-away { account state message } { + purple::debug -info "tcl signal" "account-away [purple::account username $account] \"$state\" \"$message\"" } -gaim::signal connect [gaim::account handle] account-connecting { account } { - gaim::debug -info "tcl signal" "account-connecting [gaim::account username $account]" +purple::signal connect [purple::account handle] account-connecting { account } { + purple::debug -info "tcl signal" "account-connecting [purple::account username $account]" } -gaim::signal connect [gaim::account handle] account-set-info { account info } { - gaim::debug -info "tcl signal" "account-set-info [gaim::account username $account] $info" +purple::signal connect [purple::account handle] account-set-info { account info } { + purple::debug -info "tcl signal" "account-set-info [purple::account username $account] $info" } -gaim::signal connect [gaim::account handle] account-setting-info { account info } { - gaim::debug -info "tcl signal" "account-set-info [gaim::account username $account] $info" +purple::signal connect [purple::account handle] account-setting-info { account info } { + purple::debug -info "tcl signal" "account-set-info [purple::account username $account] $info" } -gaim::signal connect [gaim::buddy handle] buddy-away { buddy } { - gaim::debug -info "tcl signal" "buddy-away [gaim::account username [lindex $buddy 2]] [lindex $buddy 1]" +purple::signal connect [purple::buddy handle] buddy-away { buddy } { + purple::debug -info "tcl signal" "buddy-away [purple::account username [lindex $buddy 2]] [lindex $buddy 1]" } -gaim::signal connect [gaim::buddy handle] buddy-back { buddy } { - gaim::debug -info "tcl signal" "buddy-back [gaim::account username [lindex $buddy 2]] [lindex $buddy 1]" +purple::signal connect [purple::buddy handle] buddy-back { buddy } { + purple::debug -info "tcl signal" "buddy-back [purple::account username [lindex $buddy 2]] [lindex $buddy 1]" } -gaim::signal connect [gaim::buddy handle] buddy-idle { buddy } { - gaim::debug -info "tcl signal" "buddy-idle [gaim::account username [lindex $buddy 2]] [lindex $buddy 1]" +purple::signal connect [purple::buddy handle] buddy-idle { buddy } { + purple::debug -info "tcl signal" "buddy-idle [purple::account username [lindex $buddy 2]] [lindex $buddy 1]" } -gaim::signal connect [gaim::buddy handle] buddy-unidle { buddy } { - gaim::debug -info "tcl signal" "buddy-unidle [gaim::account username [lindex $buddy 2]] [lindex $buddy 1]" +purple::signal connect [purple::buddy handle] buddy-unidle { buddy } { + purple::debug -info "tcl signal" "buddy-unidle [purple::account username [lindex $buddy 2]] [lindex $buddy 1]" } -gaim::signal connect [gaim::buddy handle] buddy-signed-on { buddy } { - gaim::debug -info "tcl signal" "buddy-signed-on [gaim::account username [lindex $buddy 2]] [lindex $buddy 1]" +purple::signal connect [purple::buddy handle] buddy-signed-on { buddy } { + purple::debug -info "tcl signal" "buddy-signed-on [purple::account username [lindex $buddy 2]] [lindex $buddy 1]" } -gaim::signal connect [gaim::buddy handle] buddy-signed-off { buddy } { - gaim::debug -info "tcl signal" "buddy-signed-off [gaim::account username [lindex $buddy 2]] [lindex $buddy 1]" +purple::signal connect [purple::buddy handle] buddy-signed-off { buddy } { + purple::debug -info "tcl signal" "buddy-signed-off [purple::account username [lindex $buddy 2]] [lindex $buddy 1]" } -gaim::signal connect [gaim::core handle] quitting {} { - gaim::debug -info "tcl signal" "quitting" +purple::signal connect [purple::core handle] quitting {} { + purple::debug -info "tcl signal" "quitting" } -gaim::signal connect [gaim::conversation handle] receiving-chat-msg { account who what id flags } { - gaim::debug -info "tcl signal" "receiving-chat-msg [gaim::account username $account] $id $flags $who \"$what\"" +purple::signal connect [purple::conversation handle] receiving-chat-msg { account who what id flags } { + purple::debug -info "tcl signal" "receiving-chat-msg [purple::account username $account] $id $flags $who \"$what\"" return 0 } -gaim::signal connect [gaim::conversation handle] receiving-im-msg { account who what id flags } { - gaim::debug -info "tcl signal" "receiving-im-msg [gaim::account username $account] $id $flags $who \"$what\"" +purple::signal connect [purple::conversation handle] receiving-im-msg { account who what id flags } { + purple::debug -info "tcl signal" "receiving-im-msg [purple::account username $account] $id $flags $who \"$what\"" return 0 } -gaim::signal connect [gaim::conversation handle] received-chat-msg { account who what id flags } { - gaim::debug -info "tcl signal" "received-chat-msg [gaim::account username $account] $id $flags $who \"$what\"" +purple::signal connect [purple::conversation handle] received-chat-msg { account who what id flags } { + purple::debug -info "tcl signal" "received-chat-msg [purple::account username $account] $id $flags $who \"$what\"" } -gaim::signal connect [gaim::conversation handle] received-im-msg { account who what id flags } { - gaim::debug -info "tcl signal" "received-im-msg [gaim::account username $account] $id $flags $who \"$what\"" +purple::signal connect [purple::conversation handle] received-im-msg { account who what id flags } { + purple::debug -info "tcl signal" "received-im-msg [purple::account username $account] $id $flags $who \"$what\"" } -gaim::signal connect [gaim::conversation handle] sending-chat-msg { account what id } { - gaim::debug -info "tcl signal" "sending-chat-msg [gaim::account username $account] $id \"$what\"" +purple::signal connect [purple::conversation handle] sending-chat-msg { account what id } { + purple::debug -info "tcl signal" "sending-chat-msg [purple::account username $account] $id \"$what\"" return 0 } -gaim::signal connect [gaim::conversation handle] sending-im-msg { account who what } { - gaim::debug -info "tcl signal" "sending-im-msg [gaim::account username $account] $who \"$what\"" +purple::signal connect [purple::conversation handle] sending-im-msg { account who what } { + purple::debug -info "tcl signal" "sending-im-msg [purple::account username $account] $who \"$what\"" return 0 } -gaim::signal connect [gaim::conversation handle] sent-chat-msg { account id what } { - gaim::debug -info "tcl signal" "sent-chat-msg [gaim::account username $account] $id \"$what\"" +purple::signal connect [purple::conversation handle] sent-chat-msg { account id what } { + purple::debug -info "tcl signal" "sent-chat-msg [purple::account username $account] $id \"$what\"" } -gaim::signal connect [gaim::conversation handle] sent-im-msg { account who what } { - gaim::debug -info "tcl signal" "sent-im-msg [gaim::account username $account] $who \"$what\"" +purple::signal connect [purple::conversation handle] sent-im-msg { account who what } { + purple::debug -info "tcl signal" "sent-im-msg [purple::account username $account] $who \"$what\"" } -gaim::signal connect [gaim::connection handle] signed-on { gc } { - gaim::debug -info "tcl signal" "signed-on [gaim::account username [gaim::connection account $gc]]" +purple::signal connect [purple::connection handle] signed-on { gc } { + purple::debug -info "tcl signal" "signed-on [purple::account username [purple::connection account $gc]]" } -gaim::signal connect [gaim::connection handle] signed-off { gc } { - gaim::debug -info "tcl signal" "signed-off [gaim::account username [gaim::connection account $gc]]" +purple::signal connect [purple::connection handle] signed-off { gc } { + purple::debug -info "tcl signal" "signed-off [purple::account username [purple::connection account $gc]]" } -gaim::signal connect [gaim::connection handle] signing-on { gc } { - gaim::debug -info "tcl signal" "signing-on [gaim::account username [gaim::connection account $gc]]" +purple::signal connect [purple::connection handle] signing-on { gc } { + purple::debug -info "tcl signal" "signing-on [purple::account username [purple::connection account $gc]]" } if { 0 } { -gaim::signal connect signing-off { - gaim::debug -info "tcl signal" "signing-off [gaim::account username [gaim::connection account $event::gc]]" +purple::signal connect signing-off { + purple::debug -info "tcl signal" "signing-off [purple::account username [purple::connection account $event::gc]]" } -gaim::signal connect update-idle { - gaim::debug -info "tcl signal" "update-idle" +purple::signal connect update-idle { + purple::debug -info "tcl signal" "update-idle" } } -gaim::signal connect [gaim::plugins handle] plugin-load args { - gaim::debug -info "tcl signal" "plugin-load [list $args]" +purple::signal connect [purple::plugins handle] plugin-load args { + purple::debug -info "tcl signal" "plugin-load [list $args]" } -gaim::signal connect [gaim::plugins handle] plugin-unload args { - gaim::debug -info "tcl signal" "plugin-unload [list $args]" +purple::signal connect [purple::plugins handle] plugin-unload args { + purple::debug -info "tcl signal" "plugin-unload [list $args]" } -gaim::signal connect [gaim::savedstatuses handle] savedstatus-changed args { - gaim::debug -info "tcl signal" "savedstatus-changed [list $args]" - gaim::debug -info "tcl signal" "gaim::savedstatus current = [gaim::savedstatus current]" +purple::signal connect [purple::savedstatuses handle] savedstatus-changed args { + purple::debug -info "tcl signal" "savedstatus-changed [list $args]" + purple::debug -info "tcl signal" "purple::savedstatus current = [purple::savedstatus current]" } proc plugin_init { } { list "Tcl Signal Test" \ - "$gaim::version" \ + "$purple::version" \ "Tests Tcl signal handlers" \ "Debugs a ridiculous amount of signal information." \ - "Ethan Blanton <eblanton@cs.purdue.edu>" \ - "http://gaim.sourceforge.net/" + "Ethan Blanton <elb@pidgin.im>" \ + "http://www.pidgin.im/" }
--- a/libpurple/prpl.h Wed Apr 25 21:48:56 2007 +0000 +++ b/libpurple/prpl.h Wed Apr 25 21:49:58 2007 +0000 @@ -176,8 +176,11 @@ /** * Returns the base icon name for the given buddy and account. - * If buddy is NULL, it will return the name to use for the account's - * icon. This must be implemented. + * If buddy is NULL and the account is non-NULL, it will return the + * name to use for the account's icon. If both are NULL, it will + * return the name to use for the protocol's icon. + * + * This must be implemented. */ const char *(*list_icon)(PurpleAccount *account, PurpleBuddy *buddy);
--- a/pidgin/gtkconv.c Wed Apr 25 21:48:56 2007 +0000 +++ b/pidgin/gtkconv.c Wed Apr 25 21:49:58 2007 +0000 @@ -6034,28 +6034,28 @@ purple_conv_im_get_typing_state(im) == PURPLE_TYPING) { atk_object_set_description(accessibility_obj, _("Typing")); - strncpy(style, "color=\"#47A046\"", sizeof(style)); + strncpy(style, "color=\"#4e9a06\"", sizeof(style)); } else if (im != NULL && purple_conv_im_get_typing_state(im) == PURPLE_TYPED) { atk_object_set_description(accessibility_obj, _("Stopped Typing")); - strncpy(style, "color=\"#D1940C\"", sizeof(style)); + strncpy(style, "color=\"#c4a000\"", sizeof(style)); } else if (gtkconv->unseen_state == PIDGIN_UNSEEN_NICK) { atk_object_set_description(accessibility_obj, _("Nick Said")); - strncpy(style, "color=\"#0D4E91\" style=\"italic\" weight=\"bold\"", sizeof(style)); + strncpy(style, "color=\"#204a87\" style=\"italic\" weight=\"bold\"", sizeof(style)); } else if (gtkconv->unseen_state == PIDGIN_UNSEEN_TEXT) { atk_object_set_description(accessibility_obj, _("Unread Messages")); - strncpy(style, "color=\"#DF421E\" weight=\"bold\"", sizeof(style)); + strncpy(style, "color=\"#a40000\" weight=\"bold\"", sizeof(style)); } else if (gtkconv->unseen_state == PIDGIN_UNSEEN_EVENT) { atk_object_set_description(accessibility_obj, _("New Event")); - strncpy(style, "color=\"#868272\" style=\"italic\"", sizeof(style)); + strncpy(style, "color=\"#888a85\" style=\"italic\"", sizeof(style)); } if (*style != '\0')
--- a/pidgin/gtkthemes.c Wed Apr 25 21:48:56 2007 +0000 +++ b/pidgin/gtkthemes.c Wed Apr 25 21:49:58 2007 +0000 @@ -200,6 +200,10 @@ i++; } + + /* Reverse the Smiley list since it was built in reverse order for efficiency reasons */ + list->smileys = g_slist_reverse(list->smileys); + if (!have_used_sfile) g_free(sfile); }