# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1192673970 0
# Node ID 461d6654aca1160fb1a22cea24052ea49b87733f
# Parent  96929e7acb866f62bf0b0f3cadec74c055c14785# Parent  cb5cbe04a3404a672820f9bcfe99cdc4991ca906
merge of '368bfef2ab575a899876b7b246223bac8b53c290'
     and '9f2e0be2b91112e99baa40160913b63794df625f'

diff -r cb5cbe04a340 -r 461d6654aca1 doc/account-signals.dox
--- a/doc/account-signals.dox	Wed Oct 17 18:13:33 2007 +0000
+++ b/doc/account-signals.dox	Thu Oct 18 02:19:30 2007 +0000
@@ -9,6 +9,7 @@
   @signal account-setting-info
   @signal account-set-info
   @signal account-status-changed
+  @signal account-alias-changed
  @endsignals
 
  @see account.h
diff -r cb5cbe04a340 -r 461d6654aca1 doc/blist-signals.dox
--- a/doc/blist-signals.dox	Wed Oct 17 18:13:33 2007 +0000
+++ b/doc/blist-signals.dox	Thu Oct 18 02:19:30 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)
diff -r cb5cbe04a340 -r 461d6654aca1 doc/gtkconv-signals.dox
--- a/doc/gtkconv-signals.dox	Wed Oct 17 18:13:33 2007 +0000
+++ b/doc/gtkconv-signals.dox	Thu Oct 18 02:19:30 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
diff -r cb5cbe04a340 -r 461d6654aca1 doc/log-signals.dox
--- a/doc/log-signals.dox	Wed Oct 17 18:13:33 2007 +0000
+++ b/doc/log-signals.dox	Thu Oct 18 02:19:30 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.
diff -r cb5cbe04a340 -r 461d6654aca1 libpurple/ft.c
--- a/libpurple/ft.c	Wed Oct 17 18:13:33 2007 +0000
+++ b/libpurple/ft.c	Thu Oct 18 02:19:30 2007 +0000
@@ -1301,8 +1301,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
diff -r cb5cbe04a340 -r 461d6654aca1 libpurple/network.c
--- a/libpurple/network.c	Wed Oct 17 18:13:33 2007 +0000
+++ b/libpurple/network.c	Thu Oct 18 02:19:30 2007 +0000
@@ -696,4 +696,7 @@
 	if(nm_context)
 		libnm_glib_shutdown(nm_context);
 #endif
+
+	purple_signal_unregister(purple_network_get_handle(),
+	                         "network-configuration-changed");
 }
diff -r cb5cbe04a340 -r 461d6654aca1 libpurple/plugin.c
--- a/libpurple/plugin.c	Wed Oct 17 18:13:33 2007 +0000
+++ b/libpurple/plugin.c	Thu Oct 18 02:19:30 2007 +0000
@@ -1161,7 +1161,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,
@@ -1176,8 +1176,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);
 }
 
 /**************************************************************************