diff src/gtkstatusbox.c @ 11523:1116993aadd2

[gaim-migrate @ 13771] Incorporated Autorecon's code into the core. Removed the Disconnected window Shows connection errors in status box. This works _ok_ when signed on with a single account, but won't currently Handle multiple accounts at all. I wanted to get this in before going to bed tonight, so I can work on it later, though. Feel free to help. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Mon, 12 Sep 2005 06:46:43 +0000
parents 6f9fc83ee25c
children 9f521a61ef58
line wrap: on
line diff
--- a/src/gtkstatusbox.c	Mon Sep 12 06:04:27 2005 +0000
+++ b/src/gtkstatusbox.c	Mon Sep 12 06:46:43 2005 +0000
@@ -190,12 +190,12 @@
 		text = g_strdup_printf("%s", title);
 	}
 
-	if (status_box->error)
+	if (status_box->connecting)
+		pixbuf = status_box->connecting_pixbufs[status_box->connecting_index];
+	else if (status_box->error)
 		pixbuf = status_box->error_pixbuf;
 	else if (status_box->typing)
 		pixbuf = status_box->typing_pixbufs[status_box->typing_index];
-	else if (status_box->connecting)
-		pixbuf = status_box->connecting_pixbufs[status_box->connecting_index];
 	else
 		pixbuf = status_box->pixbuf;
 
@@ -421,6 +421,8 @@
 void
 gtk_gaim_status_box_set_error(GtkGaimStatusBox *status_box, const gchar *error)
 {
+	if (status_box->error)
+		g_free(status_box->error);
 	status_box->error = g_strdup(error);
 	gtk_gaim_status_box_refresh(status_box);
 }