From 2aab9a846f35629b11c666fc274e478a954bb41c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 17 Mar 2008 16:51:49 +0000 Subject: revert bogus latest commit git-svn-id: http://svn.mandriva.com/svn/soft/draksnapshot/trunk@239846 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94 --- draksnapshot-applet | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-) (limited to 'draksnapshot-applet') diff --git a/draksnapshot-applet b/draksnapshot-applet index 7ffe75e..ce95772 100755 --- a/draksnapshot-applet +++ b/draksnapshot-applet @@ -56,7 +56,7 @@ my %state = ( }, disk_found => { menu => [ 'configure' ], - tt => [ N_("USB discs are available for backups") ] + tt => [ N_("USB discs are availlable for backups") ] }, config_in_progress => { menu => [], @@ -96,22 +96,7 @@ Gtk2->main; ugtk2::exit(0); -my ($config_pid, $checker_pid); - - -my %comm_codes = ( - discs => { - code => 2, - status => 'locked', - log => N_("urpmi database locked") . ", skipping updating urpmi database", - }, - nothing => { - code => 3, - status => 'critical', - log => N_("Error updating media"), - }, -); - +my $config_pid; # Signal management sub harvester { @@ -126,14 +111,6 @@ sub harvester { # we should better check it has really been configured indeed. setAutoStart('FALSE'); ugtk2::exit(0); - } elsif ($checker_pid && $checker_pid == $childpid) { - undef $checker_pid; - my $status = $? >> 8; - my ($state) = grep { $_->{code} eq $status } values %comm_codes; - if ($state) { - logIt($state->{log}); - go2State($state->{status}); - } } push @pids, $childpid; WIFEXITED($?) and refresh_gui(1); @@ -168,19 +145,9 @@ sub silentCheck() { my $w = $::main_window ? $::main_window->window : undef; gtkset_mousecursor_wait($w); - $checker_pid = fork(); - if (defined $checker_pid) { - return if $checker_pid; # parent - - # immediate exit, else forked gtk+ object destructors will badly catch up parent applet - my $_safe = before_leaving { POSIX::_exit(0) }; - - # force refreshing cache: - - detect_devices::probeall_update_cache(); - @discs = grep { $_->{usb_bus} && detect_devices::may_be_a_hd($_) } detect_devices::getSCSI(); - } - + # force refreshing cache: + detect_devices::probeall_update_cache(); + @discs = grep { $_->{usb_bus} && detect_devices::may_be_a_hd($_) } detect_devices::getSCSI(); go2State('okay') if !@discs; # are there any updates ? -- cgit v1.2.1