# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1181093138 0
# Node ID c57c2b245c89ac2a946131c7464b9b8382f81bfb
# Parent  2f9eabdc60114974f2ed0c9b671794d53aa5c3f7# Parent  33063a3940a80e1aa047c22e8076530a2a833f04
propagate from branch 'im.pidgin.pidgin' (head 6100ad71830416445898c91d595780f606c951cd)
            to branch 'im.pidgin.pidgin.2.1.0' (head 0d615ecc6df69619a7ec964d6f50a30ea58e9436)

diff -r 2f9eabdc6011 -r c57c2b245c89 doc/funniest_home_convos.txt
--- a/doc/funniest_home_convos.txt	Wed Jun 06 00:23:41 2007 +0000
+++ b/doc/funniest_home_convos.txt	Wed Jun 06 01:25:38 2007 +0000
@@ -471,4 +471,6 @@
 14:08 <elb> "... yes"
 14:08 <elb> I mean, what do you say
 14:08 <Robot101> elb: was their nick "idi"?
-          
+
+19:23 <-- elb has quit (K-lined)
+
diff -r 2f9eabdc6011 -r c57c2b245c89 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Wed Jun 06 00:23:41 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Wed Jun 06 01:25:38 2007 +0000
@@ -1238,3 +1238,19 @@
 	g_free(toolbar->sml);
 	toolbar->sml = g_strdup(proto_id);
 }
+	g_signal_connect(G_OBJECT(imhtml), "format_function_update", G_CALLBACK(update_format_cb), toolbar);
+	g_signal_connect_after(G_OBJECT(GTK_IMHTML(imhtml)->text_buffer), "mark-set", G_CALLBACK(mark_set_cb), toolbar);
+
+	buttons = gtk_imhtml_get_format_functions(GTK_IMHTML(imhtml));
+	update_buttons_cb(GTK_IMHTML(imhtml), buttons, toolbar);
+
+	gtk_imhtml_get_current_format(GTK_IMHTML(imhtml), &bold, &italic, &underline);
+
+	update_buttons(toolbar);
+}
+
+void gtk_imhtmltoolbar_associate_smileys(GtkIMHtmlToolbar *toolbar, const char *proto_id)
+{
+	g_free(toolbar->sml);
+	toolbar->sml = g_strdup(proto_id);
+}
diff -r 2f9eabdc6011 -r c57c2b245c89 pidgin/pidginstock.c
--- a/pidgin/pidginstock.c	Wed Jun 06 00:23:41 2007 +0000
+++ b/pidgin/pidginstock.c	Wed Jun 06 01:25:38 2007 +0000
@@ -151,7 +151,6 @@
 	{ PIDGIN_STOCK_TOOLBAR_FONT_FACE, "toolbar", "font-face.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER, "toolbar", "font-size-down.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_TEXT_LARGER, "toolbar", "font-size-up.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_INSERT, "toolbar", "insert.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, "toolbar", "insert-image.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_INSERT_LINK, "toolbar", "insert-link.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, "toolbar", "message-new.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
diff -r 2f9eabdc6011 -r c57c2b245c89 pidgin/pidginstock.h
--- a/pidgin/pidginstock.h	Wed Jun 06 00:23:41 2007 +0000
+++ b/pidgin/pidginstock.h	Wed Jun 06 01:25:38 2007 +0000
@@ -116,7 +116,6 @@
 #define PIDGIN_STOCK_TOOLBAR_FONT_FACE	  "pidgin-font-face"
 #define PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER "pidgin-text-smaller"
 #define PIDGIN_STOCK_TOOLBAR_TEXT_LARGER  "pidgin-text-larger"
-#define PIDGIN_STOCK_TOOLBAR_INSERT       "pidgin-insert"
 #define PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE "pidgin-insert-image"
 #define PIDGIN_STOCK_TOOLBAR_INSERT_LINK  "pidgin-insert-link"
 #define PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW  "pidgin-message-new"
diff -r 2f9eabdc6011 -r c57c2b245c89 pidgin/pixmaps/toolbar/16/Makefile.am
--- a/pidgin/pixmaps/toolbar/16/Makefile.am	Wed Jun 06 00:23:41 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/Makefile.am	Wed Jun 06 01:25:38 2007 +0000
@@ -6,7 +6,6 @@
 		font-face.png \
 		font-size-down.png \
 		font-size-up.png \
-		insert.png \
 		insert-image.png \
 		insert-link.png \
 		message-new.png \