### Eclipse Workspace Patch 1.0
#P vcard
Index: vcard.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vcard/vcard.module,v
retrieving revision 1.6
diff -u -r1.6 vcard.module
--- vcard.module	3 Nov 2006 23:19:43 -0000	1.6
+++ vcard.module	3 May 2007 11:11:06 -0000
@@ -17,7 +17,9 @@
     $items[] = array(
        'path' => 'admin/settings/vcard',
        'title' => t('vCard'),
-       'callback' => 'vcard_admin_settings',
+       'callback' => 'drupal_get_form',
+       'callback arguments' => 'vcard_admin_settings',
+       'description' => 'Configure the profile field mappings.',
        'access' => user_access('administer site configuration'),
        'type' => MENU_NORMAL_ITEM);
   }
@@ -40,25 +42,23 @@
     drupal_set_message(t('The PEAR package Contact_Vcard_Build (required by vcard.module) has not been installed properly, please read INSTALL.txt.'), 'error');
   }
 
-  if (module_exist('profile')) {
-    $form['field_mappings'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Field Mappings'),
-      '#description' => t('This section is only enabled if the "profiles" module is enabled. When enabled it will provide a dropdown selection box for each defined profile item of type textfield, textarea, or url.'),
+  $form['field_mappings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Field Mappings'),
+    '#description' => t('This section is only enabled if the "profiles" module is enabled. When enabled it will provide a dropdown selection box for each defined profile item of type textfield, textarea, or url.'),
+  );
+  $options = array('' => 'Select a property');  
+  $options = $options + _vcard_properties();
+  foreach (_vcard_profile_fields() as $fid => $title) {
+    $form['field_mappings']['vcard_profile_'. $fid] = array(
+      '#type' => 'select',
+      '#title' => t('Property for ') . $title,
+      '#default_value' => variable_get('vcard_profile_'. $fid,""),
+      '#options' => $options,
     );
-    $options = array('' => 'Select a property');  
-    $options = $options + _vcard_properties();
-    foreach (_vcard_profile_fields() as $fid => $title) {
-      $form['field_mappings']['vcard_profile_'. $fid] = array(
-        '#type' => 'select',
-        '#title' => t('Property for ') . $title,
-        '#default_value' => variable_get('vcard_profile_'. $fid,""),
-        '#options' => $options,
-      );
-    }
   }
 
-  return system_settings_form('vcard_admin_settings', $form);
+  return system_settings_form($form);
 }
 
 function vcard_user($type, &$edit, &$user) {
Index: vcard.info
===================================================================
RCS file: vcard.info
diff -N vcard.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vcard.info	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,6 @@
+; $Id $
+name = "vCard"
+description = "Allows vcard export of user data"
+dependencies = profile
+; package = 
+version = "$Name$"