From 31b4c1ac8cc81d4a8df76fea57c5f12fe9d922b0 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 24 Feb 2003 11:35:26 +0000
Subject: fix #1771

---
 perl-install/standalone/drakperm | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm
index 3a78608f1..60ce05307 100755
--- a/perl-install/standalone/drakperm
+++ b/perl-install/standalone/drakperm
@@ -203,20 +203,20 @@ sub row_setting_dialog {
     my %perms;
     my $dlg		= new Gtk2::Dialog();
     $dlg->set_transient_for($w->{rwindow}) unless $::isEmbedded;
+    $dlg->set_modal(1);
+#    $dlg->set_resizable(0);
     my $ok 		= new Gtk2::Button('ok');
     my $cancel 	= new Gtk2::Button('cancel');
     my $browse	= new Gtk2::Button(N("browse"));
     my $users 	= new Gtk2::Combo;
     my $groups	= new Gtk2::Combo;
     my $file		= new Gtk2::Entry;
-    my $file_hbox  = new Gtk2::HBox(0,5);
     my $usr_hbox   = new Gtk2::HBox(0,5);
     my $usr_vbox   = new Gtk2::VBox(0,5);
     my $usr_check  = new Gtk2::CheckButton(N("Current user"));
     my $hb_rights  = new Gtk2::HBox(0,15);
     my $vb_rights  = new Gtk2::VBox(0,15);
     my $F_rights	= new Gtk2::Frame(N("Permissions"));
-    my $F_path	= new Gtk2::Frame(N("Path"));
     my $F_usr		= new Gtk2::Frame(N("Property"));
     my $vb_specials = new Gtk2::VBox(0,5);
     my $sticky	= new Gtk2::CheckButton(N("sticky-bit"));
@@ -268,8 +268,6 @@ sub row_setting_dialog {
     $groups->set_popdown_strings(&get_user_or_group);
     $groups->entry->set_text(${$CURENT{data}}[2]);
     $groups->entry->set_editable(0);
-    $dlg->set_modal(1);
-
 	
     if (${$CURENT{data}}[1] eq 'current') {
 	$usr_check->set_active(1);
@@ -317,8 +315,6 @@ sub row_setting_dialog {
 				    $users->set_sensitive(!$bool);
 				});
 	
-    $file_hbox->add($file);
-    $file_hbox->add($browse);
 	
     $usr_vbox->add($usr_check);
     $usr_vbox->add($usr_hbox);
@@ -328,14 +324,19 @@ sub row_setting_dialog {
     $usr_hbox->add(new Gtk2::Label(N("group :")));
     $usr_hbox->add($groups);
 	
-    $F_path->add($file_hbox);
     $F_rights->add($hb_rights);
     $F_usr->add($usr_vbox);
 	
-    $dlg->vbox->add($F_path);
-    $dlg->vbox->add($F_usr);
-    $dlg->vbox->add($F_rights);
-	
+    gtkpack_($dlg->vbox,
+             0, gtkadd(new Gtk2::Frame(N("Path")),
+                   gtkpack_(Gtk2::HBox->new(0,5),
+                            1, $file,
+                            0, $browse
+                           )
+                  ),
+              0, $F_usr,
+              1, $F_rights
+             );
     $dlg->action_area->add($ok);
     $dlg->action_area->add($cancel);
 	
-- 
cgit v1.2.1