From 34538a4e612ca5f1bb8a6c745bbdd68572b41e7a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 15 Jan 2004 21:49:35 +0000
Subject: remove useless menu infrastucture

---
 perl-install/standalone/drakups | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups
index 169564cd3..7a264b32f 100755
--- a/perl-install/standalone/drakups
+++ b/perl-install/standalone/drakups
@@ -177,23 +177,6 @@ sub load_access_conf() {
 #------------------------------------------------------------------
 # misc gui data
 
-my $help = N("Help");
-my @menu_items =
-    (
-     [ N("/_File"), undef, undef, undef, '<Branch>' ],
-     [ N("/_File").N("/_Quit"), N("<control>Q"), \&quit_global, undef, '<StockItem>', 'gtk-quit' ],
-     [ $help, undef, undef, undef, '<Branch>' ],
-     [ $help.N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '<Item>' ],
-     [ $help.N("/_Report Bug"), undef, sub { unless (fork()) { exec("drakbug --report drakups &") } }, undef, '<Item>' ],
-     [ $help.N("/_About..."), undef, sub {
-           create_dialog(N("About DrakUPS"),
-#-PO Do not alter the <span ..> and </span> tags
-                         N("This is DrakUPS, a Mandrake configuration tool for UPS devices.\n
-Author:</span> Thierry Vignaud &lt;tvignaud\@mandrakesoft.com&gt;\n\n"))
-       }, undef, '<Item>'
-     ]
-    );
-
 sub edit_row {
     my ($model, $iter) = @_;
     # create new item if needed (that is when adding a new one) at end of list
@@ -391,6 +374,6 @@ foreach my $i (@pages) {
 
 #------------------------------------------------------------------
 # let's start the show:
-$in->do_pkgs->ensure_is_installed('nut-server', '/usr/sbin/upsd');
+$in->do_pkgs->ensure_is_installed('nut-server', '/usr/sbin/upsd') if !$::testing;
 $w->{rwindow}->show_all;
 $w->main;
-- 
cgit v1.2.1