Mon Feb 1 14:29:43 2010 UTC ()
patch-ab: merge fix for upstream bug 3285.
Closes our PR pkg/42713 (obconf segfaults on startup)
Ride previous bump.


(tnn)
diff -r1.6 -r1.7 pkgsrc/wm/obconf/distinfo
diff -r0 -r1.1 pkgsrc/wm/obconf/patches/patch-ab
cvs diff -r1.6 -r1.7 pkgsrc/wm/obconf/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/obconf/distinfo 2010/02/01 14:11:38 1.6
+++ pkgsrc/wm/obconf/distinfo 2010/02/01 14:29:43 1.7
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.6 2010/02/01 14:11:38 tnn Exp $ 1$NetBSD: distinfo,v 1.7 2010/02/01 14:29:43 tnn Exp $
2 2
3SHA1 (obconf-2.0.3/obconf-2.0.3.tar.gz) = 61def2cdfe8691d127d0cec9ab73a66972b83a62 3SHA1 (obconf-2.0.3/obconf-2.0.3.tar.gz) = 61def2cdfe8691d127d0cec9ab73a66972b83a62
4RMD160 (obconf-2.0.3/obconf-2.0.3.tar.gz) = df9c585982fff56ec46b9c15e7af7e116c741db8 4RMD160 (obconf-2.0.3/obconf-2.0.3.tar.gz) = df9c585982fff56ec46b9c15e7af7e116c741db8
5Size (obconf-2.0.3/obconf-2.0.3.tar.gz) = 287485 bytes 5Size (obconf-2.0.3/obconf-2.0.3.tar.gz) = 287485 bytes
6SHA1 (patch-aa) = 0de087b762e8f545fa361f480a0e2e30e0ac40ee 6SHA1 (patch-aa) = 0de087b762e8f545fa361f480a0e2e30e0ac40ee
 7SHA1 (patch-ab) = 40b232498f3f945ef1a2e89563cbc7be2e6636e0
File Added: pkgsrc/wm/obconf/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.1 2010/02/01 14:29:43 tnn Exp $

--- src/preview_update.c.orig	2010-02-01 14:24:52.000000000 +0000
+++ src/preview_update.c
@@ -1,4 +1,5 @@
 #include "preview_update.h"
+#include "preview.h"
 #include "main.h"
 
 static gboolean restart_theme_preview_update = TRUE;
@@ -87,6 +88,7 @@ void preview_update_set_title_layout(con
 static gboolean update_theme_preview_iterate(gpointer data)
 {
     GtkListStore *ls = data;
+    GdkPixbuf *preview;
     static GtkTreeIter iter;
     gchar *name;
 
@@ -125,6 +127,11 @@ static gboolean update_theme_preview_ite
                                      inactive_window_font, menu_title_font,
                                      menu_item_font, osd_font),
                        -1);
+    preview = preview_theme(name, title_layout, active_window_font,
+                            inactive_window_font, menu_title_font,
+                            menu_item_font, osd_font);
+    if (preview)
+        gtk_list_store_set(GTK_LIST_STORE(ls), &iter, 1, preview, -1);
 
     return TRUE;
 }