diff src/gtkimhtmltoolbar.c @ 8506:887c0259b47b

[gaim-migrate @ 9242] " 6: Using CTRL+Up to get back a previous line breaks the formatting on any new text entered on that line. Text, while being entered appears extremely small, and when it's sent, the formatting is slightly smaller and may lose other elements of formatting. the problem was that in the key_press_cb in gtkconv.c was using gtk_text_buffer_get_text(gtkconv->entry_buffer, ...); this was not giving us the html tags. So I changed it to gtk_imthml_get_markup(GTK_IMHTML(gtkconv->entry)); Then I added a signal so that the toolbar gets update when gtk_imhtml_append_text_with_images is called so that the toolbar can be updated as well. I also rename the format_functions_update to format_buttons_update since it, to me atleast, makes more sense and because I couldn't think of a better name than format_function_update, which would have been very confusing. theres one issue that I was not able to fix in this. I'm planning on looking into it later, but after ctrl-up/down the closing tag gets added and ends at the last character from the buffer. Which means formatting returns to normal (ie plain text) if you type after you've used ctrl-up/down." --Gary Kramlich committer: Tailor Script <[e-mail]>

--- a/src/gtkimhtmltoolbar.c	Fri Mar 26 05:05:08 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Fri Mar 26 14:14:16 2004 +0000
@@ -701,6 +701,25 @@
 		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline),
 									   FALSE, toolbar);
 }
+static void update_format_cb(GtkIMHtml *imhtml, GtkIMHtmlToolbar *toolbar)
+{
+	gboolean bold, italic, underline;
+	
+	bold = italic = underline = FALSE;
+	gtk_imhtml_get_current_format(imhtml, -1, &bold, &italic, &underline);
+
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->bold)) != bold)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->bold), bold,
+									   toolbar);
+	
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->italic)) != italic)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->italic), italic,
+									   toolbar);
+	
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->underline)) != underline)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline),
+									   underline, toolbar);	
+}
 
 static void cursor_moved_cb(GtkIMHtml *imhtml, GtkMovementStep step,
 							gint change, gboolean selected,
@@ -979,9 +998,10 @@
 	g_return_if_fail(GTK_IS_IMHTML(imhtml));
 
 	toolbar->imhtml = imhtml;
-	g_signal_connect(G_OBJECT(imhtml), "format_functions_update", G_CALLBACK(update_buttons_cb), toolbar);
+	g_signal_connect(G_OBJECT(imhtml), "format_buttons_update", G_CALLBACK(update_buttons_cb), toolbar);
 	g_signal_connect(G_OBJECT(imhtml), "format_function_toggle", G_CALLBACK(toggle_button_cb), toolbar);
 	g_signal_connect(G_OBJECT(imhtml), "format_function_clear", G_CALLBACK(reset_buttons_cb), toolbar);
+	g_signal_connect(G_OBJECT(imhtml), "format_function_update", G_CALLBACK(update_format_cb), toolbar);
 	g_signal_connect_after(G_OBJECT(imhtml), "move_cursor", G_CALLBACK(cursor_moved_cb), toolbar);
 
 	bold = italic = underline = FALSE;