Attachment 5204 Details for Bug 13534 – complete fix including keeping old TZ value on cancel then reclick

[patch] complete fix including keeping old TZ value on cancel then reclick

13534-fix3.diff (text/plain), 1.10 KB, created by Thierry Vignaud on 2014-06-20 09:27:17 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2014-06-20 09:27:17 CEST

Size: 1.10 KB

patch

obsolete

>diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
>index 7b64ed5..aa31536 100755
>--- a/perl-install/standalone/drakclock
>+++ b/perl-install/standalone/drakclock
>@@ -42,11 +42,13 @@ my @timezones = eval { timezone::getTimeZones() };
> my $err = $@;
> $button_time->signal_connect(clicked => sub {
>     local $::isEmbedded = 0; # to prevent sub window embedding
>-    if ($timezone->{timezone} = $in->ask_from_treelist(N("Timezone - DrakClock"), N("Which is your timezone?"), '/', \@timezones, $timezone->{timezone})) {
>+    if (my $tz = $in->ask_from_treelist(N("Timezone - DrakClock"), N("Which is your timezone?"), '/', \@timezones, $timezone->{timezone})) {
>+	$timezone->{timezone} = $tz;
>+    	$label_timezone->set_text($timezone->{timezone});
> 	$timezone->{UTC} = $in->ask_yesorno(N("GMT - DrakClock"), N("Is your hardware clock set to GMT?"), $timezone->{UTC});
> 	timezone::write($timezone);
>+    	$label_timezone->set_text($timezone->{timezone});
>     }
>-    $label_timezone->set_text($timezone->{timezone});
> 			     });
> if (!@timezones) {
>     warn "Failed to retrieve timezone list: $err\n";

diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
index 7b64ed5..aa31536 100755
--- a/perl-install/standalone/drakclock
+++ b/perl-install/standalone/drakclock
@@ -42,11 +42,13 @@ my @timezones = eval { timezone::getTimeZones() };
 my $err = $@;
 $button_time->signal_connect(clicked => sub {
     local $::isEmbedded = 0; # to prevent sub window embedding
-    if ($timezone->{timezone} = $in->ask_from_treelist(N("Timezone - DrakClock"), N("Which is your timezone?"), '/', \@timezones, $timezone->{timezone})) {
+    if (my $tz = $in->ask_from_treelist(N("Timezone - DrakClock"), N("Which is your timezone?"), '/', \@timezones, $timezone->{timezone})) {
+	$timezone->{timezone} = $tz;
+    	$label_timezone->set_text($timezone->{timezone});
 	$timezone->{UTC} = $in->ask_yesorno(N("GMT - DrakClock"), N("Is your hardware clock set to GMT?"), $timezone->{UTC});
 	timezone::write($timezone);
+    	$label_timezone->set_text($timezone->{timezone});
     }
-    $label_timezone->set_text($timezone->{timezone});
 			     });
 if (!@timezones) {
     warn "Failed to retrieve timezone list: $err\n";

Actions: View | Diff

Attachments on bug 13534: 5198 | 5199 | 5202 | 5203 | 5204