reverted pablo font patch. Wait until it get clear

1 files changed, 17 insertions, 10 deletions

diff --git a/control-center b/control-center
index e8792334..9a3ea9ed 100755
--- a/control-center
+++ b/control-center
@@ -43,7 +43,7 @@ use POSIX;
 
 my $in = 'interactive'->vnew('su', 'default');
 
-my $_version = "0.95";
+my $_version = "0.96";
 my $conffile = "/root/.mcc";
 my %h = getVarsFromSh($conffile);
 my $embedded;
@@ -188,7 +188,7 @@ my @tree =
       [_("Services") , 'service-mdk'],
       [_("Fonts"), 'drakfont-mdk'],
       [_("Date & Time") , 'time-mdk'],
-      [_("Software Manager"), 'rpmdrake-mdk'],
+      [_("Add / Remove Software"), 'rpmdrake-mdk'],
       [_("Logs"), 'logdrake-mdk'],
       [_("Console"), 'console-mdk'],
       [_("Users"), 'user-mdk'],
@@ -443,9 +443,12 @@ $darea1->signal_connect( expose_event => sub {
 
 
 my $cursor = new Gtk::Gdk::Cursor 15;
+
+######## removed for the now. The gtk sources don't uses this, so it should work. ########
 # fontsets *must* be used in order to allow proper font selection for non
 # latin1 languages; never use a simple font, *always* load a fontset
-$window_global->style->font(Gtk::Gdk::Font->fontset_load(_("-*-times-bold-r-normal-*-14-*-*-*-p-*-iso8859-1,*-r-*")));
+# $window_global->font(Gtk::Gdk::Font->fontset_load(_("-*-times-bold-r-normal-*-14-*-*-*-p-*-iso8859-1,*-r-*")));
+
 foreach (@tree) {
     my $w = gtkicons_labels_widget($_->[2], $window_global, "#0#0#0", $window_global->style->font,
 				   #"-urw-times-bold-r-normal-*-*-100-*-*-p-*-iso8859-1"),
@@ -466,12 +469,15 @@ $notebook_global->signal_connect( switch_page => sub {
 				      $tab_widget->child->child->child->{redraw_function}->();
 				  });
 $window_global->show_all;
+$window_global->window->move(-715, -515);
+Gtk->main_iteration while Gtk->events_pending;
 $emb_box->hide;
-#my $p = $#tree + $::isWiz ? 1 : 0;
-#foreach (0..) {
-#  $notebook_global->set_page($_);
-#  Gtk->main_iteration while Gtk->events_pending;
-#}
+my $p = $#tree + ($::isWiz ? 1 : 0);
+print "nb page :  $p \n";
+foreach (0..$p) {
+  $notebook_global->set_page($_);
+  Gtk->main_iteration while Gtk->events_pending;
+}
 $notebook_global->set_page(0);
 
 $window_global->set_default_size(715, 515);
@@ -579,7 +585,7 @@ sub compute_exec_string {
 	    $emb_socket->steal(launch_xapp($alternate));
 	}
     } else {
-	system(($alternate ? $alternate : $exec) . " &");
+	system(($gtkplug == 0 ? $alternate->[0] : $alternate || $exec) . " &");
     }
     if($logs) {
 	$exp_socket->realize;
@@ -606,9 +612,10 @@ sub launch_xapp {
     my $b = "xwininfo -root -tree -int | grep '" . $_[0]->[1] . "'";
     my @before = split ('\n', `$b`);
     my $pid;
+    my $mcc_pid = $$;
     unless ($pid = fork) {
 	splash_warning(_("cannot fork: %s", $~)) unless defined $pid;
-	exec($_[0]->[0]);
+	exec($_[0]->[0] . "; kill -USR1 $mcc_pid");
     }
     push @pid_launched, $pid;
     my $res = 0;