Mercurial > pidgin
changeset 2025:1bfef3e8ba63
[gaim-migrate @ 2035]
woo
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Sat, 16 Jun 2001 01:14:43 +0000 |
| parents | b86f639ff99f |
| children | 4bf0163563ca |
| files | src/oscar.c src/prefs.c |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/oscar.c Sat Jun 16 00:30:44 2001 +0000 +++ b/src/oscar.c Sat Jun 16 01:14:43 2001 +0000 @@ -3274,9 +3274,11 @@ if (!h || !ir->data) return; - gtk_container_remove(GTK_CONTAINER(ir->cnv->bbox), ir->pix); - ir->pix = NULL; - ir->cnv = NULL; + if (ir->cnv && ir->pix) { + gtk_container_remove(GTK_CONTAINER(ir->cnv->bbox), ir->pix); + ir->pix = NULL; + ir->cnv = NULL; + } if (ir->anim) { gdk_pixbuf_animation_unref(ir->anim);
--- a/src/prefs.c Sat Jun 16 00:30:44 2001 +0000 +++ b/src/prefs.c Sat Jun 16 01:14:43 2001 +0000 @@ -2202,13 +2202,13 @@ GtkWidget *bbox; GtkWidget *button; + parent = prefdialog->parent; + gtk_widget_destroy(prefdialog); + current_deny_gc = connections->data; /* this is safe because this screen will only be available when there are connections */ current_is_deny = TRUE; - parent = prefdialog->parent; - gtk_widget_destroy(prefdialog); - prefdialog = gtk_frame_new(_("Privacy Options")); gtk_container_add(GTK_CONTAINER(parent), prefdialog);