# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1058083112 0
# Node ID 29ddc42ff402555fe04fb7062596d3352974a353
# Parent  ee4858c41a18d734aaa9247f19a47834e2c6097e
[gaim-migrate @ 6565]
Make gaim not crash when signing off an account that has had a message
notify window closed for it.  Previously Gaim was freeing the widget but
not removing it from the linked list, so gaim attempted to free it again
at sign off.

"There's been a lot of talk, about this next song.  Maybe a little too much
talk.  This song is not a rebel song.  This song is Sunday, Bloody Sunday."

committer: Tailor Script <tailor@pidgin.im>

diff -r ee4858c41a18 -r 29ddc42ff402 plugins/docklet/.cvsignore
--- a/plugins/docklet/.cvsignore	Sun Jul 13 01:19:49 2003 +0000
+++ b/plugins/docklet/.cvsignore	Sun Jul 13 07:58:32 2003 +0000
@@ -2,7 +2,6 @@
 .libs
 Makefile
 Makefile.in
-docklet.la
-docklet.lo
-eggtrayicon.lo
-docklet.dll
+*.dll
+*.la
+*.lo
diff -r ee4858c41a18 -r 29ddc42ff402 plugins/docklet/trayicon-win32.c
--- a/plugins/docklet/trayicon-win32.c	Sun Jul 13 01:19:49 2003 +0000
+++ b/plugins/docklet/trayicon-win32.c	Sun Jul 13 07:58:32 2003 +0000
@@ -1,4 +1,6 @@
-/* System tray icon (aka docklet) plugin for Gaim
+/*
+ * System tray icon (aka docklet) plugin for Gaim
+ *
  * Copyright (C) 2002 Robert McQueen <robot101@debian.org>
  * Copyright (C) 2003 Herman Bloggs <hermanator12002@yahoo.com>
  * Inspired by a similar plugin by:
diff -r ee4858c41a18 -r 29ddc42ff402 plugins/docklet/trayicon-x11.c
--- a/plugins/docklet/trayicon-x11.c	Sun Jul 13 01:19:49 2003 +0000
+++ b/plugins/docklet/trayicon-x11.c	Sun Jul 13 07:58:32 2003 +0000
@@ -1,4 +1,6 @@
-/* System tray icon (aka docklet) plugin for Gaim
+/*
+ * System tray icon (aka docklet) plugin for Gaim
+ *
  * Copyright (C) 2002 Robert McQueen <robot101@debian.org>
  * Copyright (C) 2003 Herman Bloggs <hermanator12002@yahoo.com>
  * Inspired by a similar plugin by:
diff -r ee4858c41a18 -r 29ddc42ff402 src/gtknotify.c
--- a/src/gtknotify.c	Sun Jul 13 01:19:49 2003 +0000
+++ b/src/gtknotify.c	Sun Jul 13 07:58:32 2003 +0000
@@ -46,6 +46,12 @@
 									void *user_data);
 
 static void
+message_response_cb(GtkDialog *dialog, gint id, GaimNotifyMailData *data)
+{
+	gaim_notify_close(GAIM_NOTIFY_MESSAGE, data);
+}
+
+static void
 email_response_cb(GtkDialog *dialog, gint id, GaimNotifyMailData *data)
 {
 	if (id == 0)
@@ -93,7 +99,7 @@
 										 GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 										 NULL);
 	g_signal_connect(G_OBJECT(dialog), "response",
-					 G_CALLBACK(gtk_widget_destroy), NULL);
+					 G_CALLBACK(message_response_cb), dialog);
 
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), 6);
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);