# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 975293107 0
# Node ID 8f4ce8b7490172f4eb9b4f7c2cb3b0b7abaeb51c
# Parent  249b040f6a83970226b425d06e1a2afdd4547dbf
[gaim-migrate @ 1151]
bah

committer: Tailor Script <tailor@pidgin.im>

diff -r 249b040f6a83 -r 8f4ce8b74901 src/dialogs.c
--- a/src/dialogs.c	Mon Nov 27 01:00:09 2000 +0000
+++ b/src/dialogs.c	Mon Nov 27 02:45:07 2000 +0000
@@ -1133,7 +1133,7 @@
         b->window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, FALSE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "new_bp", "Gaim");
-	gtk_widget_show(b->window);
+	gtk_widget_realize(b->window);
         dialogwindows = g_list_prepend(dialogwindows, b->window);
         bbox = gtk_hbox_new(TRUE, 10);
         vbox = gtk_vbox_new(FALSE, 5);
@@ -1232,8 +1232,8 @@
                 gtk_window_set_focus(GTK_WINDOW(b->window), b->nameentry);
         gtk_container_add(GTK_CONTAINER(b->window), vbox);
         gtk_container_border_width(GTK_CONTAINER(b->window), 10);
-        gtk_widget_realize(b->window);
         aol_icon(b->window->window);
+        gtk_widget_show(b->window);
 }
 
 
diff -r 249b040f6a83 -r 8f4ce8b74901 src/idle.c
--- a/src/idle.c	Mon Nov 27 01:00:09 2000 +0000
+++ b/src/idle.c	Mon Nov 27 02:45:07 2000 +0000
@@ -78,13 +78,11 @@
 		a = g_slist_nth_data(away_messages, default_away);
 		do_away_message((GtkWidget*)NULL, a);
 		auto_is_away = 1;
-	} else if (auto_is_away == 1 && awaymessage != NULL &&
-		   idle_time < 60*auto_away) {
-		do_im_back((GtkWidget*)NULL, (GtkWidget*)NULL);
+	} else if (auto_is_away == 1 && idle_time < 60*auto_away) {
 		auto_is_away = 0;
+		if (awaymessage != NULL)
+			do_im_back((GtkWidget*)NULL, (GtkWidget*)NULL);
 	}
-	if (auto_is_away == 1 && awaymessage == NULL)
-		auto_is_away = 0;
 
 
 	/* If we're not reporting idle times to the server, still use Gaim