Common subdirectories: privatemsg/pm_block_user and privatemsg_new/pm_block_user
Common subdirectories: privatemsg/pm_email_notify and privatemsg_new/pm_email_notify
Common subdirectories: privatemsg/privatemsg_filter and privatemsg_new/privatemsg_filter
Common subdirectories: privatemsg/privatemsg_limits and privatemsg_new/privatemsg_limits
diff privatemsg/privatemsg.module privatemsg_new/privatemsg.module
682a683,690
>     'privatemsg_count'  => array(
>       'file'                  => 'privatemsg.theme.inc',
>       'path'                  => drupal_get_path('module', 'privatemsg')      
>     ),      
>     'privatemsg_block_menu'  => array(
>       'file'                  => 'privatemsg.theme.inc',
>       'path'                  => drupal_get_path('module', 'privatemsg')      
>     ),            
1403c1411
<       $block = _privatemsg_block_menu();
---
>       $block = theme('privatemsg_block_menu');
1436,1443d1443
< function privatemsg_title_callback($title = NULL) {
<   $count = privatemsg_unread_count();
< 
<   if ($count > 0) {
<     return format_plural($count, 'Messages (1 new)', 'Messages (@count new)');
<   }
<   return t('Messages');
< }
1464,1481d1463
< function _privatemsg_block_menu() {
<   $block = array();
< 
<   $links = array();
<   if (privatemsg_user_access('write privatemsg')) {
<     $links[] = l(t('Write new message'), 'messages/new');
<   }
<   if (privatemsg_user_access('read privatemsg') || privatemsg_user_access('read all private messages') ) {
<     $links[] = l(privatemsg_title_callback(), 'messages');
<   }
<   if (count($links)) {
<     $block = array(
<       'subject' => t('Private messages'),
<       'content' => theme('item_list', array('items' => $links)),
<     );
<   }
<   return $block;
< }
Common subdirectories: privatemsg/privatemsg_realname and privatemsg_new/privatemsg_realname
Common subdirectories: privatemsg/privatemsg_roles and privatemsg_new/privatemsg_roles
Common subdirectories: privatemsg/privatemsg_rules and privatemsg_new/privatemsg_rules
diff privatemsg/privatemsg.theme.inc privatemsg_new/privatemsg.theme.inc
276a277,309
>  * Used to display number of messages on 
>  * the private message block
>  * 
>  * 
>  */
> function theme_privatemsg_count($variables){
>   $count = privatemsg_unread_count();
> 
>   if ($count > 0) {
>     return format_plural($count, 'Messages (1 new)', 'Messages (@count new)');
>   }
>   return t('Messages');    
> }
> 
> function theme_privatemsg_block_menu($variables){
>   $block = array();
> 
>   $links = array();
>   if (privatemsg_user_access('write privatemsg')) {
>     $links[] = l(t('Write new message'), 'messages/new');
>   }
>   if (privatemsg_user_access('read privatemsg') || privatemsg_user_access('read all private messages') ) {
>     $links[] = l(theme('privatemsg_count'), 'messages');
>   }
>   if (count($links)) {
>     $block = array(
>       'subject' => t('Private messages'),
>       'content' => theme('item_list', array('items' => $links)),
>     );
>   }
>   return $block;
> }
> /**
Common subdirectories: privatemsg/styles and privatemsg_new/styles
Common subdirectories: privatemsg/views and privatemsg_new/views