summaryrefslogtreecommitdiffstats
path: root/mdkapplet
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-12-04 14:43:28 +0000
committerThierry Vignaud <tv@mandriva.org>2007-12-04 14:43:28 +0000
commit334960a7fb3984dc16de347610367db91b330d58 (patch)
tree0bf3866744da10a42d6accf536c0b71c49fcb5fd /mdkapplet
parentcd80963a67c6281138bcc92a0a0784ea1e21b421 (diff)
downloadmgaonline-334960a7fb3984dc16de347610367db91b330d58.tar
mgaonline-334960a7fb3984dc16de347610367db91b330d58.tar.gz
mgaonline-334960a7fb3984dc16de347610367db91b330d58.tar.bz2
mgaonline-334960a7fb3984dc16de347610367db91b330d58.tar.xz
mgaonline-334960a7fb3984dc16de347610367db91b330d58.zip
kill support for dead "noconfig", "configureApplet" and "register" states
Diffstat (limited to 'mdkapplet')
-rwxr-xr-xmdkapplet12
1 files changed, 2 insertions, 10 deletions
diff --git a/mdkapplet b/mdkapplet
index 386a3311..cfbaf0d3 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -123,12 +123,6 @@ my %state = (
menu => [ 'update', 'check', 'weblink' ],
tt => [ N_("New bundles are available for your system") ]
},
- noconfig => {
- colour => [ 'noconf' ],
- changes => [ 'okay' ],
- menu => [ 'weblink', 'register' ],
- tt => [ N_("Service is not configured. Please click on \"Configure the service\"") ]
- },
disconnected => {
colour => [ 'disconnect' ],
changes => [ 'okay', 'busy', 'critical', 'error' ],
@@ -212,11 +206,9 @@ my %comm_codes = (
my %actions = (
'update' => { name => N("Install updates"), launch => sub { installUpdates() } },
- 'configureApplet' => { name => N("Configure the service"), launch => sub { configure() } },
'check' => { name => N("Check Updates"), launch => \&checkUpdates },
'weblink' => { name => N("Online WebSite"), launch => sub { mdkonline::get_site($online_site, 'info.php') } },
'confNetwork' => { name => N("Configure Network"), launch => sub { configNetwork() } },
- 'register' => { name => N("Configure Now!"), launch => sub { configure() } }
);
gtkadd(my $icon = Gtk2::TrayIcon->new("MdkApplet"),
@@ -553,13 +545,13 @@ sub checkConfig() {
} elsif (!isNetwork()) {
logIt(N_("Checking Network: seems disabled\n"));
go2State('disconnected');
- } elsif (member($state_global, qw(disconnected noconfig))) {
+ } elsif (member($state_global, qw(disconnected))) {
silentCheck(); #- state has changed, update
}
}
sub checkUpdates() {
- member($state_global, qw(disconnected noconfig)) or silentCheck();
+ member($state_global, qw(disconnected)) or silentCheck();
}
sub go2State {