diff options
author | Olivier Blin <oblin@mandriva.org> | 2005-02-07 11:11:52 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.org> | 2005-02-07 11:11:52 +0000 |
commit | 112102e7de20f5c01dc9b8f2cebf8f23dfff6304 (patch) | |
tree | 85338b13149920447433167c6021e8cbb74dab06 | |
parent | 792fbcbd41bff962b7e4db4478f067ce6663bab9 (diff) | |
download | drakx-backup-do-not-use-112102e7de20f5c01dc9b8f2cebf8f23dfff6304.tar drakx-backup-do-not-use-112102e7de20f5c01dc9b8f2cebf8f23dfff6304.tar.gz drakx-backup-do-not-use-112102e7de20f5c01dc9b8f2cebf8f23dfff6304.tar.bz2 drakx-backup-do-not-use-112102e7de20f5c01dc9b8f2cebf8f23dfff6304.tar.xz drakx-backup-do-not-use-112102e7de20f5c01dc9b8f2cebf8f23dfff6304.zip |
do not require perl-Gnome2-Gconf in drakxtools, but use gconftool-2
-rw-r--r-- | perl-install/network/network.pm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 411b5030b..996b6691c 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -347,13 +347,11 @@ xml:readonly:$defaults_dir )); -d $p_defaults_dir or mkdir $p_defaults_dir, 0755; - require Gnome2::GConf; - my $gconf = Gnome2::GConf::Client->get_source("xml::$p_defaults_dir", 1); my $use_alternate_proxy; - my $gconf_set = sub { my ($key, $type, $value) = @_; - $gconf->set($key, { type => $type, value => $value }); + #- gconftool-2 is available since /etc/gconf/2/ exists + system("gconftool-2", "--config-source=xml::$p_defaults_dir", "--direct", "--set", "--type=$type", $key, $value); }; #- http proxy @@ -391,9 +389,6 @@ xml:readonly:$defaults_dir #- set proxy mode to manual if either https or ftp is used $gconf_set->("/system/proxy/mode", "string", $use_alternate_proxy ? "manual" : "none"); - #- apply settings in local file - $gconf->suggest_sync; - #- make gconf daemons reload their settings system("killall -s HUP gconfd-2"); } |