Bug#557732: pornview: diff for NMU version 0.2pre1-9.1

[Tim Retout]

Package: pornview
Version: 0.2pre1-9
Severity: normal
Tags: patch

Dear maintainer,

I've prepared an NMU for pornview (versioned as 0.2pre1-9.1) and hope
to have it uploaded to DELAYED/2 shortly. Please feel free to tell me
if I should delay it longer.

(Copying Martijn: I've prepared a new NMU to fix both RC bugs on
pornview, and also kept the diff to a minimum by not adding a patch
system. Hope that's all right.)

Regards,

-- 
Tim Retout <t...@retout.co.uk>

diff -u pornview-0.2pre1/src/prefs_ui/prefs_win.c pornview-0.2pre1/src/prefs_ui/prefs_win.c
--- pornview-0.2pre1/src/prefs_ui/prefs_win.c
+++ pornview-0.2pre1/src/prefs_ui/prefs_win.c
@@ -320,12 +320,12 @@
     if( gtk_tree_selection_get_selected (selection, &model, &iter) == TRUE ) {
         gtk_tree_model_get (model, &iter,
 			COLUMN_PRIV_DATA, &priv, COLUMN_TERMINATOR);
-	}
 
-    g_return_if_fail (priv);
-    g_return_if_fail (priv->page);
+        g_return_if_fail (priv);
+        g_return_if_fail (priv->page);
 
-    prefs_win_set_page (priv->page->path);
+        prefs_win_set_page (priv->page->path);
+    }
 }
 
 static GtkWidget *
diff -u pornview-0.2pre1/debian/changelog pornview-0.2pre1/debian/changelog
--- pornview-0.2pre1/debian/changelog
+++ pornview-0.2pre1/debian/changelog
@@ -1,3 +1,13 @@
+pornview (0.2pre1-9.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * src/support/widgets/gtkcellrendererpixmap.c: Do not define
+    GTK_DISABLE_DEPRECATED. (Closes: #527714)
+  * src/prefs_ui/prefs_win.c (cb_tree_cursor_changed): Avoid accessing
+    priv->page->path when not initialized. (Closes: #516338)
+
+ -- Tim Retout <t...@retout.co.uk>  Mon, 23 Nov 2009 23:55:33 +0000
+
 pornview (0.2pre1-9) unstable; urgency=low
 
   * Avoid crash if we don't get a valid iterator. (Closes: #485820) 
only in patch2:
unchanged:
--- pornview-0.2pre1.orig/src/support/widgets/gtkcellrendererpixmap.c
+++ pornview-0.2pre1/src/support/widgets/gtkcellrendererpixmap.c
@@ -12,10 +12,6 @@
  *  Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <j...@redhat.com>
  */
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define GTK_DISABLE_DEPRECATED
-#endif /* GTK_DISABLE_DEPRECATED */
-
 #include "gtkcellrendererpixmap.h"
 
 #if (GTK_MAJOR_VERSION >= 2)