Mercurial > pidgin.yaz
changeset 1141:8f4ce8b74901
[gaim-migrate @ 1151]
bah
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Mon, 27 Nov 2000 02:45:07 +0000 |
| parents | 249b040f6a83 |
| children | 4593153a956c |
| files | src/dialogs.c src/idle.c |
| diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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); }
--- 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