Index: languageicons.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/languageicons/languageicons.admin.inc,v
retrieving revision 1.7
diff -u -p -r1.7 languageicons.admin.inc
--- languageicons.admin.inc	2 Mar 2010 15:31:11 -0000	1.7
+++ languageicons.admin.inc	11 Jan 2011 02:04:53 -0000
@@ -19,16 +19,25 @@ function languageicons_admin_settings() 
     '#type' => 'fieldset',
     '#title' => t('Add language icons'),
     '#description' => t('Link types to add language icons.'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
   );
   $form['show']['languageicons_show_node'] = array(
     '#type' => 'checkbox',
     '#title' => t('Node links'),
     '#default_value' => variable_get('languageicons_show_node', 1),
+    '#disabled' => TRUE,
   );
   $form['show']['languageicons_show_block'] = array(
     '#type' => 'checkbox',
     '#title' => t('Language switcher block'),
     '#default_value' => variable_get('languageicons_show_block', 1),
+    '#disabled' => TRUE,
+  );
+  $form['show']['disabled'] = array(
+    '#prefix' => '<div class="messages error">',
+    '#markup' => t('These options are currently disabled due to a bug that cannot currently be resolved. They may be reintroduced at a later stage.'),
+    '#suffix' => '</div>',
   );
   $form['languageicons_placement'] = array(
     '#type' => 'radios',
Index: languageicons.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/languageicons/languageicons.module,v
retrieving revision 1.18
diff -u -p -r1.18 languageicons.module
--- languageicons.module	22 Dec 2010 11:56:27 -0000	1.18
+++ languageicons.module	11 Jan 2011 02:04:53 -0000
@@ -68,7 +68,7 @@ function languageicons_menu() {
  *   them here. See http://drupal.org/node/1005144 for more info.
  */
 function languageicons_language_switch_links_alter(array &$links, $type, $path) {
-  if (variable_get('languageicons_show_block', 1)) {
+  if (variable_get('languageicons_show_block', 1) || variable_get('languageicons_show_node', 1)) {
     foreach (array_keys($links) as $langcode) {
       languageicons_link_add($links[$langcode]);
     }
@@ -76,24 +76,6 @@ function languageicons_language_switch_l
 }
 
 /**
- * Implements hook_node_view_alter().
- *
- * Adds language icons to node links.
- */
-function languageicons_node_view_alter(&$build) {
-  $node = $build['#node'];
-  if (variable_get('languageicons_show_node', 1) && (!empty($node->tnid)) && $translations = module_invoke('translation', 'node_get_translations', $node->tnid)) {
-    $links = &$build['links']['translation']['#links'];
-    foreach ($translations as $langcode => $translation) {
-      $index = 'translation_' . $langcode;
-      if (!empty($links[$index])) {
-        languageicons_link_add($links[$index]);
-      }
-    }
-  }
-}
-
-/**
  * Add language icon to link.
  *
  * The language icon may be a different language as the destination page, can be passed in 'language_icon'.