Index: popups_test.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/popups/Attic/popups_test.module,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 popups_test.module
--- popups_test.module	20 Nov 2008 21:18:57 -0000	1.1.2.1
+++ popups_test.module	13 Feb 2009 00:13:32 -0000
@@ -69,65 +69,65 @@
 //  drupal_set_message('Popup Test Page: If you edit your page.tpl.php to wrap the print $messages in a div with id="popit", this message will popup on page load');
   popups_add_popups();
   $output = '<ul id="test-list">';
-  $output .= '<li>'. l("Pop up entire local page.", 'popups/test/response', 
+  $output .= '<li>'. l("Pop up entire local page.", 'popups/test/response',
                array('attributes' => array('class' => 'popups')));
-  $output .= "<li>". l("Pop with options (href override).", 'popups/test/', 
+  $output .= "<li>". l("Pop with options (href override).", 'popups/test/',
                array('attributes' => array('class' => 'popups', 'on-popups-options' => '{href: "test/response"}')));
-  $output .= "<li>". l("Pop with options (width=200px).", 'popups/test/response', 
+  $output .= "<li>". l("Pop with options (width=200px).", 'popups/test/response',
                array('attributes' => array('class' => 'popups', 'on-popups-options' => '{width: "200px"}')));
   $output .= "<li class=\"popups\" on-popups-options=\"{href: 'test/response'}\">Non-link popup</li>";
   $output .= '<li>'. l("Add Story (hook).", 'node/add/story',
                array( 'attributes' => array('id' => 'test-popup')));
   $output .= '<li>'. l("Add Story (attribute).", 'node/add/story',
                array( 'attributes' => array('class' => 'popups-form')));
-               
-  $output .= '<li>'. l("Change Settings and ajax update entire content area: ", 
+
+  $output .= '<li>'. l("Change Settings and ajax update entire content area: ",
                        'admin/settings/popups',
                        array( 'attributes' => array('class' => 'popups-form'),
                      ));
-  $output .= " (Auto Fade checkbox is: " . (variable_get('popups_popup_final_message', 1) ? 'on' : 'off') . ')';
+  $output .= " (Auto Fade checkbox is: " . (variable_get('popups_popup_final_message', 0) ? 'on' : 'off') . ')';
 
   $output .= '<li>'. l("Change Settings and ajax update only single target.", 'admin/settings/popups',
-               array( 'attributes' => array('id' => 'reload-target'), 
+               array( 'attributes' => array('id' => 'reload-target'),
                ));
-  $output .= "<span id='response2'> (Auto Fade checkbox is: " . (variable_get('popups_popup_final_message', 1) ? 'on' : 'off') . ')</span>';
-  popups_add_popups(array('#reload-target'=>array('targetSelectors'=>array('#response2'))));   
-      
+  $output .= "<span id='response2'> (Auto Fade checkbox is: " . (variable_get('popups_popup_final_message', 0) ? 'on' : 'off') . ')</span>';
+  popups_add_popups(array('#reload-target'=>array('targetSelectors'=>array('#response2'))));
+
   $output .= '<li>'. l("Change Settings and ajax update multiple targets with data from other page (tricky!).", 'admin/settings/popups',
              array( 'attributes' => array(
                 'id' => 'foo',
                 'class' => 'popups-form',
                 'on-popups-options' => '{targetSelectors: {"#edit-popups-always-scan-wrapper": "#foo", "#edit-popups-popup-final-message-wrapper": "#test-list li:first"}, forceReturn: "admin/settings/popups"}')));
 
-  $output .= '<li>'. l("Change Settings and reload entire page.", 
+  $output .= '<li>'. l("Change Settings and reload entire page.",
                        'admin/settings/popups',
                        array( 'attributes' => array('class' => 'popups-form-reload'),
                      ));
-                     
-  $output .= '<li>'. l("Pop up defined by popups_add_popups rule.", 'popups/test/response', 
+
+  $output .= '<li>'. l("Pop up defined by popups_add_popups rule.", 'popups/test/response',
                      array('attributes' => array('id' => 'rule-test')));
-  popups_add_popups(array('#rule-test'=>array('width'=>'300px')));       
-  $output .= '<li>'. l('Ajax update just Page Title (only works if you theme uses id="page-title")', 'popups/test/namechange', 
+  popups_add_popups(array('#rule-test'=>array('width'=>'300px')));
+  $output .= '<li>'. l('Ajax update just Page Title (only works if you theme uses id="page-title")', 'popups/test/namechange',
                      array('attributes' => array('id' => 'title-test')));
-  popups_add_popups(array('#title-test'=>array('titleSelectors'=>array('#page-title'), 'noUpdate'=> TRUE, 'forceReturn'=>'popups/test/namechange')));       
+  popups_add_popups(array('#title-test'=>array('titleSelectors'=>array('#page-title'), 'noUpdate'=> TRUE, 'forceReturn'=>'popups/test/namechange')));
 
   global $user;
   $output .= "<li>You are user number $user->uid</li>";
   if ($user->uid == 0) {
-    $output .= '<li>'. l("Login and ajax refresh content area.", 'user', 
+    $output .= '<li>'. l("Login and ajax refresh content area.", 'user',
                        array('attributes' => array('class' => 'popups-form')));
-    $output .= '<li>'. l("Login and reload entire page.", 'user', 
-                       array('attributes' => array('class' => 'popups-form-reload')));                   
-    $output .= '<li>'. l("Login and do not reload anything.", 'user', 
-                       array('attributes' => array('class' => 'popups-form-noupdate')));                   
+    $output .= '<li>'. l("Login and reload entire page.", 'user',
+                       array('attributes' => array('class' => 'popups-form-reload')));
+    $output .= '<li>'. l("Login and do not reload anything.", 'user',
+                       array('attributes' => array('class' => 'popups-form-noupdate')));
   }
   else {
-    $output .= '<li>'. l("Logout (need to surpress warning b/c session is dumped)", 'logout', 
+    $output .= '<li>'. l("Logout (need to surpress warning b/c session is dumped)", 'logout',
                      array('attributes' => array('id' => 'logout')));
   }
   // Need to have the rule outside the else, or it won't get loaded on ajax reload.
-  popups_add_popups(array('#logout'=>array('noUpdate'=>TRUE, 'reloadOnError'=>TRUE)));       
-  $output .= "</ul>";                
+  popups_add_popups(array('#logout'=>array('noUpdate'=>TRUE, 'reloadOnError'=>TRUE)));
+  $output .= "</ul>";
   return $output;
 }
 
@@ -144,6 +144,6 @@
     '#type' => 'submit',
     '#value' => t('Test Name Change'),
   );
-  
+
   return $form;
 }
Index: popups.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/popups/popups.js,v
retrieving revision 1.9.2.21
diff -u -r1.9.2.21 popups.js
--- popups.js	19 Jan 2009 18:59:57 -0000	1.9.2.21
+++ popups.js	13 Feb 2009 00:13:32 -0000
@@ -440,7 +440,7 @@
       var showMessage = data.messages.length && !options.noMessage;
       if (showMessage) {
         Drupal.popups.message(data.messages);
-        if (!Drupal.settings.popups.popupFinalMessage) {
+        if (Drupal.settings.popups.popupFinalMessage) {
           setTimeout(Drupal.popups.close, 2500); // Autoclose the message box in 2.5 seconds.
         }
   
Index: popups.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/popups/popups.module,v
retrieving revision 1.11.2.19
diff -u -r1.11.2.19 popups.module
--- popups.module	20 Nov 2008 21:18:57 -0000	1.11.2.19
+++ popups.module	13 Feb 2009 00:13:32 -0000
@@ -271,21 +271,21 @@
 
   $form['popups_always_scan'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Scan all pages for popup links.'),
+    '#title' => t('Scan all pages for popup links'),
     '#default_value' => variable_get('popups_always_scan', 0),
   );
   $form['popups_popup_final_message'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Do NOT auto-close final message.'),
-    '#default_value' => variable_get('popups_popup_final_message', 1),
+    '#title' => t('Automatically close final confirmation messages'),
+    '#default_value' => variable_get('popups_popup_final_message', 0),
   );
-  
+
   return system_settings_form($form);
 }
 
 /**
  * popups_form_alter adds this submit handler to the theme pages.
- * Set a per-theme jQuery content selector that gets passed into the js settings. 
+ * Set a per-theme jQuery content selector that gets passed into the js settings.
  *
  * @param $form
  * @param $form_state