kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix mis-merge

Browse source
This commit is contained in:
tnn 2010-02-01 14:39:20 +00:00
parent 4629b14edb
commit db24d61f70
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wm/obconf/distinfo
View file

@ -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

17
wm/obconf/patches/patch-ab
View file

@ -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);