diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-07-09 05:25:03 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-07-09 05:25:03 +0800 |
| commit | 895e106519c1b1dac52787e1154aedfcd00b8504 (patch) | |
| tree | e84eadd3fd8f8c2d4c73afc718825fba759ae8fe /devel/gconf2 | |
| parent | dc94cd93821446bea101920d45874e64bac799d1 (diff) | |
| download | marcuscom-ports-895e106519c1b1dac52787e1154aedfcd00b8504.tar marcuscom-ports-895e106519c1b1dac52787e1154aedfcd00b8504.tar.gz marcuscom-ports-895e106519c1b1dac52787e1154aedfcd00b8504.tar.bz2 marcuscom-ports-895e106519c1b1dac52787e1154aedfcd00b8504.tar.lz marcuscom-ports-895e106519c1b1dac52787e1154aedfcd00b8504.tar.xz marcuscom-ports-895e106519c1b1dac52787e1154aedfcd00b8504.tar.zst marcuscom-ports-895e106519c1b1dac52787e1154aedfcd00b8504.zip | |
Correct a bad merge from GConf CVS.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2468 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gconf2')
| -rw-r--r-- | devel/gconf2/files/patch-gconf_gconftool.c | 6 |
1 files 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); |