From ae728969f2c0c4d6e4d0c6845f434bdead7c22df Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 2 May 2005 08:32:57 +0000
Subject: embedding cleanups resulting in reusing main window icon in sub
 dialogs

---
 perl-install/standalone/harddrake2 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'perl-install/standalone/harddrake2')

diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 8a832d155..6125dfb8c 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -209,10 +209,10 @@ my @menu_items =
                                  my $info = lookup_field($_);
                                  if_($info->[0], formatAlaTeX(qq(<span foreground="royalblue3">$info->[0]:</span> $info->[1])));
                              } sort keys %$current_device),
-                             { use_markup => 1, if_(!$::isEmbedded, transient => $w->{real_window}), height => 400, scroll => 1 });
+                             { use_markup => 1, transient => $w->{real_window}, height => 400, scroll => 1 });
 
            } else {
-               create_dialog(N("Select a device!"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { if_(!$::isEmbedded, transient => $w->{real_window}) });
+               create_dialog(N("Select a device!"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { transient => $w->{real_window} });
            }
        },
        undef, '<Item>'
@@ -225,7 +225,7 @@ my @menu_items =
 #-PO: Do not alter the <span ..> and </span> tags
                          N("This is HardDrake, a %s hardware configuration tool.\n<span foreground=\"royalblue3\">Version:</span> %s
 <span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud\@mandriva.com&gt;\n\n", $distro_name, $harddrake::data::version) . "\n" .
-                         formatAlaTeX($::license), { use_markup => 1, if_(!$::isEmbedded, transient => $w->{real_window}) });
+                         formatAlaTeX($::license), { use_markup => 1, transient => $w->{real_window} });
        }, undef, '<Item>'
      ]
     );
@@ -256,7 +256,7 @@ $w->{window}->add(gtkpack_(0, Gtk2::VBox->new(0, 0),
                            0, $menubar,
                            0, Gtk2::Banner->new("/usr/share/mcc/themes/default/harddrake-mdk.png", translate("Hardware")),
                            1, create_hpaned(gtkadd(Gtk2::Frame->new(N("Detected hardware")), 
-                                                   create_scrolled_window(gtkset_size_request(my $tree = Gtk2::TreeView->new_with_model($tree_model), $::isEmbedded ? 250 : 350, -1), ['automatic', 'automatic'])),
+                                                   create_scrolled_window(gtkset_size_request(my $tree = Gtk2::TreeView->new_with_model($tree_model), 350, -1), ['automatic', 'automatic'])),
                                             gtkpack_(0, Gtk2::VBox->new(0, 0),
                                                      1, gtkadd(my $frame = Gtk2::Frame->new(N("Information")),
                                                                create_scrolled_window(my $text = Gtk2::TextView->new)),
@@ -544,7 +544,7 @@ sub popup_menu {
 
 sub upload() {
     my $dialog = _create_dialog(N("Upload the hardware list"),
-                                { if_(!$::isEmbedded, transient => $w->{real_window}) }); #, height => 400
+                                { transient => $w->{real_window} }); #, height => 400
     gtkpack($dialog->vbox,
             gtkset_markup(Gtk2::Label->new, qq(<span weight="bold">) . N("Upload the hardware list") . "</span>\n"),
             create_packtable({ col_spacings => 10, row_spacings => 5, mcc => 1 },
-- 
cgit v1.2.1