summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-10 17:15:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-10 17:15:08 +0000
commitd7759908b432ca8fd8942622ce4aa85a28354000 (patch)
tree5cb2ab2799311ecbc22e943496a5ac146145ac61
parent30b77de5ca55825dfe10e129491756d8435751f4 (diff)
downloaddrakx-d7759908b432ca8fd8942622ce4aa85a28354000.tar
drakx-d7759908b432ca8fd8942622ce4aa85a28354000.tar.gz
drakx-d7759908b432ca8fd8942622ce4aa85a28354000.tar.bz2
drakx-d7759908b432ca8fd8942622ce4aa85a28354000.tar.xz
drakx-d7759908b432ca8fd8942622ce4aa85a28354000.zip
- XFdrake test is not standalone, it is the non install nor standalone state
(used when there is no window manager) - get rid of now unused $ugtk2::force_center
-rw-r--r--perl-install/Xconfig/test.pm2
-rw-r--r--perl-install/ugtk2.pm4
2 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/Xconfig/test.pm b/perl-install/Xconfig/test.pm
index 6f81d75d0..ced26c141 100644
--- a/perl-install/Xconfig/test.pm
+++ b/perl-install/Xconfig/test.pm
@@ -98,7 +98,6 @@ sub test {
use common;
$::prefix = "%s";
- $::isStandalone = 1;
lang::bindtextdomain();
@@ -106,7 +105,6 @@ sub test {
Gtk2->init;
gtkset_background(200 * 257, 210 * 257, 210 * 257);
- $ugtk2::force_center = 1;
$ugtk2::force_focus = 1;
my $text = Gtk2::Label->new;
my $time = 12;
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 72e22c8f0..3984ebb63 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -2,7 +2,7 @@ package ugtk2;
use diagnostics;
use strict;
-use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $wm_icon $force_center_at_pos $force_center $force_focus $grab $border); #- leave it on one line, for automatic removal of the line at package creation
+use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $wm_icon $force_center_at_pos $force_focus $grab $border); #- leave it on one line, for automatic removal of the line at package creation
@ISA = qw(Exporter);
%EXPORT_TAGS = (
@@ -839,7 +839,7 @@ sub new {
if ($o->{pop_it}) {
$o->{rwindow} = _create_window(
title => $title,
- position_policy => $force_center ? 'center_always' : 'center-on-parent',
+ position_policy => !$::isInstall && !$::isStandalone ? 'center_always' : 'center-on-parent',
modal => $grab || $o->{grab} || $o->{modal},
if_(!$::isInstall, icon_no_error => wm_icon()),
if_($o->{transient} && $o->{transient} =~ /Gtk2::Window/, transient_for => $o->{transient}),