first attempt to restore embedded support

3 files changed, 24 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f1c01c9f..686dbf51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2002-12-20 17:57  tvignaud
+
+	* drakconf.spec: typo fix
+
+2002-12-20 17:53  tvignaud
+
+	* Makefile: fix for unbzipped icons
+
+2002-12-20 17:53  tvignaud
+
+	* drakconf.spec: 9.1-0.6mdk
+
+2002-12-20 17:52  tvignaud
+
+	* ChangeLog: [no log message]
+
 2002-12-20 17:49  tvignaud
 
 	* pixmaps/default/: splash_screen.png, splash_screen_about.png: add
@@ -7,6 +23,10 @@
 
 	* control-center: fix left/right alignment for now
 
+2002-12-20 17:49  tvignaud
+
+	* control-center: fix left/right alignment for now
+
 2002-12-20 17:47  tvignaud
 
 	* pixmaps/default/mcc-left-back2.orig.png: remove obsolete image
diff --git a/control-center b/control-center
index 18455e3d..06ac22a2 100755
--- a/control-center
+++ b/control-center
@@ -284,11 +284,6 @@ my ($menu, $factory) = create_factory_menu($window_global,
                                             {   path => N("/_Options") . N("/_Embedded Mode"), type => '<ToggleItem>',
                                                 callback => sub { 
                                                     $embedded = $embedded_check_box->active;
-                                                    if ($embedded) {
-                                                        $embedded = 0;
-							return if $window_splash;
-                                                        splash_warning(N("Embedding support is currently broken as of Gtk+-2.1.5."));
-                                                    }
                                                 }
                                             },
                                             if_($::isWiz,
@@ -477,6 +472,8 @@ foreach (@tree) {
     $darea_left->signal_connect(button_release_event => sub {
         return if $left_locked;
         return if $pending_app && !splash_warning(N("The modifications done in the current module won't be saved."), 1);
+        clean_socket();
+
         # deselect previously selected darea
         if ($index_sav != -1) {
             $curr_state[$index_sav] = 0;
@@ -690,7 +687,7 @@ sub compute_exec_string {
     if ($show_logs && $freeze_log) { #FIXME && !$exp_socket
         my $pid;
         my $exp_socket;
-#FIXME  gtkadd($exp_frame, my $exp_socket = Gtk2::Socket)->new;
+        gtkadd($exp_frame, $exp_socket = Gtk2::Socket->new);
         $exp_socket->realize;
         my $exec_log = "logdrake --explain=$log_exp --embedded " . $exp_socket->window->XWINDOW . " " . $$;
         $freeze_log = 0;
diff --git a/drakconf.spec b/drakconf.spec
index e37b23b0..c16453b8 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -21,6 +21,7 @@ Requires: mandrake-release, drakxtools >= 9.1-0.4mdk
 #gtk+mdk >= 0.1.6-10mdk
 Requires: harddrake-ui >= 9.1-0.4mdk, popt >= 1.6.3-9mdk, usermode
 Requires: perl-GTK2, gtk-engines2, XFree86-100dpi-fonts
+Requires: gtk+2.0 >= 2.1.5-2mdk
 Requires: drakcronat >= 0.1.2-9mdk, draksec >= 0.1-4mdk, menudrake >= 0.6.5-2mdk, rxvt, userdrake
 BuildRoot: %_tmppath/%name-%version-buildroot