From 0134b7fb6d28183db26b884bcdcb94e3fa18ffc8 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 16 Jul 2005 12:31:04 +0000 Subject: [PATCH] 2005-07-16 [colin] 1.9.12cvs69 * src/image_viewer.c Add extra paranoid checks --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/image_viewer.c | 16 ++++++++++------ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 88f22d381..dfe359a51 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-07-16 [colin] 1.9.12cvs69 + + * src/image_viewer.c + Add extra paranoid checks + 2005-07-16 [colin] 1.9.12cvs68 * src/plugins/pgpcore/prefs_gpg.c diff --git a/PATCHSETS b/PATCHSETS index a590cc0e5..c6a522472 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -663,3 +663,4 @@ ( cvs diff -u -r 1.179.2.53 -r 1.179.2.54 src/imap.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/etpan/imap-thread.c; ) > 1.9.12cvs66.patchset ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/sgpgme.c; ) > 1.9.12cvs67.patchset ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/prefs_gpg.c; ) > 1.9.12cvs68.patchset +( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/image_viewer.c; ) > 1.9.12cvs69.patchset diff --git a/configure.ac b/configure.ac index 4fba8b5e9..cd72c8259 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=68 +EXTRA_VERSION=69 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/image_viewer.c b/src/image_viewer.c index 0e4d6ff6d..2c89c45c3 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -179,13 +179,17 @@ static void image_viewer_clear_viewer(MimeViewer *_mimeviewer) if (imageviewer->image != NULL) gtk_pixmap_set(GTK_PIXMAP(imageviewer->image), NULL, NULL); - hadj = gtk_scrolled_window_get_hadjustment - (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin)); - gtk_adjustment_set_value(hadj, 0.0); - vadj = gtk_scrolled_window_get_vadjustment - (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin)); - gtk_adjustment_set_value(vadj, 0.0); + if (imageviewer->scrolledwin) { + hadj = gtk_scrolled_window_get_hadjustment + (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin)); + if (hadj) + gtk_adjustment_set_value(hadj, 0.0); + vadj = gtk_scrolled_window_get_vadjustment + (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin)); + if (vadj) + gtk_adjustment_set_value(vadj, 0.0); + } g_free(imageviewer->file); imageviewer->file = NULL; imageviewer->mimeinfo = NULL; -- 2.25.1