Index: linkit.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/linkit/linkit.js,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 linkit.js
--- linkit.js	6 Jan 2011 01:59:59 -0000	1.6.2.1
+++ linkit.js	24 Jan 2011 18:10:05 -0000
@@ -39,7 +39,7 @@
    * IMCE integration
    */
   openFileBrowser : function () {
-    window.open(Drupal.settings.basePath + 'imce?app=Linkit|url@edit-link--2', '', 'width=760,height=560,resizable=1');
+    window.open(decodeURIComponent(Drupal.settings.linkit.IMCEurl), '', 'width=760,height=560,resizable=1');
   },
   
   /*
Index: linkit.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/linkit/linkit.module,v
retrieving revision 1.21.2.9
diff -u -r1.21.2.9 linkit.module
--- linkit.module	23 Jan 2011 23:24:30 -0000	1.21.2.9
+++ linkit.module	24 Jan 2011 18:17:58 -0000
@@ -127,6 +127,14 @@
       'linkit' => array('ajaxcall' => url('linkit/geteditresult')),
     );
 
+    // Check if we have IMCE and access to it.
+    $imce = module_invoke('imce', 'access');
+    if($imce) {
+      $settings['linkit'] = array(
+        'IMCEurl' => url('imce', array('query' => array('app' => 'Linkit|url@edit-link--2'))),
+      );
+    }
+
     drupal_add_js($settings, 'setting');
   }
   drupal_add_js(drupal_get_path('module', 'linkit') . '/linkit.js');

