diff options
| author | tnn <tnn@pkgsrc.org> | 2010-02-01 14:39:20 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2010-02-01 14:39:20 +0000 |
| commit | db24d61f70b8ab0c90c8a562b0afdfa98d442148 (patch) | |
| tree | b5326e34c5def94119e8f5be54b9c98b32cf502b /wm | |
| parent | 4629b14edbbf6b4ad36b5a7ec96aaae3db584d34 (diff) | |
| download | pkgsrc-db24d61f70b8ab0c90c8a562b0afdfa98d442148.tar.gz | |
fix mis-merge
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/obconf/distinfo | 4 | ||||
| -rw-r--r-- | wm/obconf/patches/patch-ab | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/wm/obconf/distinfo b/wm/obconf/distinfo index 41bfd248e8e..eaa5f787043 100644 --- a/wm/obconf/distinfo +++ b/wm/obconf/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2010/02/01 14:29:43 tnn Exp $ +$NetBSD: distinfo,v 1.8 2010/02/01 14:39:20 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 +SHA1 (patch-ab) = cf618bda78bbf1a926a734250092f5bfa75cd178 diff --git a/wm/obconf/patches/patch-ab b/wm/obconf/patches/patch-ab index 92bceac77d5..b4698cbb60b 100644 --- a/wm/obconf/patches/patch-ab +++ b/wm/obconf/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1 2010/02/01 14:29:43 tnn Exp $ +$NetBSD: patch-ab,v 1.2 2010/02/01 14:39:20 tnn Exp $ ---- src/preview_update.c.orig 2010-02-01 14:24:52.000000000 +0000 +--- 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" @@ -16,10 +16,15 @@ $NetBSD: patch-ab,v 1.1 2010/02/01 14:29:43 tnn Exp $ 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); +@@ -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); |