Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
10134:0aca774bef87 | 10135:3855d3467437 |
---|---|
113 | 113 |
114 static void | 114 static void |
115 destroy_toolbar_font(GtkWidget *widget, GdkEvent *event, | 115 destroy_toolbar_font(GtkWidget *widget, GdkEvent *event, |
116 GtkIMHtmlToolbar *toolbar) | 116 GtkIMHtmlToolbar *toolbar) |
117 { | 117 { |
118 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->font), FALSE); | 118 if (widget != NULL) |
119 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->font), FALSE); | |
119 | 120 |
120 if (toolbar->font_dialog != NULL) | 121 if (toolbar->font_dialog != NULL) |
121 { | 122 { |
122 gtk_widget_destroy(toolbar->font_dialog); | 123 gtk_widget_destroy(toolbar->font_dialog); |
123 toolbar->font_dialog = NULL; | 124 toolbar->font_dialog = NULL; |
205 | 206 |
206 static void | 207 static void |
207 destroy_toolbar_fgcolor(GtkWidget *widget, GdkEvent *event, | 208 destroy_toolbar_fgcolor(GtkWidget *widget, GdkEvent *event, |
208 GtkIMHtmlToolbar *toolbar) | 209 GtkIMHtmlToolbar *toolbar) |
209 { | 210 { |
210 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->fgcolor), FALSE); | 211 if (widget != NULL) |
212 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->fgcolor), FALSE); | |
211 | 213 |
212 if (toolbar->fgcolor_dialog != NULL) | 214 if (toolbar->fgcolor_dialog != NULL) |
213 { | 215 { |
214 gtk_widget_destroy(toolbar->fgcolor_dialog); | 216 gtk_widget_destroy(toolbar->fgcolor_dialog); |
215 toolbar->fgcolor_dialog = NULL; | 217 toolbar->fgcolor_dialog = NULL; |
278 | 280 |
279 static void | 281 static void |
280 destroy_toolbar_bgcolor(GtkWidget *widget, GdkEvent *event, | 282 destroy_toolbar_bgcolor(GtkWidget *widget, GdkEvent *event, |
281 GtkIMHtmlToolbar *toolbar) | 283 GtkIMHtmlToolbar *toolbar) |
282 { | 284 { |
283 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->bgcolor), FALSE); | 285 if (widget != NULL) |
286 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->bgcolor), FALSE); | |
284 | 287 |
285 if (toolbar->bgcolor_dialog != NULL) | 288 if (toolbar->bgcolor_dialog != NULL) |
286 { | 289 { |
287 gtk_widget_destroy(toolbar->bgcolor_dialog); | 290 gtk_widget_destroy(toolbar->bgcolor_dialog); |
288 toolbar->bgcolor_dialog = NULL; | 291 toolbar->bgcolor_dialog = NULL; |