head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.4
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.2
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q2:1.2.0.20
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.18
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.16
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.14
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.12
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.10
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.8
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.6
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.4
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.2
	pkgsrc-2010Q1-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2012.07.14.22.25.04;	author dholland;	state dead;
branches;
next	1.2;

1.2
date	2010.02.01.14.39.20;	author tnn;	state Exp;
branches;
next	1.1;

1.1
date	2010.02.01.14.29.43;	author tnn;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove wm/obconf as promised. It hasn't been buildable for years,
because it no longer works with the version of openbox in pkgsrc.

Meanwhile, upstream seems to have decided that they don't need to make
releases any more, so there's no prospect of a new version being
available, only random development version taken directly from their
SCM.

If anyone actually uses this or cares about it, please try to persuade
upstream to cut a release, or even just tar up a snapshot that they
think is stable.

At that point we can reimport the package.
@
text
@$NetBSD: patch-ab,v 1.2 2010/02/01 14:39:20 tnn Exp $

--- src/preview_update.c.orig	2009-12-13 03:26:28.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;
 
@@@@ -120,11 +122,11 @@@@ static gboolean update_theme_preview_ite
 
     gtk_tree_model_get(GTK_TREE_MODEL(ls), &iter, 0, &name, -1);
 
-    gtk_list_store_set(GTK_LIST_STORE(ls), &iter, 1,
-                       preview_theme(name, title_layout, active_window_font,
-                                     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;
 }
@


1.2
log
@fix mis-merge
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@patch-ab: merge fix for upstream bug 3285.
Closes our PR pkg/42713 (obconf segfaults on startup)
Ride previous bump.
@
text
@d3 1
a3 1
--- src/preview_update.c.orig	2010-02-01 14:24:52.000000000 +0000
d19 9
a27 4
@@@@ -125,6 +127,11 @@@@ static gboolean update_theme_preview_ite
                                      inactive_window_font, menu_title_font,
                                      menu_item_font, osd_font),
                        -1);
@