From: Christian H. <ch...@us...> - 2004-02-23 22:29:10
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6488 Modified Files: gtkimhtmltoolbar.c Log Message: The delete_event signals were all screwed up, causing the smiley dialog to never actually close. Fixed. Index: gtkimhtmltoolbar.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkimhtmltoolbar.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -p -r1.2 -r1.3 --- gtkimhtmltoolbar.c 23 Feb 2004 22:13:43 -0000 1.2 +++ gtkimhtmltoolbar.c 23 Feb 2004 22:23:11 -0000 1.3 @@ -433,7 +433,8 @@ insert_image_cb(GtkWidget *save, GtkIMHt } -void close_smiley_dialog(GtkWidget *widget, GtkIMHtmlToolbar *toolbar) +void close_smiley_dialog(GtkWidget *widget, GdkEvent *event, + GtkIMHtmlToolbar *toolbar) { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->smiley), FALSE); @@ -451,7 +452,7 @@ void insert_smiley_text(GtkWidget *widge gtk_imhtml_insert_smiley(GTK_IMHTML(toolbar->imhtml), NULL, smiley_text); //proto->info->name, smiley_text); - close_smiley_dialog(NULL, toolbar); + close_smiley_dialog(NULL, NULL, toolbar); } @@ -564,7 +565,7 @@ insert_smiley_cb(GtkWidget *smiley, GtkI toolbar->smiley_dialog = dialog; } else if (toolbar->smiley_dialog) { - close_smiley_dialog(smiley, toolbar); + close_smiley_dialog(smiley, NULL, toolbar); } gtk_widget_grab_focus(toolbar->imhtml); } |