(create_hidden_socket_if_needed) cleanups:

- socket is always undefined on embedded child exits (either by
  SIG_CHLD handler or by fork faillure handler or by plug-removed
  signal)
- rename it as create_hidden_socket() to better reflect what he does

1 files changed, 13 insertions, 16 deletions

diff --git a/control-center b/control-center
index 4868324b..086cca38 100755
--- a/control-center
+++ b/control-center
@@ -655,21 +655,18 @@ sub hide_socket_and_clean() {
     update_exp();
 }
 
-sub create_hidden_socket_if_needed() {
-    unless ($emb_socket) {
-        gtkpack_($emb_box, 1, gtksignal_connect($emb_socket = Gtk2::Socket->new, 'plug-removed' => \&child_just_exited));
-        # emitted when embedded apps begin to draw
-        $emb_socket->signal_connect('plug-added' => sub  {
-            $left_locked = 0;
-            $emb_wait->hide;
-            return if !$emb_socket;
-            $emb_socket->show;
-            $emb_socket->can_focus(1);
-            $emb_socket->grab_focus;
-            $emb_socket->window->XSetInputFocus;
-        });
-    }
-
+sub create_hidden_socket() {
+    gtkpack_($emb_box, 1, gtksignal_connect($emb_socket = Gtk2::Socket->new, 'plug-removed' => \&child_just_exited));
+    # signal emitted when embedded apps begin to draw:
+    $emb_socket->signal_connect('plug-added' => sub {
+                                    $left_locked = 0;
+                                    $emb_wait->hide;
+                                    return if !$emb_socket;
+                                    $emb_socket->show;
+                                    $emb_socket->can_focus(1);
+                                    $emb_socket->grab_focus;
+                                    $emb_socket->window->XSetInputFocus;
+                                });
     $emb_box->set_focus_child($emb_socket);
     $emb_socket->hide;
     $emb_wait->hide;
@@ -719,7 +716,7 @@ sub compute_exec_string {
     my $embedded = $option_values{embedded} && $gtkplug != -1; # globally embedded and not "explicitely not embedded"
     if ($embedded) {
         $notebook_global->hide;
-        create_hidden_socket_if_needed();
+        create_hidden_socket();
         $emb_frame->show;
         $emb_socket->realize;
         $pending_app = 1;