diff options
| author | Daouda Lo <daouda@mandriva.com> | 2004-05-17 09:43:56 +0000 |
|---|---|---|
| committer | Daouda Lo <daouda@mandriva.com> | 2004-05-17 09:43:56 +0000 |
| commit | d281756371047e8e5120251c776b8b85b20055d6 (patch) | |
| tree | 639a4a0c050db72d7aab907221f558561d067f2e | |
| parent | c6a836787b62284c5e8b27cad0073c3a4bb77403 (diff) | |
| download | mgaonline-d281756371047e8e5120251c776b8b85b20055d6.tar mgaonline-d281756371047e8e5120251c776b8b85b20055d6.tar.gz mgaonline-d281756371047e8e5120251c776b8b85b20055d6.tar.bz2 mgaonline-d281756371047e8e5120251c776b8b85b20055d6.tar.xz mgaonline-d281756371047e8e5120251c776b8b85b20055d6.zip | |
- avoid displaying the applet twice on the panel (using fuzzy_pidofs)
- handle network proxy/routing misconfiguration.
| -rwxr-xr-x | mdkapplet | 9 | ||||
| -rw-r--r-- | mdkonline.spec | 6 |
2 files changed, 12 insertions, 3 deletions
@@ -48,6 +48,10 @@ my $localfile = "$localdir/mdkonline"; mkdir_p($localdir) if !-d $localdir; -e "$ENV{HOME}/.mdkonline" and system("mv", "$ENV{HOME}/.mdkonline", "$localfile"); +#don't launch it twice :) +my @pids = fuzzy_pidofs(qr/\bmdkapplet\b/); +@pids > 1 and die "mdkapplet already running\n"; + my %state = ( okay => { colour => [ 'okay' ], @@ -176,7 +180,7 @@ sub setLabel { gtkflush(); } sub configNetwork { logIt(N("Launching drakconnect\n")); system "/usr/sbin/drakconnect &" } -sub installUpdates { logIt(N("Launching mdkupdate --applet\n")); gtkroot()->set_cursor(Gtk2::Gdk::Cursor->new('watch')); system "/usr/sbin/mdkupdate", "--applet"; silentCheck(); gtkflush; gtkroot()->set_cursor(Gtk2::Gdk::Cursor->new('left-ptr')); } +sub installUpdates { logIt(N("Launching mdkupdate --applet\n")); gtkroot()->set_cursor(Gtk2::Gdk::Cursor->new('watch')); system "/usr/sbin/mdkupdate", "--applet"; silentCheck(); gtkflush(); gtkroot()->set_cursor(Gtk2::Gdk::Cursor->new('left-ptr')); } sub silentCheck { my $link = "http://www.mandrakeonline.net/online3_RemoteAction.php" . '?action=UpdateList'; my %h = getVarsFromSh($conffile); @@ -220,7 +224,8 @@ sub silentCheck { 96 => sub { logIt(N("Unknown state")) ; go2State('okay') }, 97 => sub { logIt(N("Online services disabled. Contact MandrakeOnline site\n")) ; go2State('disabled'); }, 98 => sub { logIt(N("Wrong Password.\n")); go2State('critical'); }, - 99 => sub { logIt(N("Wrong Action or host or login.\n")); go2State('critical'); } + 99 => sub { logIt(N("Wrong Action or host or login.\n")); go2State('critical'); }, + 500 => sub { logIt(N("Something is wrong with your network settings (check your route, firewall or proxy settings)\n")); go2State('critical') } }; $retcode->{$u}->(); } diff --git a/mdkonline.spec b/mdkonline.spec index 53931337..b918c7cd 100644 --- a/mdkonline.spec +++ b/mdkonline.spec @@ -4,7 +4,7 @@ Summary: The MandrakeOnline Tool Name: %{name} Version: %{version} -Release: 6mdk +Release: 7mdk Source0: %{name}-%{version}.tar.bz2 URL: http://www.mandrakeonline.net Packager: Daouda Lo <daouda@mandrakesoft.com> @@ -96,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT # get the source from our cvs repository (see # http://www.linuxmandrake.com/en/cvs.php3) %changelog +* Mon May 17 2004 Daouda LO <daouda@mandrakesoft.com> 1.0-7mdk +- avoid displaying the applet twice on the panel (using fuzzy_pidofs) +- handle network proxy/routing misconfiguration. + * Tue May 11 2004 Daouda LO <daouda@mandrakesoft.com> 1.0-6mdk - use mouse clock cursor when busy with applet busy icon. - decrease debug messages |