Mercurial > pidgin
comparison src/gtkconn.c @ 8014:c052eccc10ee
[gaim-migrate @ 8694]
another connection cancelling patch from blino
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Mon, 05 Jan 2004 20:51:37 +0000 |
parents | 4d4438f6ddce |
children | fa6395637e2c |
comparison
equal
deleted
inserted
replaced
8013:03a689c3b3b7 | 8014:c052eccc10ee |
---|---|
50 }; | 50 }; |
51 struct meter_window *meter_win = NULL; | 51 struct meter_window *meter_win = NULL; |
52 | 52 |
53 static void kill_meter(struct signon_meter *meter, const char *text) | 53 static void kill_meter(struct signon_meter *meter, const char *text) |
54 { | 54 { |
55 if(!meter->progress) | |
56 return; | |
57 | |
55 gtk_widget_set_sensitive(meter->button, FALSE); | 58 gtk_widget_set_sensitive(meter->button, FALSE); |
56 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(meter->progress), 1); | 59 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(meter->progress), 1); |
57 gtk_label_set_text(GTK_LABEL(meter->status), text); | 60 gtk_label_set_text(GTK_LABEL(meter->status), text); |
58 meter_win->active_count--; | 61 meter_win->active_count--; |
62 meter->progress = NULL; | |
59 | 63 |
60 if (meter_win->active_count == 0) { | 64 if (meter_win->active_count == 0) { |
61 gtk_widget_destroy(meter_win->window); | 65 gtk_widget_destroy(meter_win->window); |
62 g_free(meter_win); | 66 g_free(meter_win); |
63 meter_win = NULL; | 67 meter_win = NULL; |