Index: shipping/shipping.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/shipping/shipping.module,v
retrieving revision 1.43.2.3.2.1.2.14
diff -u -p -r1.43.2.3.2.1.2.14 shipping.module
--- shipping/shipping.module	24 Jul 2007 01:22:47 -0000	1.43.2.3.2.1.2.14
+++ shipping/shipping.module	13 Sep 2007 16:59:42 -0000
@@ -8,14 +8,6 @@ define('MAILVAR_SHIP_NOTICE', 'ec_mail_s
  * Drupal Hooks
  ********************************************************************/
 
-/**
- * Callback for shipping settings.
- */
-function shipping_settings() {
-  $form = ec_mail_selection_form_for_variable('shipping_settings_form', ECMAIL_TYPE_SHIP_NOTICE, t('Shipping email'), MAILVAR_SHIP_NOTICE, t('This text will be emailed to customer after their order has been shipped.'));
-  return $form;
-}
-
 function shipping_admin() {
   $output = drupal_get_form('shipping_shipfrom_table');
   return $output;
@@ -116,6 +108,12 @@ function shipping_email_settings_form() 
  */
 function shipping_form_alter($form_id, &$form) {
 
+  // On the email settings form, add the shipping notification email.
+  if ($form_id == 'store_ec_settings') {
+    $form['email_notification']['shipping_notification'] = ec_mail_selection_form_for_variable('store_settings_form', ECMAIL_TYPE_SHIP_NOTICE, t('Shipping email'), MAILVAR_SHIP_NOTICE, t('This text will be emailed to customer after their order has been shipped.'));
+    return;
+  }
+
   // On the product add/edit form, add shipping method selection.
   if (isset($form['product']) && isset($form['product']['ptype'])) {
     $ptype = $form['product']['ptype']['#value'];