# HG changeset patch # User Christian Hammond # Date 1064807648 0 # Node ID da1430478acf22929ca009bf4b9e7ff08af2831d # Parent 1dbafcde861f07e3aeb5eeededcbeced4879e4ea [gaim-migrate @ 7564] Closing a formatted info dialog now removes the dialog handle from the list, so it doesn't try to get removed again after the prpl unloads. committer: Tailor Script diff -r 1dbafcde861f -r da1430478acf src/gtknotify.c --- a/src/gtknotify.c Mon Sep 29 03:18:57 2003 +0000 +++ b/src/gtknotify.c Mon Sep 29 03:54:08 2003 +0000 @@ -64,6 +64,12 @@ gaim_notify_close(GAIM_NOTIFY_EMAILS, data); } +static void +formatted_close_cb(GtkWidget *win, GdkEvent *event, void *user_data) +{ + gaim_notify_close(GAIM_NOTIFY_FORMATTED, win); +} + static void * gaim_gtk_notify_message(GaimNotifyMsgType type, const char *title, const char *primary, const char *secondary, @@ -271,6 +277,9 @@ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_container_set_border_width(GTK_CONTAINER(window), 12); + g_signal_connect(G_OBJECT(window), "delete_event", + G_CALLBACK(formatted_close_cb), NULL); + /* Setup the main vbox */ vbox = gtk_vbox_new(FALSE, 12); gtk_container_add(GTK_CONTAINER(window), vbox); @@ -312,7 +321,7 @@ gtk_widget_show(button); g_signal_connect_swapped(G_OBJECT(button), "clicked", - G_CALLBACK(gtk_widget_destroy), window); + G_CALLBACK(formatted_close_cb), window); /* Add the text to the gtkimhtml */ if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_colors"))