always embedd

1 files changed, 4 insertions, 11 deletions

diff --git a/control-center b/control-center
index 95b4eccf..09038968 100755
--- a/control-center
+++ b/control-center
@@ -55,14 +55,13 @@ require_root_capability(); # just to get root capabilities
 my %h = getVarsFromSh($conffile);
 my %class = getVarsFromSh($class_install);
 $h{THEME} ||= 'default';
-$h{EMBEDDED} ||= bool2text(1);
 $h{LOGS} ||= bool2text($class{CLASS} eq 'expert' ? 1 : 0);
 $h{EXPERT_WIZARD} ||= 0;
 $h{HEIGTH} ||= $default_heigth;
 $h{WIDTH}  ||= $default_width;
 
 my %option_values;
-@option_values{qw(embedded_mode show_log wiz_expert)} = (text2bool($h{EMBEDDED}), text2bool($h{LOGS}), text2bool($h{EXPERT_WIZARD}));
+@option_values{qw(show_log wiz_expert)} = (text2bool($h{LOGS}), text2bool($h{EXPERT_WIZARD}));
 my $theme = $h{THEME};
 $theme = $1 if "@ARGV" =~ /--theme (\w+)/;
 -d "$themes_dir/$theme" or $theme = 'default';
@@ -303,7 +302,6 @@ my @themes = grep { -d "$themes_dir/$_" } all($themes_dir);
 #-PO Translators, please keep all "/" charaters !!!
 my %options = (
     'show_log' => [ N("/_Options"), N("/Display _Logs")  ],
-    'embedded_mode' => [ N("/_Options"), N("/_Embedded Mode") ],
     'wiz_expert' => [ N("/_Options"), N("/Expert mode in _wizards") ],
 );
 
@@ -333,10 +331,6 @@ my @menu_items = (
                     },
                     undef, '<CheckItem>'
                   ],
-                  [ join('', @{$options{embedded_mode}}), undef,
-                    sub { $option_values{embedded} = $check_boxes{embedded_mode}->get_active },
-                    undef, '<CheckItem>',
-                  ],
                   if_($::isWiz,
                       [ join('', @{$options{wiz_expert}}), undef,
                         sub { $option_values{expert_wizard} = $check_boxes{wiz_expert}->get_active },
@@ -498,7 +492,7 @@ update_profiles();
 
 %check_boxes = map {
     $_ => $factory->get_widget("<main>" . get_path(@{$options{$_}}))
-} ("embedded_mode", "show_log", if_($::isWiz, "wiz_expert"));
+} ("show_log", if_($::isWiz, "wiz_expert"));
 
 
 gtkadd($window_global,
@@ -804,7 +798,7 @@ sub fork_ {
     my $pid = fork();
     if (defined $pid) {
         !$pid and do { exec($prog) or POSIX::_exit(1) };   # immediate exit, else forked gtk+ object destructors will badly catch up parent mcc
-        push @$o_pid_table, $pid if $option_values{embedded};
+        push @$o_pid_table, $pid;
         return $pid;
     } else {
         splash_warning(N("cannot fork: %s", "$!"));
@@ -821,7 +815,7 @@ sub compute_exec_string {
         return;
     }
     $exec .=  " --summary" if $option_values{expert_wizard} && $exec_ =~ /drakwizard/;
-    my $embedded = $option_values{embedded} && $gtkplug != -1; # globally embedded and not "explicitely not embedded"
+    my $embedded = $gtkplug != -1; # not "explicitely not embedded"
     if ($embedded) {
         foreach my $notebook ($notebook_global, $banner_notebook) {
             $notebook->hide;
@@ -908,7 +902,6 @@ sub quit_global() {
     &kill_logdrake();
     my ($x, $y) = $window_global->get_size;
     setVarsInSh($conffile, {
-        EMBEDDED      => bool2text($option_values{embedded}),
         LOGS          => bool2text($option_values{show_log}),
         EXPERT_WIZARD => bool2text($option_values{expert_wizard}),
         HEIGTH => $y,