summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-30 14:36:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-30 14:36:33 +0000
commitdf3e74aff7b9b86b19dd5394e5cf50baaae79607 (patch)
tree003753a84d820bff5f17cec4905dccd6dd479996
parent816ac124bf481cb48f0b6cfbb170ab194ac3450c (diff)
downloaddrakx-backup-do-not-use-df3e74aff7b9b86b19dd5394e5cf50baaae79607.tar
drakx-backup-do-not-use-df3e74aff7b9b86b19dd5394e5cf50baaae79607.tar.gz
drakx-backup-do-not-use-df3e74aff7b9b86b19dd5394e5cf50baaae79607.tar.bz2
drakx-backup-do-not-use-df3e74aff7b9b86b19dd5394e5cf50baaae79607.tar.xz
drakx-backup-do-not-use-df3e74aff7b9b86b19dd5394e5cf50baaae79607.zip
we don't want global vars in mygtk2, move $::noborderWhenEmbedded to ugtk2
-rw-r--r--perl-install/mygtk2.pm1
-rw-r--r--perl-install/ugtk2.pm1
2 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 37fa812ec..ad19700b3 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -503,7 +503,6 @@ sub _gtk__MagicWindow {
}
set_main_window_size($::WizardWindow);
- $sub_child->set_border_width($::noborderWhenEmbedded ? 0 : 10);
$w = $::WizardWindow;
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index b4c6ecf0c..39a09dbb5 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -856,6 +856,7 @@ sub new {
if_(!$::isInstall, icon_no_error => wm_icon()),
if_($o->{transient} && $o->{transient} =~ /Gtk2::Window/, transient_for => $o->{transient}),
);
+ $window->set_border_width(10) if !$window->{pop_it} && !$::noborderWhenEmbedded;
$o->{rwindow} = $o->{window} = $window;
$o->{real_window} = $window->{real_window};