diff options
| author | tnn <tnn> | 2010-02-01 14:29:43 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2010-02-01 14:29:43 +0000 |
| commit | e21176e07c5aa5d82b28b9de4a87c20675f6d72f (patch) | |
| tree | e6d8f47ea1fe603ab05d63a2e6decbfec704227c /wm | |
| parent | 9378ac4d011fe8cf4fc5e22871c658cc41ec5c85 (diff) | |
| download | pkgsrc-e21176e07c5aa5d82b28b9de4a87c20675f6d72f.tar.gz | |
patch-ab: merge fix for upstream bug 3285.
Closes our PR pkg/42713 (obconf segfaults on startup)
Ride previous bump.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/obconf/distinfo | 3 | ||||
| -rw-r--r-- | wm/obconf/patches/patch-ab | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/wm/obconf/distinfo b/wm/obconf/distinfo index 3e341c2183f..41bfd248e8e 100644 --- a/wm/obconf/distinfo +++ b/wm/obconf/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.6 2010/02/01 14:11:38 tnn Exp $ +$NetBSD: distinfo,v 1.7 2010/02/01 14:29:43 tnn Exp $ SHA1 (obconf-2.0.3/obconf-2.0.3.tar.gz) = 61def2cdfe8691d127d0cec9ab73a66972b83a62 RMD160 (obconf-2.0.3/obconf-2.0.3.tar.gz) = df9c585982fff56ec46b9c15e7af7e116c741db8 Size (obconf-2.0.3/obconf-2.0.3.tar.gz) = 287485 bytes SHA1 (patch-aa) = 0de087b762e8f545fa361f480a0e2e30e0ac40ee +SHA1 (patch-ab) = 40b232498f3f945ef1a2e89563cbc7be2e6636e0 diff --git a/wm/obconf/patches/patch-ab b/wm/obconf/patches/patch-ab new file mode 100644 index 00000000000..92bceac77d5 --- /dev/null +++ b/wm/obconf/patches/patch-ab @@ -0,0 +1,30 @@ +$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; + } |