- skip missing entries

- do not add empty classes
- warn about missing entries when not in mdkmove

1 files changed, 13 insertions, 1 deletions

diff --git a/control-center b/control-center
index d099a8bc..241e12ac 100755
--- a/control-center
+++ b/control-center
@@ -279,6 +279,8 @@ my %options = (
     'wiz_expert' => [ N("/_Options"), N("/Expert mode in _wizards") ],
 );
 
+my $mdk_rel = common::mandrake_release();
+
 my @menu_items = (
                   [ N("/_File"), undef, undef, undef, '<Branch>' ],
                   [ N("/_File") . N("/_Quit"), N("<control>Q"), \&quit_global, undef, '<StockItem>', 'gtk-quit' ],
@@ -450,6 +452,16 @@ my ($lspacing, $left_txt_offset, $icon_offset);
 # Create left icons
 foreach (@tree) {
     my ($text, $icon, $subtree) = @$_;
+
+    # Skip empty classes
+    my @subtree;
+    foreach my $stuff (@$subtree) {
+        my $exec = first(split /\s+/, $exec_hash->{$stuff->[0]}[1]);
+        # do not complain about missing entries in move:
+        -x $exec ? push(@subtree, $stuff) : warn qq("$exec" is not executable) if $mdk_rel !~ /move/;
+    }
+    next if !@subtree;
+
     my $my_index = $index++;
 
 #    die "gtkput(fixed_left, VBox of StockButtons there or\n   (while waiting for gc to implement IconFactory) VBox of Hbox[icon|text]";
@@ -559,7 +571,7 @@ foreach (@tree) {
                                                  1, gtktext_insert(Gtk2::TextView->new, [ [ $text, {'background_set' => 0, 'background_stipple_set' => 0 } ] ])
                                                  ), 50, -1
                                         );
-                      } @$subtree));
+                      } @subtree));
 
     add2notebook($notebook_global, "",
                  my $_w_ret = create_scrolled_window(gtkset_border_width($tbl, 5),