diff src/gtkimhtmltoolbar.c @ 10135:3855d3467437

[gaim-migrate @ 11202] This makes the gtkimhtmltoolbar significantly less crash prone, I think this was caused by some over enthusiastic removal of code duplication. I'm still not particularly impressed with the uneven spacing of the Yahoo! smileys, but it does appear to be a gtk thing. Worse, though, is that Gtk < 2.4 doesn't have any support for table menus at all, so currently HEAD is for Gtk >= 2.4 only :-( committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 24 Oct 2004 15:16:48 +0000
parents 0aca774bef87
children 5fb5c447eb4f
line wrap: on
line diff
--- a/src/gtkimhtmltoolbar.c	Sat Oct 23 18:07:11 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Sun Oct 24 15:16:48 2004 +0000
@@ -115,7 +115,8 @@
 destroy_toolbar_font(GtkWidget *widget, GdkEvent *event,
 					 GtkIMHtmlToolbar *toolbar)
 {
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->font), FALSE);
+	if (widget != NULL)
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->font), FALSE);
 
 	if (toolbar->font_dialog != NULL)
 	{
@@ -207,7 +208,8 @@
 destroy_toolbar_fgcolor(GtkWidget *widget, GdkEvent *event,
 						GtkIMHtmlToolbar *toolbar)
 {
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->fgcolor), FALSE);
+	if (widget != NULL)
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->fgcolor), FALSE);
 
 	if (toolbar->fgcolor_dialog != NULL)
 	{
@@ -280,7 +282,8 @@
 destroy_toolbar_bgcolor(GtkWidget *widget, GdkEvent *event,
 						GtkIMHtmlToolbar *toolbar)
 {
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->bgcolor), FALSE);
+	if (widget != NULL)
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->bgcolor), FALSE);
 
 	if (toolbar->bgcolor_dialog != NULL)
 	{