- add_icon_path is provided by ugtk

- add default theme icons path in case theme doesn't have all icons
- remove useless variables
- make theme working again

1 files changed, 7 insertions, 8 deletions

diff --git a/control-center b/control-center
index 98be5860..50d8e23e 100755
--- a/control-center
+++ b/control-center
@@ -51,8 +51,9 @@ my ($embedded, $logs) = (text2bool($h{EMBEDDED}), text2bool($h{LOGS}));
 my $theme = $h{THEME};
 if ("@ARGV" =~ /--theme (\w+)/) { $theme = $1 }
 -d "$mcc_dir/$theme" or $theme = 'default';
-"@ARGV" =~ /--safe/ and $theme = 'default';
-my_gtk::add_icon_path("$mcc_dir/$theme");
+#"@ARGV" =~ /--safe/ and $theme = 'default';
+ugtk::add_icon_path("$mcc_dir/$theme");
+($theme ne 'default') and ugtk::add_icon_path("$mcc_dir/default");
 my $window_splash = new Gtk::Window -popup;
 $window_splash->signal_connect (delete_event => \&quit_global);
 $window_splash->set_title(_("Mandrake Control Center"));
@@ -469,11 +470,9 @@ $darea1->signal_connect(expose_event => sub {
 my $cursor = new Gtk::Gdk::Cursor 15;
 
 foreach (@tree) {
-    my $w = gtkicons_labels_widget($_->[2], $window_global, "#0#0#0", $darea1,
-				   $pixmap_back_right, 540, 460, 55, 50, 50, 50, 50, 50, \&compute_exec_string, $exec_hash);
-    $notebook_global->append_page($w);
+    $notebook_global->append_page(gtkicons_labels_widget($_->[2], $window_global, "#0#0#0", $darea1,
+				   $pixmap_back_right, 540, 460, 55, 50, 50, 50, 50, 50, \&compute_exec_string, $exec_hash));
 }
-my %tree_launched;
 Gtk->main_iteration while Gtk->events_pending;
 $notebook_global->signal_connect(switch_page => sub {
 				      my (undef, $tab_widget, $tab_number) = @_;
@@ -505,14 +504,14 @@ Gtk->main;
 sub gtkpng_ {
     my $gtkpix;
     eval { $gtkpix = gtkpng(@_) };
-    $@ and $theme ne 'default' ? exec "$0 --safe" : die "$@";
+#    $@ and $theme ne 'default' ? exec "$0 --safe" : die "$@";
     $gtkpix
 }
 
 sub gtkcreate_png_ {
     my ($gdkpix, $gdkmap);
     eval { ($gdkpix, $gdkmap) = gtkcreate_png(@_) };
-    $@ and $theme ne 'default' ? exec "$0 --safe" : die "$@";
+#    $@ and $theme ne 'default' ? exec "$0 --safe" : die "$@";
     ($gdkpix, $gdkmap);
 }