Index: contrib/image_ncck/image_ncck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/image_ncck/image_ncck.module,v
retrieving revision 1.4.4.4
diff -u -r1.4.4.4 image_ncck.module
--- contrib/image_ncck/image_ncck.module	27 May 2008 02:37:01 -0000	1.4.4.4
+++ contrib/image_ncck/image_ncck.module	29 May 2008 18:21:39 -0000
@@ -348,6 +348,7 @@
         'formatter' => NULL,
         'node' => NULL),
       ),
+	);
 }
 
 function theme_image_ncck_image_embed($field, $item, $formatter, $node) {
Index: contrib/video_cck/video_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/video_cck/video_cck.module,v
retrieving revision 1.5.4.5
diff -u -r1.5.4.5 video_cck.module
--- contrib/video_cck/video_cck.module	29 May 2008 00:13:24 -0000	1.5.4.5
+++ contrib/video_cck/video_cck.module	29 May 2008 22:26:14 -0000
@@ -286,11 +286,66 @@
 
 /** Implementation of hook_widget **/
 
-function video_cck_widget($op, &$node, $field, &$node_field) {
-  if (module_hook('emfield', 'emfield_widget')) {
-    return emfield_emfield_widget($op, $node, $field, $node_field, 'video_cck');
-  }
-}
+function video_cck_widget(&$form, &$form_state, $field, $items, $delta = 0) {
+$form[$field['field_name']] = array('#tree' => TRUE);
+      $textfield = 'embed';
+	  $module = $field[module];
+      $providers = emfield_allowed_providers($field, $module);
+      $urls = array();
+      $additional_form_elements = array();
+      foreach ($providers as $provider) {
+        // don't check providers not allowed
+        if (variable_get('emfield_allow_'. $module .'_'. $provider->name, TRUE)) {
+          $info = emfield_include_invoke($module, $provider->name, 'info');
+          $urls[] = l($info['name'], $info['url'], array('target' => '_blank'));
+          $additional_element = emfield_include_invoke($module, $provider->name, 'form');
+          if ($additional_element) {
+            $additional_form_elements[$provider->name] = $additional_element;
+          }
+        }
+      }
+      $textfield_title = t($field['widget']['label']);
+      if (!(empty($field['widget']['description']))) {
+        $textfield_description = $field['widget']['description'];
+      }
+      else {
+        $textfield_description = t('Enter the URL or Embed Code here. The embedded third party content will be parsed and displayed appropriately from this.');
+      }
+      $textfield_description .= '<br />'. t('The following services are provided: !urls', array('!urls' => implode(', ', $urls)));
+	  $form[$field['field_name']][0][$textfield] = array(
+          '#type' => 'textfield',
+          '#title' => $textfield_title, //t($field['widget']['label']),
+          '#description' => $textfield_description,
+          '#default_value' => isset($node_field[0][$textfield]) ? $node_field[0][$textfield] : '',
+          '#required' => $field['required'],
+          '#maxlength' => 2048,
+        );
+        if ($textfield == 'embed') {
+          $value = isset($node_field[0]['value']) ? $node_field[0]['value'] : '';
+          $form[$field['field_name']][0]['value'] = array(
+            '#type' => 'value',
+            '#value' => $value,
+          );
+          if (!empty($additional_form_elements)) {
+            foreach ($additional_form_elements as $key => $element) {
+              $form[$field['field_name']][0][$key] = $element;
+            }
+          }
+          if ($value) {
+            $info = emfield_include_invoke($module, $node_field[0]['provider'], 'info');
+            $form[$field['field_name']][0]['value_markup'] = array(
+              '#type' => 'item',
+              '#value' => t('(@provider ID: !value)', array('@provider' => $info['provider'], '!value' => l($value, emfield_include_invoke($module, $info['provider'], 'embedded_link', $value, $node_field[0]['data']), array('target' => '_blank')))),
+            );
+          }
+          foreach (module_implements('emfield_widget_extra') as $module) {
+            $form[$field['field_name']][$delta][$module] = module_invoke($module, 'emfield_widget_extra', 'form', $node, $field, $node_field[0]);
+          }
+        }
+}
+   
+	
+	
 
 function video_cck_embed_form($field, $item, $formatter, $node) {
   $embed = $item['value'];
@@ -483,3 +538,9 @@
     $item = $items[0];
     print theme('video_cck_video_video', $field, $item, 'video_video', $node);
 }
+
+function video_cck_content_is_empty($item, $field) {
+           print_r($item);
+		   return TRUE;
+
+}
\ No newline at end of file
Index: emfield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/emfield/emfield.module,v
retrieving revision 1.12.4.6
diff -u -r1.12.4.6 emfield.module
--- emfield.module	29 May 2008 00:13:24 -0000	1.12.4.6
+++ emfield.module	29 May 2008 20:39:56 -0000
@@ -346,7 +346,7 @@
   }
 }
 
-function emfield_emfield_widget($op, &$node, $field, &$node_field, $module) {
+function emfield_emfield_widget(&$form, &$form_state, $field, $items, $delta = 0,$module) {
 //  $module = $field['widget']['helper_module'];
   switch ($op) {
     case 'prepare form values':