Fix some instances of 100% cpu on combo-box 'changed' in "Advanced When".

Update drakbackup.conf man page with new options.
Add drakbackup man page.

3 files changed, 86 insertions, 20 deletions

diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 9b996620c..6a3143545 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-#  Copyright (C) 2001-2005 Mandriva by Sebastien DUPONT <dupont_s@epita.fr>
+#  Copyright (C) 2001,2002,2003,2004,2005 Mandriva by Sebastien DUPONT <dupont_s@epita.fr>
 #  Updated 2002-2005 by Stew Benedict <sbenedict@mandriva.com>
 #  Redistribution of this file is permitted under the terms of the GNU
 #  Public License (GPL)
@@ -380,9 +380,8 @@ sub read_cron_files() {
 }
 
 sub read_user_cron() {
-		$custom_cron = 1;
-		@cron_entries = `crontab -l`;
-		chomp @cron_entries;
+	@cron_entries = `crontab -l`;
+	chomp @cron_entries;
 }
 
 sub save_cron_files() {
@@ -2061,7 +2060,7 @@ sub advanced_where() {
 
 sub advanced_when() {
     my $box_when;
-	my $allow_custom = $backup_daemon && $custom_cron; 
+	my $allow_custom = $backup_daemon && $custom_cron;
     my $combo_when_space = Gtk2::ComboBox->new_with_strings([ "", N("hourly"), N("daily"), N("weekly"), N("monthly"), N("custom") ]);
     my %trans = (N("hourly") => 'hourly',
 		N("daily") => 'daily',
@@ -2240,27 +2239,41 @@ sub advanced_when() {
 		$conf{DAEMON_TIME_SPACE} = $trans{$combo_when_space->entry->get_text}; 
 		$custom_cron = $conf{DAEMON_TIME_SPACE} eq "custom" ? 1 : 0;
 		destroy_widget();
-		advanced_when();		
+		advanced_when();
 	});
 	if ($custom_cron) {
 		$entry_crontab->set_text("$time_string $exec_string $profile_string $redir_string");
 	}
 	
-	$combo_minute_when->entry->signal_connect('changed', sub { combo_to_cron_string($combo_minute_when->get_text, 0) });
-	$combo_hour_when->entry->signal_connect('changed', sub { combo_to_cron_string($combo_hour_when->get_text, 1) });
-	$combo_day_when->entry->signal_connect('changed', sub {	combo_to_cron_string($combo_day_when->get_text, 2) });	
-	$combo_month_when->entry->signal_connect('changed', sub { combo_to_cron_string($combo_month_when->get_active, 3) });
+	$combo_minute_when->entry->signal_connect('changed', sub { 
+		combo_to_cron_string($combo_minute_when->get_text, 0);
+		$entry_crontab->set_text("$time_string $exec_string $profile_string $redir_string");
+	});
+	$combo_hour_when->entry->signal_connect('changed', sub { 
+		combo_to_cron_string($combo_hour_when->get_text, 1);
+		$entry_crontab->set_text("$time_string $exec_string $profile_string $redir_string");
+	});
+	$combo_day_when->entry->signal_connect('changed', sub {	
+		combo_to_cron_string($combo_day_when->get_text, 2);
+		$entry_crontab->set_text("$time_string $exec_string $profile_string $redir_string");
+	});	
+	$combo_month_when->entry->signal_connect('changed', sub { 
+		combo_to_cron_string($combo_month_when->get_active, 3);
+		$entry_crontab->set_text("$time_string $exec_string $profile_string $redir_string");
+	});
 	$combo_weekday_start->entry->signal_connect('changed', sub {
 		my $start = $combo_weekday_start->get_active - 1;
 		my $end = $combo_weekday_end->get_active - 1;
 		$start = $start . "-" . $end if $end > -1 && $start < $end; 
-		combo_to_cron_string($start, 4); 
+		combo_to_cron_string($start, 4);
+		$entry_crontab->set_text("$time_string $exec_string $profile_string $redir_string"); 
 	});
 	$combo_weekday_end->entry->signal_connect('changed', sub {
 		my $start = $combo_weekday_start->get_active - 1;
 		my $end = $combo_weekday_end->get_active - 1;
 		$start = $start . "-" . $end if $start > -1 && $start < $end; 
-		combo_to_cron_string($start, 4);   
+		combo_to_cron_string($start, 4);
+		$entry_crontab->set_text("$time_string $exec_string $profile_string $redir_string"); 
 	});
 	$combo_profile->entry->signal_connect('changed', sub {
 		$profile_string = "--profile " . $combo_profile->get_text;
@@ -2279,8 +2292,6 @@ sub combo_to_cron_string {
 	my @time_list = split(" ", $time_string);
 	splice(@time_list, $location, 1, $field);
 	$time_string = join(" ", @time_list);
-	destroy_widget();
-	advanced_when();				
 }
 
 sub advanced_options() {
diff --git a/perl-install/standalone/man/C/man5/drakbackup.5 b/perl-install/standalone/man/C/man5/drakbackup.5
new file mode 100644
index 000000000..932221216
--- /dev/null
+++ b/perl-install/standalone/man/C/man5/drakbackup.5
@@ -0,0 +1,42 @@
+.\" 
+.TH drakbackup 5 "December 2005" Mandriva "System Utilities"
+.SH NAME 
+drakbackup
+
+.SH DESCRIPTION 
+Drakbackup is a backup/restore application for Mandriva Linux. Most users will want to use the GUI interface, but it is also possible to run the application from the
+command line.
+
+.B "Command Line Options"
+
+.B
+ --default
+    Run a backup using the default configuration.
+
+.B
+ --profile
+    Run a backup using a different profile. (Profiles are alternate, named configurations located in the same directory as the default configuration; i.e. foo.conf).
+
+.B
+ --debug
+    Run drakbackup in debugging mode, which will output additional information for troubleshooting.
+
+.B 
+ --show-config
+    Display the configuration summary.
+
+.B
+ --cd-info
+    Dump the capabilities table of attached CD/DVD hardware.
+
+.B
+ --daemon
+    Intended to be used in cron scripts. Runs drakbackup in daemon mode, using defined media methods for unattended  backups.
+
+.SH "SEE ALSO"
+.BR drakbackup.conf (5),
+.BR /usr/share/doc/mandriva/en/Drakxtools-Guide.html/drakbackup.html
+
+.SH AUTHOR
+Stew Benedict <sbenedict@mandriva.com>
+
diff --git a/perl-install/standalone/man/C/man5/drakbackup.conf.5 b/perl-install/standalone/man/C/man5/drakbackup.conf.5
index 20abef201..06b155976 100644
--- a/perl-install/standalone/man/C/man5/drakbackup.conf.5
+++ b/perl-install/standalone/man/C/man5/drakbackup.conf.5
@@ -1,5 +1,5 @@
 .\" 
-.TH drakbackup.conf 5 "March 2004" Mandrakesoft "System Utilities"
+.TH drakbackup.conf 5 "December 2005" Mandriva "System Utilities"
 .SH NAME 
 drakbackup.conf
 
@@ -37,6 +37,9 @@ The default configuration file is located in:
 .B 
  BACKUPIGNORE
    Honor .backupignore files in backup directories.
+.B
+ ARCHIVER
+   Choice of 'tar' or 'star'. Star provides support for ACLs (Access Control Lists).
 .B 
  OPTION_COMP
    Compression option (tar.gz, tar.bz2, tar \- tar.gz is default).
@@ -48,7 +51,7 @@ The default configuration file is located in:
    Backup media is re\-writable CD.
 .B 
  DVDR
-   Backup media is recordable DVD (not fully supported yet).
+   Backup media is recordable DVD.
 .B 
  DVDRW
    Backup media is recordable DVD+RW.
@@ -57,7 +60,7 @@ The default configuration file is located in:
    Backup media is DVDRAM (not fully supported yet).
 .B 
  NET_PROTO
-   Network protocol to use for remote backups: (ftp, rsync, ssh, or webdav)
+   Network protocol to use for remote backups: (ftp, rsync, ssh)
 .B 
  HOST_NAME
    Remote backup host.
@@ -99,6 +102,9 @@ The default configuration file is located in:
 .B 
  MAX_SPACE
    Maximum Hard Drive Space(MB) to consume for backups. 
+.B
+ DEL_OLD
+   Delete backups older than the given number of days on a new backup run.
 .B 
  USE_CD
    Use CD for backups.
@@ -126,9 +132,12 @@ The default configuration file is located in:
 .B 
  CD_DEVICE
    Cdrecord style CD device name (ie: 1,3,0, or ATAPI:/dev/hdc).
+.B
+ FROM_MAIL
+   The return address that will be used for backup mail messages.
 .B 
  USER_MAIL
-   User to send backup results to via email.
+   User to send backup results to via email. (Can be a comma seperated list of addresses).
 .B
  SMTP_SERVER
    Mail server to use for sending mail.
@@ -171,10 +180,14 @@ The default configuration file is located in:
 .B 
  CRITICAL_SYS
    Do backup above system files.
+.B
+ VIEW_RESTORE_LOG
+   Enables display of the restore process log after a restore operation.
 
 .SH "SEE ALSO"
-/usr/share/doc/mandrake/en/Drakxtools-Guide.html/drakbackup.html
+.BR drakbackup (5),
+.BR /usr/share/doc/mandrake/en/Drakxtools-Guide.html/drakbackup.html
 
 .SH AUTHOR
-Stew Benedict <sbenedict@mandrakesoft.com>
+Stew Benedict <sbenedict@mandriva.com>