2005-07-16 [colin] 1.9.12cvs69

	* src/image_viewer.c
		Add extra paranoid checks

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 88f22d38158528a4bf9d469e11b497a0e540fa32..dfe359a51c7b0ea5ea8a712e9fab9a362224f947 100644 (file)
--- 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 a590cc0e5c431d958459a05ee16251c46cdaa05d..c6a5224724bac45a5755e1e4903b1e51a5d5e9b2 100644 (file)
--- 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 4fba8b5e9c44f05e571505abf4c8bd44f9d2f5e7..cd72c82599b59358cd719e315fbb07039458362a 100644 (file)
--- 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 0e4d6ff6dbb64ac8aba2a443c9eae7d0a3476f05..2c89c45c3977e66510e728830e4dc892d22bb989 100644 (file)
--- 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;