(get_extmaint_authentication) simplify password retrieval and make it

works with both older and current gtk+

2 files changed, 11 insertions, 10 deletions

diff --git a/NEWS b/NEWS
index bc544b7b..1d679c51 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - mdkapplet-extended-maintenance-helper
+  o fix retrieving password with older gtk+
   o remember the email when an error occured
 
 Version 2.77.15.7 - 2 February 2010, Thierry Vignaud
diff --git a/mdkapplet-extended-maintenance-helper b/mdkapplet-extended-maintenance-helper
index d2e638d0..933ce3fa 100755
--- a/mdkapplet-extended-maintenance-helper
+++ b/mdkapplet-extended-maintenance-helper
@@ -79,12 +79,6 @@ sub get_extmaint_authentication() {
 
     $password_w = gtknew('Entry');
     $password_w->set_visibility(0);
-    # when not embedded:
-    my $password_restrieved;
-    $w->{real_window}->signal_connect(destroy => sub {
-                                          $password = $password_w->get_text;
-                                          $password_restrieved = 1;
-                                      });
 
     my ($url, $extended_maintenance_end, $desktop_update_end, $basic_update_end) =
       eval { get_extended_maintenance_data() };
@@ -94,6 +88,11 @@ sub get_extmaint_authentication() {
         return;
     }
 
+    $w->{ok_clicked} = sub {
+        $password = $password_w->get_text;
+        Gtk2->main_quit;
+    };
+
     my @widgets = (
               if_(!$::isEmbedded,
                   get_banner(N("Extended Maintenance")),
@@ -128,12 +127,13 @@ sub get_extmaint_authentication() {
               ]),
               create_okcancel($w, N("Next"), N("Cancel")),
           );
-    my $res = fill_n_run_portable_dialog($w, \@widgets);
+
+    fill_n_run_portable_dialog($w, \@widgets);
 
     $email = $email_w->get_text;
-    # when embedded:
-    $password = $password_w->get_text if !$password_restrieved;
-    if ($res) {
+
+    # means OK handler got run:
+    if ($password) {
         if ($email && $password) {
             add_extmaint_medium($email, $password);
         } else {