# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1047596278 0
# Node ID 54fbd9769677d63386336efd4ec19b8ab9c0017e
# Parent  ced41239ffd36eda41e66747b645b7162cd3c80c
[gaim-migrate @ 5072]
This fixes the debug window.  It's probably not an ideal fix, but it
works.  Some kind of core/ui splittage here would be nice.

I also made the gtk convo destroy function remove the timer to redraw
animated buddy icons, if it exists.  This doesn't really affect anything,
since the redraw function checks to make sure the convo exists, but
it's probably more better this way.

Also, I meant to misspell "definitely."  Really.  I did.  You don't
believe me?  It's ok, I wouldn't believe me either.

committer: Tailor Script <tailor@pidgin.im>

diff -r ced41239ffd3 -r 54fbd9769677 src/buddy.c
--- a/src/buddy.c	Thu Mar 13 22:02:12 2003 +0000
+++ b/src/buddy.c	Thu Mar 13 22:57:58 2003 +0000
@@ -525,7 +525,7 @@
 	{ N_("/_Help"), NULL, NULL, 0, "<Branch>" },
 	{ N_("/Help/Online _Help"), "F1", NULL, 0,
 	  "<StockItem>", GTK_STOCK_HELP },
-	{ N_("/Help/_Debug Window"), NULL, show_debug, 0, NULL },
+	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, NULL },
 	{ N_("/Help/_About"), NULL, show_about, 0, NULL },
 
 };
diff -r ced41239ffd3 -r 54fbd9769677 src/gtkconv.c
--- a/src/gtkconv.c	Thu Mar 13 22:02:12 2003 +0000
+++ b/src/gtkconv.c	Thu Mar 13 22:57:58 2003 +0000
@@ -3738,6 +3738,9 @@
 	gtk_widget_destroy(gtkconv->tab_cont);
 
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+		if (gtkconv->u.im->icon_timer != 0)
+			g_source_remove(gtkconv->u.im->icon_timer);
+
 		if (gtkconv->u.im->save_icon != NULL)
 			gtk_widget_destroy(gtkconv->u.im->save_icon);
 
diff -r ced41239ffd3 -r 54fbd9769677 src/prefs.c
--- a/src/prefs.c	Thu Mar 13 22:02:12 2003 +0000
+++ b/src/prefs.c	Thu Mar 13 22:57:58 2003 +0000
@@ -1914,6 +1914,13 @@
 	}
 }
 
+void toggle_debug()
+{
+	misc_options ^= OPT_MISC_DEBUG;
+	show_debug();
+	save_prefs();
+}
+
 void debug_printf(char *fmt, ...)
 {
 	va_list ap;
diff -r ced41239ffd3 -r 54fbd9769677 src/ui.h
--- a/src/ui.h	Thu Mar 13 22:02:12 2003 +0000
+++ b/src/ui.h	Thu Mar 13 22:57:58 2003 +0000
@@ -462,6 +462,7 @@
 extern void set_option(GtkWidget *, int *);
 extern void show_prefs();
 extern void show_debug();
+extern void toggle_debug();
 extern void update_color(GtkWidget *, GtkWidget *);
 extern void set_default_away(GtkWidget *, gpointer);
 extern void default_away_menu_init(GtkWidget *);