# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1247458279 0
# Node ID 07cb59d4768576ac8067a4dc76970d400c3c763f
# Parent  5e7dbb38bfe51b1c4b1fe31d2b71569c695546f5# Parent  b32e7be9b3bf34aa317af29c93616573da12cea5
merge of '4eb90113f62db7720e95fc2491dd522f5950d0d8'
     and 'b6437968f045a5992fdc9463313939b8c7bc95fd'

diff -r 5e7dbb38bfe5 -r 07cb59d47685 configure.ac
--- a/configure.ac	Mon Jul 13 04:01:32 2009 +0000
+++ b/configure.ac	Mon Jul 13 04:11:19 2009 +0000
@@ -1075,13 +1075,19 @@
 load_proto=
 for i in $STATIC_PRPLS ; do
 	dnl Ugly special case for "libsilcpurple.la":
-	dnl ... and Ugly special case for multi-protocol oscar
+	dnl ... and Ugly special case for multi-protocol oscar and yahoo
 	if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
 		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
 		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
 		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
 		load_proto="$load_proto purple_init_aim_plugin();"
 		load_proto="$load_proto purple_init_icq_plugin();"
+	elif test "x$i" = "xyahoo"; then
+		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+		load_proto="$load_proto purple_init_yahoo_plugin();"
+		load_proto="$load_proto purple_init_yahoojp_plugin();"
 	else
 		if test "x$i" = "xsilc"; then
 			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
diff -r 5e7dbb38bfe5 -r 07cb59d47685 finch/gntconv.c
--- a/finch/gntconv.c	Mon Jul 13 04:01:32 2009 +0000
+++ b/finch/gntconv.c	Mon Jul 13 04:11:19 2009 +0000
@@ -881,9 +881,12 @@
 	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), "\n", GNT_TEXT_FLAG_NORMAL);
 
 	/* Unnecessary to print the timestamp for delayed message */
-	if (purple_prefs_get_bool("/finch/conversations/timestamps"))
+	if (purple_prefs_get_bool("/finch/conversations/timestamps")) {
+		if (!mtime)
+			time(&mtime);
 		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
 					purple_utf8_strftime("(%H:%M:%S)", localtime(&mtime)), gnt_color_pair(color_timestamp));
+	}
 
 	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), " ", GNT_TEXT_FLAG_NORMAL);
 
diff -r 5e7dbb38bfe5 -r 07cb59d47685 libpurple/protocols/yahoo/Makefile.am
--- a/libpurple/protocols/yahoo/Makefile.am	Mon Jul 13 04:01:32 2009 +0000
+++ b/libpurple/protocols/yahoo/Makefile.am	Mon Jul 13 04:11:19 2009 +0000
@@ -33,7 +33,7 @@
 if STATIC_YAHOO
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LTLIBRARIES  = libyahoo.la
+noinst_LTLIBRARIES  = libymsg.la
 libymsg_la_SOURCES = $(YAHOOSOURCES) libyahoo.c libyahoojp.c
 libymsg_la_CFLAGS  = $(AM_CFLAGS)
 
diff -r 5e7dbb38bfe5 -r 07cb59d47685 libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c	Mon Jul 13 04:01:32 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Mon Jul 13 04:11:19 2009 +0000
@@ -3411,6 +3411,7 @@
 
 	purple_connection_set_display_name(gc, purple_account_get_username(account));
 
+	yd->gc = gc;
 	yd->yahoo_local_p2p_server_fd = -1;
 	yd->fd = -1;
 	yd->txhandler = 0;