# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1187389361 0
# Node ID 8c51298db0ecc9af37c99d66efa5998758c0a32b
# Parent  a5843f3b70f32a280be0426e4cd4aa8afed6bf76# Parent  6cec9e871ad2de616b76e9454928ed46bd86c8d0
merge of '07a0858e73dde73e68b5a2931ef150fb8c6bea06'
     and 'fc49baf44017a8fd511c607b435668baf2a0f518'

diff -r a5843f3b70f3 -r 8c51298db0ec COPYRIGHT
--- a/COPYRIGHT	Fri Aug 17 19:57:47 2007 +0000
+++ b/COPYRIGHT	Fri Aug 17 22:22:41 2007 +0000
@@ -301,6 +301,7 @@
 Luciano Miguel Ferreira Rocha
 Andrew Rodland
 Miguel Rodríguez (migrax)
+Bob Rossi
 Jason Roth
 Jean-Francois Roy
 Sam S.
diff -r a5843f3b70f3 -r 8c51298db0ec ChangeLog
--- a/ChangeLog	Fri Aug 17 19:57:47 2007 +0000
+++ b/ChangeLog	Fri Aug 17 22:22:41 2007 +0000
@@ -12,6 +12,10 @@
 	* Bonjour plugin uses native Avahi instead of Howl
 	* Bonjour plugin supports Buddy Icons
 
+	XMPP:
+	* Only report conversation close when 'send typing notifications'
+	  preference is turned on (Bob Rossi)
+
 	Pidgin:
 	* Show current outgoing conversation formatting on the font label on
 	  the toolbar
diff -r a5843f3b70f3 -r 8c51298db0ec libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Fri Aug 17 19:57:47 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Fri Aug 17 22:22:41 2007 +0000
@@ -675,7 +675,11 @@
 
 void jabber_message_conv_closed(JabberStream *js, const char *who)
 {
-	JabberMessage *jm = g_new0(JabberMessage, 1);
+	JabberMessage *jm;
+	if (!purple_prefs_get_bool("/purple/conversations/im/send_typing"))
+		return;
+
+	jm  = g_new0(JabberMessage, 1);
 	jm->js = js;
 	jm->type = JABBER_MESSAGE_CHAT;
 	jm->to = g_strdup(who);
diff -r a5843f3b70f3 -r 8c51298db0ec pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Fri Aug 17 19:57:47 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Aug 17 22:22:41 2007 +0000
@@ -8497,7 +8497,7 @@
 	gtk_notebook_set_scrollable(GTK_NOTEBOOK(win->notebook), TRUE);
 	gtk_notebook_popup_enable(GTK_NOTEBOOK(win->notebook));
 	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), FALSE);
-	gtk_notebook_set_show_border(GTK_NOTEBOOK(win->notebook), FALSE);
+	gtk_notebook_set_show_border(GTK_NOTEBOOK(win->notebook), TRUE);
 
 	g_signal_connect(G_OBJECT(win->notebook), "button-press-event",
 					G_CALLBACK(right_click_menu_cb), win);
@@ -8783,8 +8783,6 @@
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
 #endif
 	gtk_container_add(GTK_CONTAINER(ebox), gtkconv->tabby);
-	g_signal_connect(G_OBJECT(ebox), "button-press-event",
-					G_CALLBACK(alias_double_click_cb), gtkconv);
 
 	if (gtkconv->tab_label->parent == NULL) {
 		/* Pack if it's a new widget */