Mercurial > pidgin.yaz
changeset 21774:b63b2a5c2d05
merge of '282b4acb46729e4358221cb7cc78ad9373289199'
and '3fe64d635336a6d7f6e520f4b2e041c3316c465d'
author | Etan Reisner <pidgin@unreliablesource.net> |
---|---|
date | Sat, 01 Dec 2007 03:41:37 +0000 |
parents | 14afe5a92fc2 (diff) 50d1ee737a68 (current diff) |
children | 4dc66862203f |
files | libpurple/network.c po/ChangeLog |
diffstat | 7 files changed, 34 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/account-signals.dox Sat Dec 01 03:28:50 2007 +0000 +++ b/doc/account-signals.dox Sat Dec 01 03:41:37 2007 +0000 @@ -9,6 +9,7 @@ @signal account-setting-info @signal account-set-info @signal account-status-changed + @signal account-alias-changed @signal account-authorization-requested @signal account-authorization-denied @signal account-authorization-granted
--- a/doc/blist-signals.dox Sat Dec 01 03:28:50 2007 +0000 +++ b/doc/blist-signals.dox Sat Dec 01 03:41:37 2007 +0000 @@ -82,6 +82,14 @@ Emitted when a new buddy is added to the buddy list. @endsignaldef + @signaldef buddy-removed + @signalproto +void (*buddy_removed)(PurpleBuddy *buddy) + @endsignalproto + @signaldesc + Emitted when a buddy is removed from the buddy list. + @endsignaldef + @signaldef buddy-icon-changed @signalproto void (*buddy_icon_changed)(PurpleBuddy *buddy) @@ -90,14 +98,6 @@ Emitted when a buddy's icon is set. @endsignaldef - @signaldef buddy-removed - @signalproto -void (*buddy_removed)(PurpleBuddy *buddy) - @endsignalproto - @signaldesc - Emitted when a buddy is removed from the buddy list. - @endsignaldef - @signaldef blist-node-aliased @signalproto void (*blist_node_aliased)(PurpleBlistNode *node, const char *old_alias)
--- a/doc/gtkconv-signals.dox Sat Dec 01 03:28:50 2007 +0000 +++ b/doc/gtkconv-signals.dox Sat Dec 01 03:41:37 2007 +0000 @@ -28,12 +28,14 @@ @signaldef conversation-timestamp @signalproto -char *(*conversation_timestamp)(PurpleConversation *conv, time_t when); +char *(*conversation_timestamp)(PurpleConversation *conv, time_t when, + gboolean show_date); @endsignalproto @signaldesc Emitted to allow plugins to customize the timestamp on a message. - @param conv The conversation the message belongs to. - @param when The time to be converted to a string. + @param conv The conversation the message belongs to. + @param when The time to be converted to a string. + @param show_date Whether the date should be displayed. @return A textual representation of the time, or @c NULL to use a default format. @endsignaldef
--- a/doc/log-signals.dox Sat Dec 01 03:28:50 2007 +0000 +++ b/doc/log-signals.dox Sat Dec 01 03:41:37 2007 +0000 @@ -10,13 +10,14 @@ @signaldef log-timestamp @signalproto -char *(*log_timestamp)(PurpleLog *log, time_t when); +char *(*log_timestamp)(PurpleLog *log, time_t when, gboolean show_date); @endsignalproto @signaldesc Emitted to allow plugins to customize the timestamp on a message being logged. - @param log The log the message belongs to. - @param when The time to be converted to a string. + @param log The log the message belongs to. + @param when The time to be converted to a string. + @param show_date Whether the date should be displayed. @return A textual representation of the time, or @c NULL to use a default format. @note Plugins must be careful of logs with a type of PURPLE_LOG_SYSTEM.
--- a/libpurple/ft.c Sat Dec 01 03:28:50 2007 +0000 +++ b/libpurple/ft.c Sat Dec 01 03:41:37 2007 +0000 @@ -1306,8 +1306,12 @@ } void -purple_xfers_uninit(void) { - purple_signals_disconnect_by_handle(purple_xfers_get_handle()); +purple_xfers_uninit(void) +{ + void *handle = purple_xfers_get_handle(); + + purple_signals_disconnect_by_handle(handle); + purple_signals_unregister_by_instance(handle); } void
--- a/libpurple/network.c Sat Dec 01 03:28:50 2007 +0000 +++ b/libpurple/network.c Sat Dec 01 03:41:37 2007 +0000 @@ -710,4 +710,7 @@ if(nm_context) libnm_glib_shutdown(nm_context); #endif + + purple_signal_unregister(purple_network_get_handle(), + "network-configuration-changed"); }
--- a/libpurple/plugin.c Sat Dec 01 03:28:50 2007 +0000 +++ b/libpurple/plugin.c Sat Dec 01 03:41:37 2007 +0000 @@ -1175,7 +1175,7 @@ purple_plugins_init(void) { void *handle = purple_plugins_get_handle(); - purple_plugins_add_search_path(LIBDIR); + purple_plugins_add_search_path(LIBDIR); purple_signal_register(handle, "plugin-load", purple_marshal_VOID__POINTER, @@ -1190,8 +1190,12 @@ } void -purple_plugins_uninit(void) { - purple_signals_disconnect_by_handle(purple_plugins_get_handle()); +purple_plugins_uninit(void) +{ + void *handle = purple_plugins_get_handle(); + + purple_signals_disconnect_by_handle(handle); + purple_signals_unregister_by_instance(handle); } /**************************************************************************