From 895e106519c1b1dac52787e1154aedfcd00b8504 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 8 Jul 2004 21:25:03 +0000 Subject: Correct a bad merge from GConf CVS. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2468 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gconf2/files/patch-gconf_gconftool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devel/gconf2/files/patch-gconf_gconftool.c b/devel/gconf2/files/patch-gconf_gconftool.c index c7ea143f7..5e5e9df6b 100644 --- a/devel/gconf2/files/patch-gconf_gconftool.c +++ b/devel/gconf2/files/patch-gconf_gconftool.c @@ -1,5 +1,5 @@ ---- gconf/gconftool.c.orig Thu Jul 8 17:10:37 2004 -+++ gconf/gconftool.c Thu Jul 8 17:15:05 2004 +--- gconftool.c.orig Sun Jul 4 11:15:23 2004 ++++ gconftool.c Thu Jul 8 17:23:03 2004 @@ -460,8 +460,7 @@ static int do_break_key(GConfEngine* conf, const gchar** args); @@ -24,7 +24,7 @@ { const gchar** args = poptGetArgs(ctx); - gint retval = do_makefile_uninstall (conf, args); -+ gint retval = do_makefile_uninstall (conf, args, TRUE); ++ gint retval = do_makefile_install (conf, args, TRUE); gconf_engine_unref (conf); -- cgit v1.2.3