summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-11-12 13:02:00 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-11-24 23:28:17 +0100
commit223b6253caecac05649558ec31bd5210768c0dbb (patch)
tree4a490f6897918b89803d850b4aadd1afde427103
parenta04ae61d231c65c5aa5f497d6e625fb8d5490175 (diff)
downloaddrakx-223b6253caecac05649558ec31bd5210768c0dbb.tar
drakx-223b6253caecac05649558ec31bd5210768c0dbb.tar.gz
drakx-223b6253caecac05649558ec31bd5210768c0dbb.tar.bz2
drakx-223b6253caecac05649558ec31bd5210768c0dbb.tar.xz
drakx-223b6253caecac05649558ec31bd5210768c0dbb.zip
workaround the same segfault when picking the desktop
alter mygtk3 in order to pass a button to join its group
-rw-r--r--perl-install/install/steps_gtk.pm2
-rw-r--r--perl-install/mygtk3.pm1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index f526f0d74..7dc844af2 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -260,7 +260,7 @@ sub reallyChooseDesktop {
tip => $tips{$val->[0]},
toggled => sub { $choice = $val if $_[0]->get_active },
active => $choice == $val,
- $prev ? (group => $prev->get_group) : ());
+ $prev ? (join => $prev) : ());
$prev->signal_connect(key_press_event => sub {
my (undef, $event) = @_;
if (!$event || ($event->keyval & 0x7f) == 0xd) {
diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm
index 094ca1a65..ae72041ca 100644
--- a/perl-install/mygtk3.pm
+++ b/perl-install/mygtk3.pm
@@ -171,6 +171,7 @@ sub _gtk_any_Button {
delete $opts->{mnemonic} ? "Gtk3::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') :
$opts->{text} ? "Gtk3::$class"->new_with_label(@radio_options, delete $opts->{text} || '') :
"Gtk3::$class"->new(@radio_options);
+ $w->join_group(delete $opts->{join}) if $opts->{join};
$w->{format} = delete $opts->{format} if exists $opts->{format};
}