TDE
/
tdeadmin
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeadmin
0
0
Fork 0
Code Issues Releases Wiki Activity

* KDE cron updates

Browse Source 
* KDE networking module platform string updates

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1067153 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 15 years ago
parent 37333bf25a
commit f12b53b8c6
10 changed files with 235 additions and 217 deletions
Show Stats Download Patch File Download Diff File

21
kcron/cttask.cpp
Unescape View File

@ -33,14 +33,11 @@ CTTask::CTTask(string tokStr, string _comment, bool _syscron) :
else else
enabled = true; enabled = true;
//older versions had something called silence. We should still be able to not choke on what we have been
//writing earlier. This has no use though.
if (tokStr.substr(0,1) == "-") if (tokStr.substr(0,1) == "-")
{ {
tokStr = tokStr.substr(1,tokStr.length() - 1); tokStr = tokStr.substr(1,tokStr.length() - 1);
silent = true;
}
else
{
silent = false;
} }
if (tokStr.substr(0,1) == "@") if (tokStr.substr(0,1) == "@")
@ -119,7 +116,6 @@ CTTask::CTTask(string tokStr, string _comment, bool _syscron) :
initialCommand = command; initialCommand = command;
initialComment = comment; initialComment = comment;
initialEnabled = enabled; initialEnabled = enabled;
initialSilent = silent;
} }
CTTask::CTTask(const CTTask &source) : CTTask::CTTask(const CTTask &source) :
@ -132,12 +128,10 @@ CTTask::CTTask(const CTTask &source) :
command(source.command), command(source.command),
comment(source.comment), comment(source.comment),
enabled(source.enabled), enabled(source.enabled),
silent(source.silent),
initialUser(""), initialUser(""),
initialCommand(""), initialCommand(""),
initialComment(""), initialComment(""),
initialEnabled(true), initialEnabled(true)
initialSilent(false)
{ {
} }
@ -152,12 +146,10 @@ void CTTask::operator = (const CTTask& source)
command = source.command; command = source.command;
comment = source.comment; comment = source.comment;
enabled = source.enabled; enabled = source.enabled;
silent = source.silent;
initialUser = ""; initialUser = "";
initialCommand = ""; initialCommand = "";
initialComment = ""; initialComment = "";
initialEnabled = true; initialEnabled = true;
initialSilent = false;
return; return;
} }
@ -169,9 +161,6 @@ ostream& operator << (ostream& outputStream, const CTTask& task)
if (!task.enabled) if (!task.enabled)
outputStream << "#\\"; outputStream << "#\\";
if (task.silent)
outputStream << "-";
outputStream << task.minute << " "; outputStream << task.minute << " ";
outputStream << task.hour << " "; outputStream << task.hour << " ";
outputStream << task.dayOfMonth << " "; outputStream << task.dayOfMonth << " ";
@ -197,7 +186,6 @@ void CTTask::apply()
initialCommand = command; initialCommand = command;
initialComment = comment; initialComment = comment;
initialEnabled = enabled; initialEnabled = enabled;
initialSilent = silent;
} }
void CTTask::cancel() void CTTask::cancel()
@ -211,7 +199,6 @@ void CTTask::cancel()
command = initialCommand; command = initialCommand;
comment = initialComment; comment = initialComment;
enabled = initialEnabled; enabled = initialEnabled;
silent = initialSilent;
} }
bool CTTask::dirty() const bool CTTask::dirty() const
@ -219,7 +206,7 @@ bool CTTask::dirty() const
return (month.dirty() || dayOfMonth.dirty() || dayOfWeek.dirty() || return (month.dirty() || dayOfMonth.dirty() || dayOfWeek.dirty() ||
hour.dirty() || minute.dirty() || (user != initialUser) || hour.dirty() || minute.dirty() || (user != initialUser) ||
(command != initialCommand) || (comment != initialComment) || (command != initialCommand) || (comment != initialComment) ||
(enabled != initialEnabled) || (silent != initialSilent)); (enabled != initialEnabled) );
} }
string CTTask::describe() const string CTTask::describe() const

2
kcron/cttask.h
Unescape View File

@ -90,7 +90,6 @@ public:
string command; string command;
string comment; string comment;
bool enabled; bool enabled;
bool silent;
private: private:
bool syscron; bool syscron;
@ -98,7 +97,6 @@ private:
string initialCommand; string initialCommand;
string initialComment; string initialComment;
bool initialEnabled; bool initialEnabled;
bool initialSilent;
}; };
#endif // CTTASK_H #endif // CTTASK_H

6
kcron/kttask.cpp
Unescape View File

@ -172,11 +172,6 @@ KTTask::KTTask(CTTask* _cttask, const QString & _caption)
chkEnabled->setChecked(cttask->enabled); chkEnabled->setChecked(cttask->enabled);
h3a->addWidget( chkEnabled ); h3a->addWidget( chkEnabled );
// enabled
chkSilent = new QCheckBox(i18n("&Silent"), this, "chkSilent");
chkSilent->setChecked(cttask->silent);
h3a->addWidget( chkSilent );
QHBoxLayout *h4 = new QHBoxLayout( ml, KDialogBase::spacingHint() ); QHBoxLayout *h4 = new QHBoxLayout( ml, KDialogBase::spacingHint() );
ml->addSpacing( 2 * KDialogBase::spacingHint() ); ml->addSpacing( 2 * KDialogBase::spacingHint() );
@ -651,7 +646,6 @@ void KTTask::slotOK()
cttask->comment = (const char *)leComment->text().local8Bit(); cttask->comment = (const char *)leComment->text().local8Bit();
cttask->command = (const char *)leCommand->text().local8Bit(); cttask->command = (const char *)leCommand->text().local8Bit();
cttask->enabled = chkEnabled->isChecked(); cttask->enabled = chkEnabled->isChecked();
cttask->silent = chkSilent->isChecked();
for (int mo = 1; mo <= 12; mo++) for (int mo = 1; mo <= 12; mo++)
{ {

1
kcron/kttask.h
Unescape View File

@ -149,7 +149,6 @@ private:
QPushButton* pbBrowse; QPushButton* pbBrowse;
QCheckBox* chkEnabled; QCheckBox* chkEnabled;
QCheckBox* chkSilent;
QButtonGroup* bgMonth; QButtonGroup* bgMonth;
QCheckBox* cbMonth[13]; QCheckBox* cbMonth[13];

2
knetworkconf/backends/network-conf.in
Unescape View File

@ -70,7 +70,7 @@ $version = "@VERSION@";
"yoper-2.2", "yoper-2.2",
"blackpanther-4.0", "blackpanther-4.0",
"debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", "debian-testing", "debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", "debian-testing",
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-8.10", "ubuntu-9.04", "ubuntu-9.10", "ubuntu-10.04", "ubuntu-10.10",
"suse-7.0", "suse-9.0", "suse-9.1", "suse-7.0", "suse-9.0", "suse-9.1",
"turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
"pld-1.0", "pld-1.1", "pld-1.99", "pld-1.0", "pld-1.1", "pld-1.99",

67
knetworkconf/backends/network.pl.in
Unescape View File

@ -506,6 +506,11 @@ sub gst_network_get_broadcast_ping_cmd
"ubuntu-7.04" => "debian-2.2", "ubuntu-7.04" => "debian-2.2",
"ubuntu-7.10" => "debian-2.2", "ubuntu-7.10" => "debian-2.2",
"ubuntu-8.04" => "debian-2.2", "ubuntu-8.04" => "debian-2.2",
"ubuntu-8.10" => "debian-2.2",
"ubuntu-9.04" => "debian-2.2",
"ubuntu-9.10" => "debian-2.2",
"ubuntu-10.10" => "debian-2.2",
"ubuntu-10.10" => "debian-2.2",
"mandrake-7.1" => "debian-2.2", "mandrake-7.1" => "debian-2.2",
"mandrake-7.2" => "debian-2.2", "mandrake-7.2" => "debian-2.2",
"mandrake-9.0" => "debian-2.2", "mandrake-9.0" => "debian-2.2",
@ -1835,6 +1840,11 @@ sub gst_network_get_file
"ubuntu-7.04" => \&gst_network_deb22_get_file, "ubuntu-7.04" => \&gst_network_deb22_get_file,
"ubuntu-7.10" => \&gst_network_deb22_get_file, "ubuntu-7.10" => \&gst_network_deb22_get_file,
"ubuntu-8.04" => \&gst_network_deb22_get_file, "ubuntu-8.04" => \&gst_network_deb22_get_file,
"ubuntu-8.10" => \&gst_network_deb22_get_file,
"ubuntu-9.04" => \&gst_network_deb22_get_file,
"ubuntu-9.10" => \&gst_network_deb22_get_file,
"ubuntu-10.04" => \&gst_network_deb22_get_file,
"ubuntu-10.10" => \&gst_network_deb22_get_file,
"suse-7.0" => \&gst_network_suse70_get_file, "suse-7.0" => \&gst_network_suse70_get_file,
"suse-9.0" => \&gst_network_deb22_get_file, "suse-9.0" => \&gst_network_deb22_get_file,
"suse-9.1" => \&gst_network_deb22_get_file, "suse-9.1" => \&gst_network_deb22_get_file,
@ -2587,9 +2597,13 @@ sub gst_network_interfaces_set
foreach $i (keys %$values_hash) foreach $i (keys %$values_hash)
{ {
# delete it if it's no longer configured # delete it if it's no longer configured or boot protocol is dhcp,
if (exists $$old_hash{$i}{"configuration"} && # so that network-manager see the card again
not exists $$values_hash{$i}{"configuration"}) if ((exists $$old_hash{$i}{"configuration"} &&
not exists $$values_hash{$i}{"configuration"}) ||
(exists $$values_hash{$i}{"configuration"} &&
$$values_hash{$i}{"configuration"}{"bootproto"} eq "dhcp")
)
{ {
&$set_proc ($$values_hash{$i}, $$old_hash{$i}, 0, 1); &$set_proc ($$values_hash{$i}, $$old_hash{$i}, 0, 1);
&$delete_proc ($$old_hash{$i}); &$delete_proc ($$old_hash{$i});
@ -3965,6 +3979,11 @@ sub gst_network_ensure_loopback_interface
"ubuntu-7.04" => "lo", "ubuntu-7.04" => "lo",
"ubuntu-7.10" => "lo", "ubuntu-7.10" => "lo",
"ubuntu-8.04" => "lo", "ubuntu-8.04" => "lo",
"ubuntu-8.10" => "lo",
"ubuntu-9.04" => "lo",
"ubuntu-9.10" => "lo",
"ubuntu-10.04" => "lo",
"ubuntu-10.10" => "lo",
"suse-7.0" => "", "suse-7.0" => "",
"suse-9.0" => "", "suse-9.0" => "",
"suse-9.1" => "", "suse-9.1" => "",
@ -4056,11 +4075,11 @@ sub gst_network_ensure_loopback_statichost
{ {
my $localhost = $$statichost{$lo_ip}; my $localhost = $$statichost{$lo_ip};
&gst_network_statichost_remove_alias ($localhost, $old_hostname) if ($old_hostname); &gst_network_statichost_remove_alias ($localhost, $old_hostname) if ($old_hostname);
&gst_network_statichost_add_alias ($localhost, $hostname); &gst_network_statichost_remove_alias ($localhost, $hostname);
} }
else else
{ {
$$statichost{$lo_ip} = [ ("localhost", "localhost.localdomain", $hostname) ]; $$statichost{$lo_ip} = [ ("localhost") ];
} }
} }
@ -4068,10 +4087,13 @@ sub get_network_get_lo_ip
{ {
my ($statichost) = @_; my ($statichost) = @_;
foreach $i (keys %$statichost) # Ugly workarround, it is considered you have one lo only, which is wrong, so let's
{ # force the first to be 127.0.0.1 and let the script work for other ones as if they were
return $i if ($i =~ /^127\./); # classic hosts entries... At least sudo won't break...
} # foreach $i (keys %$statichost)
# {
# return $i if ($i =~ /^127\./);
# }
return "127.0.0.1"; return "127.0.0.1";
} }
@ -4140,6 +4162,11 @@ sub gst_network_get_parse_table
"ubuntu-7.04" => "debian-2.2", "ubuntu-7.04" => "debian-2.2",
"ubuntu-7.10" => "debian-2.2", "ubuntu-7.10" => "debian-2.2",
"ubuntu-8.04" => "debian-2.2", "ubuntu-8.04" => "debian-2.2",
"ubuntu-8.10" => "debian-2.2",
"ubuntu-9.04" => "debian-2.2",
"ubuntu-9.10" => "debian-2.2",
"ubuntu-10.04" => "debian-2.2",
"ubuntu-10.10" => "debian-2.2",
"suse-7.0" => "suse-7.0", "suse-7.0" => "suse-7.0",
"suse-9.0" => "suse-9.0", "suse-9.0" => "suse-9.0",
"suse-9.1" => "suse-9.0", "suse-9.1" => "suse-9.0",
@ -4286,7 +4313,6 @@ sub gst_network_get_parse_table
HOST_CONF => "/etc/host.conf", HOST_CONF => "/etc/host.conf",
HOSTS => "/etc/hosts", HOSTS => "/etc/hosts",
HOSTNAME => "/etc/hostname", HOSTNAME => "/etc/hostname",
SMB_CONF => "/etc/samba/smb.conf",
WVDIAL => "/etc/wvdial.conf" WVDIAL => "/etc/wvdial.conf"
}, },
table => table =>
@ -4302,12 +4328,6 @@ sub gst_network_get_parse_table
[ "order", \&gst_parse_split_first_array, HOST_CONF, "order", "[ \t]+", ",[ \t]*" ], [ "order", \&gst_parse_split_first_array, HOST_CONF, "order", "[ \t]+", ",[ \t]*" ],
[ "hostmatch", \&gst_parse_split_first_bool, HOST_CONF, "multi", "[ \t]+" ], [ "hostmatch", \&gst_parse_split_first_bool, HOST_CONF, "multi", "[ \t]+" ],
[ "statichost", \&gst_parse_split_hash, HOSTS, "[ \t]+", "[ \t]+" ], [ "statichost", \&gst_parse_split_hash, HOSTS, "[ \t]+", "[ \t]+" ],
[ "workgroup", \&gst_parse_ini, SMB_CONF, "global", "workgroup" ],
[ "smbdesc", \&gst_parse_ini, SMB_CONF, "global", "server string" ],
[ "winsserver", \&gst_parse_ini, SMB_CONF, "global", "wins server" ],
[ "winsuse", \&gst_parse_ini_bool, SMB_CONF, "global", "wins support" ],
[ "smbuse", \&gst_service_sysv_get_status_any, "smbd", "nmbd" ],
[ "smbinstalled", \&gst_service_sysv_installed, "samba" ],
[ "smartdhcpcd", \&gst_file_tool_installed, "pump" ], [ "smartdhcpcd", \&gst_file_tool_installed, "pump" ],
[ "dialinstalled", \&gst_file_tool_installed, "wvdial" ], [ "dialinstalled", \&gst_file_tool_installed, "wvdial" ],
[ "interface", \&gst_network_interfaces_get ] [ "interface", \&gst_network_interfaces_get ]
@ -4571,6 +4591,11 @@ sub gst_network_get_interface_parse_table
"ubuntu-7.04" => "debian-3.0", "ubuntu-7.04" => "debian-3.0",
"ubuntu-7.10" => "debian-3.0", "ubuntu-7.10" => "debian-3.0",
"ubuntu-8.04" => "debian-3.0", "ubuntu-8.04" => "debian-3.0",
"ubuntu-8.10" => "debian-3.0",
"ubuntu-9.04" => "debian-3.0",
"ubuntu-9.10" => "debian-3.0",
"ubuntu-10.04" => "debian-3.0",
"ubuntu-10.10" => "debian-3.0",
"suse-7.0" => "suse-7.0", "suse-7.0" => "suse-7.0",
"suse-9.0" => "suse-9.0", "suse-9.0" => "suse-9.0",
"suse-9.1" => "suse-9.0", "suse-9.1" => "suse-9.0",
@ -5419,6 +5444,11 @@ sub gst_network_get_replace_table
"ubuntu-7.04" => "debian-2.2", "ubuntu-7.04" => "debian-2.2",
"ubuntu-7.10" => "debian-2.2", "ubuntu-7.10" => "debian-2.2",
"ubuntu-8.04" => "debian-2.2", "ubuntu-8.04" => "debian-2.2",
"ubuntu-8.10" => "debian-2.2",
"ubuntu-9.04" => "debian-2.2",
"ubuntu-9.10" => "debian-2.2",
"ubuntu-10.04" => "debian-2.2",
"ubuntu-10.10" => "debian-2.2",
"suse-7.0" => "suse-7.0", "suse-7.0" => "suse-7.0",
"suse-9.0" => "suse-9.0", "suse-9.0" => "suse-9.0",
"suse-9.1" => "suse-9.0", "suse-9.1" => "suse-9.0",
@ -5835,6 +5865,11 @@ sub gst_network_get_interface_replace_table
"ubuntu-7.04" => "debian-3.0", "ubuntu-7.04" => "debian-3.0",
"ubuntu-7.10" => "debian-3.0", "ubuntu-7.10" => "debian-3.0",
"ubuntu-8.04" => "debian-3.0", "ubuntu-8.04" => "debian-3.0",
"ubuntu-8.10" => "debian-3.0",
"ubuntu-9.04" => "debian-3.0",
"ubuntu-9.10" => "debian-3.0",
"ubuntu-10.04" => "debian-3.0",
"ubuntu-10.10" => "debian-3.0",
"suse-7.0" => "suse-7.0", "suse-7.0" => "suse-7.0",
"suse-9.0" => "suse-9.0", "suse-9.0" => "suse-9.0",
"suse-9.1" => "suse-9.0", "suse-9.1" => "suse-9.0",

5
knetworkconf/backends/platform.pl.in
Unescape View File

@ -51,6 +51,11 @@ $PLATFORM_INFO = {
"ubuntu-7.04" => "Kubuntu 7.04, Feisty Fawn", "ubuntu-7.04" => "Kubuntu 7.04, Feisty Fawn",
"ubuntu-7.10" => "Kubuntu 7.10, Gutsy Gibbon", "ubuntu-7.10" => "Kubuntu 7.10, Gutsy Gibbon",
"ubuntu-8.04" => "Kubuntu 8.04, Hardy Heron", "ubuntu-8.04" => "Kubuntu 8.04, Hardy Heron",
"ubuntu-8.10" => "Kubuntu 8.10, Intrepid Ibex",
"ubuntu-9.04" => "Kubuntu 9.04, Jaunty Jackalope",
"ubuntu-9.10" => "Kubuntu 9.10, Karmic Koala",
"ubuntu-10.04" => "Kubuntu 10.04, Lucid Lynx",
"ubuntu-10.10" => "Kubuntu 10.10, Unknown Yet",
"redhat-5.2" => "Red Hat Linux 5.2 Apollo", "redhat-5.2" => "Red Hat Linux 5.2 Apollo",
"redhat-6.0" => "Red Hat Linux 6.0 Hedwig", "redhat-6.0" => "Red Hat Linux 6.0 Hedwig",
"redhat-6.1" => "Red Hat Linux 6.1 Cartman", "redhat-6.1" => "Red Hat Linux 6.1 Cartman",

2
knetworkconf/backends/replace.pl.in
Unescape View File

@ -1000,7 +1000,7 @@ sub gst_replace_interfaces_line_is_stanza
{ {
my ($line) = @_; my ($line) = @_;
return 1 if $line =~ /^(iface|auto|mapping)[ \t]+[^ \t]/; return 1 if $line =~ /^(iface|auto|mapping|allow-\w+)[ \t]+[^ \t]/;
return 0; return 0;
} }

4
knetworkconf/knetworkconf/knetworkconfdlg.ui
Unescape View File

@ -893,10 +893,10 @@
<data format="PNG" length="1108">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000041b49444154388d9d956148a3751cc7bff3ecb6bb149e8186c2f56290912b38f6908417058b043d7b9504a5f522f5459d16c8cda2d45e9441748b38721dd2f6227208ea2c74d338ce5d4c9ca0ee913aa671ca1ed263cfdcd69ee76ae9d2e9b717534f421df58387df9b872f9fe7fbf93fcf039238ee0280beeb7d4f930c31c20cc9cc897b8d19925ba160c8cf9bac008063430f82e9e6abd1682a4537f9c9508424e9f4a7723b90dbd7c622a49b748e454832d6f541574ddee011f7482349f572cf0c4373e4cbd7c954946c7693a938d9d84f867f21ab3b43dcbc4b72891bf4b316000a70ca34d435405e57b095be84d641096a1a78fd3b195a727f6b40eba0042d2da27550022a01dba40d79833db73c303d5a0e4df341794a849694d0556d829204b6aa4c509212baaa4428eb3ef43e27429a9760afb3e70f6ea86d80b2aec260a847e6471f544d44eb60109934101b0e22a389681df603d97ab44ffa215689e89eec7e10708afd6d920cdf656e72fe3830116238405a3ac9ca51b2ec952946032483ffeab8ada4ed3145514d9885be7758d6c304bdebb6aa87090fb9a655982b00fbb80ccc02ae71194d75223e9d0da2bc0410e625184b5e806d5a02aa1f74fcffecef3f4178892499a5c42cc9dda989a90827f83c00e800802936ca69c5d1f265b9a041825022e25ca10c83c1844c5606b226a89a044d13612993e0fe48846fd287faba7afac67df17aa57ec6917528aaa62e2fce2f0e8dfe309ac8110fe5882d6f7a59e6222d1d21ce04c8ea1ed21a202d9d217a4749e1252f237e32248573c839f2add05cc8cb3956595fb4ea49ea0e3bfecff62d6604a783400520cbf219b14a34768f779fadaca8dcd6e9743cecd83be66d24a95a3b66e81d222d1d39526b4f98a1e3edef718daad3e5f473895f5d7de76a4db8365c7cf4a8e63ade6493a2a97deddf1805392da15c106128926128cc759cc91ce9f88204f78762d6feb9fdd7584cfb58281196ba2fd8b67aef39fe3414b6253bdf3f423ce01eb84c728d71ee92cc32cadda3e776dffe1e25ee91e4d4cda93d6e727be0db9175a6287927a61628f1b3c6d79acf1d649e0100cb458b968827ee9b9f30ffe619f3fc6e7ec65c2e2fcb7a6385114b7796607eb2949eef3d7f9bef98e3f619fb8e1255fef207fcc9f67b6f6dd87eb2adc6e289a4cbdbbfa22592f32b9195ec213183d4455d51bdb3df692539cd78ee8d639c79ed9ff4752c0000dd251ddd9a7ba7a5a805d2a2a4472974caba029402b22ce7b79f6faebc7da598126b9cfdce3ec6394d3feff30f6e9c66ff2462ddc10dd7be7016d8d0f288bbcc73be29d6506ccf3a9eb5bdd7d6eef8da959057e5be93ec1ffc144e1cfaf9709fc37983e482778c3f739b89b014de219939cd7e5ee2c6379a0d82607cd72808177bd17db6b7b0f77183c1701e59c0a6d952b6ac2d622812f6e4d5e5052da1dd98b83591398df81f24eff65ce00de8ce0000000049454e44ae426082</data> <data format="PNG" length="1108">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000041b49444154388d9d956148a3751cc7bff3ecb6bb149e8186c2f56290912b38f6908417058b043d7b9504a5f522f5459d16c8cda2d45e9441748b38721dd2f6227208ea2c74d338ce5d4c9ca0ee913aa671ca1ed263cfdcd69ee76ae9d2e9b717534f421df58387df9b872f9fe7fbf93fcf039238ee0280beeb7d4f930c31c20cc9cc897b8d19925ba160c8cf9bac008063430f82e9e6abd1682a4537f9c9508424e9f4a7723b90dbd7c622a49b748e454832d6f541574ddee011f7482349f572cf0c4373e4cbd7c954946c7693a938d9d84f867f21ab3b43dcbc4b72891bf4b316000a70ca34d435405e57b095be84d641096a1a78fd3b195a727f6b40eba0042d2da27550022a01dba40d79833db73c303d5a0e4df341794a849694d0556d829204b6aa4c509212baaa4428eb3ef43e27429a9760afb3e70f6ea86d80b2aec260a847e6471f544d44eb60109934101b0e22a389681df603d97ab44ffa215689e89eec7e10708afd6d920cdf656e72fe3830116238405a3ac9ca51b2ec952946032483ffeab8ada4ed3145514d9885be7758d6c304bdebb6aa87090fb9a655982b00fbb80ccc02ae71194d75223e9d0da2bc0410e625184b5e806d5a02aa1f74fcffecef3f4178892499a5c42cc9dda989a90827f83c00e800802936ca69c5d1f265b9a041825022e25ca10c83c1844c5606b226a89a044d13612993e0fe48846fd287faba7afac67df17aa57ec6917528aaa62e2fce2f0e8dfe309ac8110fe5882d6f7a59e6222d1d21ce04c8ea1ed21a202d9d217a4749e1252f237e32248573c839f2add05cc8cb3956595fb4ea49ea0e3bfecff62d6604a783400520cbf219b14a34768f779fadaca8dcd6e9743cecd83be66d24a95a3b66e81d222d1d39526b4f98a1e3edef718daad3e5f473895f5d7de76a4db8365c7cf4a8e63ade6493a2a97deddf1805392da15c106128926128cc759cc91ce9f88204f78762d6feb9fdd7584cfb58281196ba2fd8b67aef39fe3414b6253bdf3f423ce01eb84c728d71ee92cc32cadda3e776dffe1e25ee91e4d4cda93d6e727be0db9175a6287927a61628f1b3c6d79acf1d649e0100cb458b968827ee9b9f30ffe619f3fc6e7ec65c2e2fcb7a6385114b7796607eb2949eef3d7f9bef98e3f619fb8e1255fef207fcc9f67b6f6dd87eb2adc6e289a4cbdbbfa22592f32b9195ec213183d4455d51bdb3df692539cd78ee8d639c79ed9ff4752c0000dd251ddd9a7ba7a5a805d2a2a4472974caba029402b22ce7b79f6faebc7da598126b9cfdce3ec6394d3feff30f6e9c66ff2462ddc10dd7be7016d8d0f288bbcc73be29d6506ccf3a9eb5bdd7d6eef8da959057e5be93ec1ffc144e1cfaf9709fc37983e482778c3f739b89b014de219939cd7e5ee2c6379a0d82607cd72808177bd17db6b7b0f77183c1701e59c0a6d952b6ac2d622812f6e4d5e5052da1dd98b83591398df81f24eff65ce00de8ce0000000049454e44ae426082</data>
</image> </image>
<image name="image1"> <image name="image1">
<data format="PNG" length="989">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003a449444154388d759541485c5714863fed13e6818579904266d185d0453320e5cd6e062cb5e0c2580b66c8a2912e7498c2d8a690362d485da5d2459a2e52e8a2c5879bd82c125d8cc68245179679598d168bcf454b84363812429e94c1199a81bf8b3b4ee68de66cfe7bee39f7dcff9e7bef394842be9044c92fd1aebb855d955725b720b9ab925b281b3d2fb945a9d3bf5def2af92532e90cfe433f82a9a940900402a2b805a40c3652b8e4f07ef2ba3ad79fdac930db55794d4a7f213d0ba4294f92a4b95549ff4a57be931ef9cd93142537bf2e15a576e6ada025bf845b3041ddabd2e4ed6792a4477f1f4b928e0db4707de758f2a4f4b547720b523abfaec9fc642b3da798ee6e4a5f2f99c57ad244b387ee6f46751d18b8386dee20ddc6bc95e3d45420ac24970642662e3b04ffd448be6eb7b0533aed99cff6a957fb70c9190773fb6595d7a4c9db86413968323ac1ff74b634eda51d733af7aa942e4a93f949bd527cf2be20c5dae37d8a330e1bdb21997e9b8ded90be7e9bda73e8e93945d8c86bb0b11df2f65b36de66853f0f5fa5fabb4f57e3084edee9c18e7467ad23972f63da21577e30af273d2d958bd2e0c41d75b985b22085fb6688f7a983f74b85dc70825a0decd3a93d25b5e760f740e606d080fad32de28d14dd8ca680006fcce1d63dc8bd93808ea08bbf45832db4e976334deb13cd89d114b04837cb5b4092f17b21d743b87eb7026d41677eaeb1fa4734f0fe008cdc8cce8ddc6d0e9603204bf7dc680a80ca9043b60a5fa513646f42b807ef7e03b97e9bc36ac7f997211c32c70fb60dd6878c696e38092cd0e5e6cbc24a41bc46bcf7eca4da163cf8323a97b9f1621cb30c1e5581688eb7981bb2b12d581823828c9ede6876d9d86316c4dafca99b1c3bcc989ff7c97c46c40212e793c47b6b9824bfc09865e34d45838f7f1ff53baa86541e3bc4ea8b5cb056e9cea433e61b0e27a91d052c5cb649f4c2c207516c17efd7a83d1e83da80030d1f7f2c0bd0562b3ef2859521712ee0c11b4966ad0a90002acc90c0734272c30e8b0f43b2fb0eb3187bbd5161fbaf0495439f7823439fd5562b4a7e0915a5747e45eeaa74717a573a90be5d32bfef65f8f98fd2812fb9f9920e964c8d50b3b3443a8837ef698f4bd41921d6bb45e25c8a0be7f7897fd887bd12f2f17b0eb7562a1c8509f60e032a4f93d4ab51a6b9895c57ab83447a56b33aa58b8649b9686ac9e08634782ddaf3d213f775e2af8e1e7866cff3e63d011c36faa8d107d638b008648105688ce33043dcaab42ef484e9499cff01b1f34611a3ab60c70000000049454e44ae426082</data> <data format="PNG" length="1263">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000004b649444154388d85954d6c1b4514c77f33bbb3b6d7b1e37c3504a81b407c9642e500559140080455698b10208400712b6a6fdce0c605a917aea887455c1122820387228a10a204041457e907a5a54de9874862278ed75fbbf6eece70709b1268cb93e630336f7ef39f376fde086e60a5bdb30acc18e8098c71c10026c0e805a51b959fbca77bd75b2b6e00dd0abc0c66338222426501d0dd0e26b908cc0a1d4f97cc47339ee725ff0b2eed9dbd03c45b58ead581ac5bb869342fc747d2dc3dda24a312ced606f8b3a259aa5675cd0f021d0733cab4de7bc07cfca3e779f135c1a5bdb31b40ecc7c96fdf7c7b86671fceb169bd615d4161c9beab01569a31730b1107ca21878eadd00b1a2753baf6f6fd66fac015b8f52fa51f0ce4f3db9edb3a28de7822c39d131629651125f0ed519fb3f32167e74326c7d38ce66d366d508c0f29ce55cc6823140f2d9bdbcadba73297cae5b259054f3cbc671f4eee951d8f14c4ae2985a324bdd8d08d0cbffed1e2f94747b87f32cb3deb337c55ae3398b531c670f3b022e72af1dba56424ec197533470e4e4d4d45565fedaf5b8595daf7e01df9f4f692424ae8459a30d29cf92b60d796611c25fbb11382fb36b87c7bd4277579f3e10149bb6773a11a4d5693f5b3e39c3c6795f61c56c05bb95ceef1a73667c5d0007423431819aa7ec4ce2dc3a41df99facb9ebd60c3f9f6a22108491c6b17acc2d6aa71dc69115fb876c600cd89ccf0fca423aa6d1bea20c763c32744d28806d095e7a6c94e9434b7c71748046e0d264406aea1b1ba25894c0044216477382a0a7a9b76284806d530532a9fe1544b15e038d13833106809d5b46d8f5408be54e0aec2c086b02cb294ac045a6b2ae8aa8b7358d8ee69952819c6b03506b447c3e535b039e9e69529eeba76cdae92bbf7d5d3ffec85446406ef59c8d50b1e84b2a0dc9f7273a00b402cdfb5f7439703cbd063cb792e7ddcf1433a7fafdaf8fc3827ff55108b4b4c104e86e67b19da19da4c1c099efe0c3ef029a3d076332d78cb31fc03b9f5ced0b01020349180a13776d8c5e002efa1d7d5b22326b161be40daac955b32d90402be882492a52b717a4d28d0a304bb7a6956570fed1525602c670f99ed698b234ae4a705542da4e70ec04d15bd636e1e982393f6fffe43ddd9b7af3c7e9a4ebbfae92ccd050ce5923521b701d01e456c746dd80f5f968d5af5f3f7ae870a59d49160f0e5a4b350950321fcde838f8b459af32e874187303c6b201636ec0783660d40d5869f52b63d0d3d8745997bdea33e87468d6abe89effcdddf2eb1f80a605502e97cdada5d7e6ba11f76a9d6cb865c4126e4a9052869432d8d270bed2a515688e9e0b383b1ff6e76c8320e2f485865eaef987479213fb0be2af13ab60801d25b5bc6c8a87fdc0ded8e8c4933957319cb37194c4b105bdd8305f8ba8b7131c5ba02c58f2238ecdf92c541b87c7e223fb8ab2fc0bb0e4795eb20a2e97cb66fb945b5b369347fcc072ab7e34d9ecc44eda8e453663634b8914604cc2f24a9be37f76f4ef179aad7abdf1e5487262ff6568c5f3bc08ae914cbb77ef9640f6182f3e19cb8117346aa394622297b13200cd200975a22b36e1e974b278f0724c1781fa757f907fc005e05492c94243148b584e51404ea0a5307157eaf642c19c9f1fb4966a4013083ccf5b5350fe06921b426409a129130000000049454e44ae426082</data>
</image> </image>
<image name="image2"> <image name="image2">
<data format="PNG" length="1020">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003c349444154388d75954d481c6718c77fca1e1cf0b00316b2d01e8404e242a133b75928d4d01c4c2bd4480e4de821bb6c41f30121ed21d45e9adc620f1642697190827b091acad66e20a91e5276bc74152cbb425a0cd8b22325b812c45dcac2bf87776775347d2eff79bf9ef9bdcffbbecf832414084994833247dbce44559592e44c484e4972262aa69d979ca2747cfed1764f392893f13204ab414cddc99a200dd488eb1ae01a6dbb38e4f0bff77b8eaf3ff127435655e589e47d2eedd6a4495f92a4d992a457d2e5afa5ada0b393a2e4e497a5a27494bcebb41c9471268c53e786949dd995246d6d1f48920e8c747579e340f225efd6969c09c9cb2f2b9bcf76c37382b4fa4cbafbc82cd63f715d0a8ef5d78d5cb863cec03b42de258e48ef3e34a4d50e69a4bbaf8c93adfac16bc7bd5b5b72f252369f55369f8d4ebfa2ca13293b6316576a1da2483b6491559ec7c7cb1b6617ce0dc92b1ae7bdeee49ac0e5fad317f8376165bd813b64944853c4cc3d131fcfbc0dfe6f21c97e68fd14b0d31e84e89ed637a4f9278660e1595cf55c315be8c47a7e45d2bfd2e507e6f67877a44a511abe3aaf1e67a2227071ce36f06fdaf88f4372efa798feb1011fd9d8bf84e4468e2103fee390f0bd14ebdf3609f72dd3d986d6cb35926d97ee6dd0b674ffa1a457d2ec4a87e899a40369792d4efcc50f92b6256d98f6c519a9ba26795f9adb319c5f38241e3adda0d06f33fd4683cfc6ec2ed9e26a9371cf8ad18e7f03b7472073e6b02ff355445c23d94ed33b3bea02109eb719df876befd8f0c711279e057fc5c3b0381a77fae029306abe6747d240811e275f110917924d92fd86cc4ac0ed5138377422b4276cfa3194d6cdf7de3ed089712fa326a1cc9eb7b012501833939c0431f2d7d983a7507a93c3752d60d4c566ca64b7eb7319d15723752a4db2bf09584093649f456ed8dcdbe356f8b5c9caef16adb699bfb7df20fcdba6afb5c850a2446fc6cbe090839134cdbd1a854b16a97e287c6c76e00e7032c6ab70e5ac85dd67e625fba0f9ae0ded80606c1ce0301fbb9f062291213550e3e7d369ee2542cc930b99ba94a2b6d324fd96c5ca7a93739b16f730e3ad76c8fa9f29c29d80643bc3602267feae281f17252fbf24a7245db85395ead2fd47e665fd9fdefe4eaa0792932fabfec8e408752a4bac82f873be36b9488b0fe8eb5f2335e03274ea05c94f06b1961a5cfbd0667a2964af916273a746f8324d6b3f4e9abb9aebe9569058cdea6427af68482a45934b8657a4e15bf19ae75d5d50345fc76ae06b6b9e3fe70b60a73d489341485c01168171a000ed2bd84c914c84dd038d48233fff01da21be2465fed86a0000000049454e44ae426082</data> <data format="PNG" length="1307">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000004e249444154388d7d95cb8f54c71587bfaa7bebf6fbc134031910ed314f29c0003d42161bcb8ae507360bdbb1bcf0228a8488c22e59c4fe0312894d36368abc18291252a444082b96220b145b4a64cb181b3c68cccb1e07ccf09a999e999ee9db7dfbdeee7bab2a8b060f0d89cfae54a7bef3ab737ed211fc48d48e4e29b0c36046b0360b16b021d6cc29e3d7c738d99b9898f89f6fc58f400f006f80dd8ba08a5039004cb783d5b7812961925335fbe7cf00fd6881c7c0b5a3535b40fc0647bd99cf65cb3f595b94eb2b6976ac6d91519aeb8d3c37eb86c58505d36886a149c2cf946dff61ccfef573207950c07d04fa0488e378c5837b376778697f81dd9b2cebca0e8e5c03f49bb1dc4ab831b74e9e9e8c729f5e5a7ebe178a4d97cdeb6fefb2a74e03c980e2fb4a8fe78bc5175edc5f92876a1e43050721047162b831dba51d6ad60f2936563c84100491e6ecb50e7ffb77c3d69756bef374e3f06ede3f0b988714dbdfe1150e3e572bf1f23e857205add000102786bd5b73acc9bbdc988df03b1a210460d9bf2d439c0c89131f9bed9d96fe159629a0edf4d57e754038a9637bb614d3076b0a29a1171ba2d8d08d0de5bccb868a07c09a82cbad7a97a86b88624b2fb10ce52541cfe5d6423cbaa0374dade7daf76eedd71714d6be91cfa58bb52d1eda189a811d18682eed0c9c9b8126d1ab39da58768c68bebe9e2a3496f2afd5e3d1732e300cec2d164bb29c4ef003f998f5d6e407668cdfd1c489416bcb9d86e6d25c193fccd2222f0d2b3b7d51adbac0084256d7160461cf10f60c9d9e248a052965c979864e590f2a6e2744b1a11148a6eee6b8e3a7fb17ae0bc219c1f1aa12c82253b9ac8a59090c8bbea554c8f0fc788975435956028893c1d64ccf3b7c7133cb819f96f9eda12c1bfa4eec0f54a632020a3ffcdb8f14f34d492aa5f8e5b305f66df678f3e93ca31b4b4c2fa407c0d79b150e3f57e4995d1e4f6d7378f71720c4aa770546ba60434cb7331f6408749a7a24f87cda70607bbfe62b4f65b87677b0e76f1d82dae8eaf9d4977d3058d051246cd295583387d5b79b1d43b39be69e9fe2f77f877f5ded3f520e8c5507c10fa0610ffef8217c700194845eaf0b56d7a509e6a4327e1d98a2db30cab1788e052c7ffaa7e6dc77e651830cc4894f0c1f7dad518ec67335a2b7645ca2e9b29d99755e1a4feb39f60416fb6a29e7662a79435ec57832e6caed1eeb8b828d95411f7763cbc9b3119f5e8dc8ab989c8ae94501ade58576269e796fa37379ca999c9ce4504ddeb9c7d893c226e3d56197622a21e7257822e1dbbb5d360c390c9756bdfc8f2f7dce7f1b9055093995e08a98dbb34b7483e533bbc5072780fa836ced98ce3bad96d83a738f67c636e7a5a75641a7cf3711c0868ae2fc74c0d5990ec54c7f56bd3861fa56dbb4fde6571573ed2f48e681d001989c9ce4e59a5a5ab2d50bcdd0dde97792d14256315470f1944408f8cfbd2e17af77985f49508e4039b0d88cb974a3c9dc827f6138b978ac2a27cf038b80fea179e3e3e3761ddf3496ece8c566e864179af168ab9378693711b98c8b2b255280b59aa5e580cb373be69b5badf6ca8a7fa6a2afbc771f5a07e2898989c737c89123472490bbc4cf7f96c8fc6b06b5534a3152c838198056a823a34ddd259a4eebf98f76c88fcf02f3c00aff6f83dc0f03b477f3fe997a3c7ace17d52a8e57156d0a0223cb36e94a13cc95edcc6cc9596c002d2004ccc37befbfd9ff4e6a193004b40000000049454e44ae426082</data>
</image> </image>
</images> </images>
<connections> <connections>

2
kpackage/options.cpp
Unescape View File

@ -419,7 +419,7 @@ void Opts::readSettings(const QString &initHost)
if (useSSH) { if (useSSH) {
privCmd = SSHcmd; privCmd = SSHcmd;
} else { } else {
privCmd = SUcmd; privCmd = SUDOcmd;
} }
} }
VerifyFL = config->readNumEntry("Verify_File_List",1); VerifyFL = config->readNumEntry("Verify_File_List",1);

Write Preview
Loading…
Cancel
Save