beagle r4762 - trunk/beagle/firefox-extension/chrome/content

[dbera svn gnome org]

Author: dbera
Date: Mon May 19 12:32:05 2008
New Revision: 4762
URL: http://svn.gnome.org/viewvc/beagle?rev=4762&view=rev

Log:
Do not show an alert in the firefox extension if .beagle is not found. Instead show the message in the tooltip of the extension icon.
Fixes debian #463922 (the extension will _not_ create the directory if it does not exist, so this is as far as the extension will go if the directory is not found), bnc #385513.


Modified:
   trunk/beagle/firefox-extension/chrome/content/beagleOverlay.js

Modified: trunk/beagle/firefox-extension/chrome/content/beagleOverlay.js
==============================================================================
--- trunk/beagle/firefox-extension/chrome/content/beagleOverlay.js	(original)
+++ trunk/beagle/firefox-extension/chrome/content/beagleOverlay.js	Mon May 19 12:32:05 2008
@@ -114,7 +114,6 @@
         if(!this.checkEnv())
         {
             this.runStatus = this.RUN_BEAGLE_NOT_FOUND;
-            this.error(_("beagle_not_found"));
         }
         else
         {
@@ -215,7 +214,8 @@
         if(storage_directory == "")
             storage_directory = this.ENV.get("HOME") + "/.beagle";
         if (!this.FILE_UTILS.exists (storage_directory)) {
-            alert(_f("beagle_check_env_error",[storage_directory]));
+	    var errorMsg = (_f("beagle_check_env_error", [storage_directory]));
+	    this.error(errorMsg);
             return false;
         }
         this.dataPath = storage_directory + "/ToIndex";
@@ -637,9 +637,12 @@
                 // currently disabled  enable.
                 this.enable();
                 break;
-            default:
+	    case this.RUN_BEAGLE_NOT_FOUND:
+		alert(this.STATUS_ICON.getAttribute("tooltiptext"));
+		break;
+            default: // RUN_ERROR
                 // last run was an error, show the error
-                alert("Error running Beagle Indexer: " + this.RunStatus);
+                alert("Error running Beagle Indexer.");
                 break;
             }
         }