? .DS_Store
? .cvsignore
? browser
? media-popup.patch
? media.interpolateUrl.patch
? images/icons/tango
? images/icons/tango-icon-theme-0.8.90.tar.gz
Index: media.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.admin.inc,v
retrieving revision 1.23
diff -u -p -r1.23 media.admin.inc
--- media.admin.inc	11 Nov 2010 23:11:38 -0000	1.23
+++ media.admin.inc	19 Nov 2010 15:09:03 -0000
@@ -297,19 +297,19 @@ function media_admin_type_list() {
     $row[] = array('data' => t($info->label));
 
     // Set the edit column.
-    $row[] = array('data' => l(t('settings'), 'admin/structure/media/manage/' . $type_url_str));
+    $row[] = array('data' => l(t('settings'), 'admin/config/media/types/manage/' . $type_url_str));
 
     if ($field_ui) {
       // Manage fields.
-      $row[] = array('data' => l(t('manage fields'), 'admin/structure/media/manage/' . $type_url_str . '/fields'));
+      $row[] = array('data' => l(t('manage fields'), 'admin/config/media/types/manage/' . $type_url_str . '/fields'));
 
       // Display fields.
-      $row[] = array('data' => l(t('manage display'), 'admin/structure/media/manage/' . $type_url_str . '/display'));
+      $row[] = array('data' => l(t('manage display'), 'admin/config/media/types/manage/' . $type_url_str . '/display'));
     }
 
     // Set the delete column.
     if (empty($type->base)) {
-      $row[] = array('data' => l(t('delete'), 'admin/structure/media/manage/' . $type_url_str . '/delete'));
+      $row[] = array('data' => l(t('delete'), 'admin/config/media/types/manage/' . $type_url_str . '/delete'));
     }
     else {
       $row[] = array('data' => '');
Index: media.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.module,v
retrieving revision 1.57
diff -u -p -r1.57 media.module
--- media.module	15 Nov 2010 13:13:16 -0000	1.57
+++ media.module	19 Nov 2010 15:09:04 -0000
@@ -70,7 +70,7 @@ function media_menu() {
   $items['admin/config/media/types/manage/%media_type'] = array(
     'title' => 'Manage media',
     'title callback' => 'media_type_page_title',
-    'title arguments' => array(4),
+    'title arguments' => array(5),
     'description' => 'Manage files used on your site.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('media_admin_type_manage_form', 4),
@@ -1115,7 +1115,7 @@ function media_entity_info() {
       'label' => $bundle_info->label,
       'path' => 'admin/config/media/types/manage/%media_type',
       'real path' => 'admin/config/media/types/manage/' . $type,
-      'bundle argument' => 4,
+      'bundle argument' => 5,
       // @TODO: Add an 'administer media types' perm?
       'access arguments' => array('administer site configuration'),
     );