[beagle] fix name confilct bug in beaglePrefs.js (for firefox 3.5)

[Tao Fei <taofei src gnome org>]

commit a56102700eb77cc6563b99b68acdc699a6716e73
Author: Tao Fei <Filia Tao gmail com>
Date:   Fri Jul 3 19:20:56 2009 +0800

    fix name confilct bug in beaglePrefs.js (for firefox 3.5)
    remove some debug msg (break in firefox 3.5)
    update zh-cn locale for beagle search history sidebar
    update max firfox version to 3.5.*
    update version number to 1.1.2

 beagle/firefox-extension/Makefile.am               |    4 +---
 .../chrome/content/beaglePrefs.js                  |   16 ++++++++--------
 .../chrome/content/jslib/io/dir.js                 |    2 +-
 .../chrome/content/jslib/io/dirUtils.js            |    2 +-
 .../chrome/content/jslib/io/file.js                |    2 +-
 .../chrome/content/jslib/io/fileUtils.js           |    2 +-
 .../chrome/locale/zh-CN/beagle.dtd                 |    4 +++-
 beagle/firefox-extension/install.rdf.in            |    2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/beagle/firefox-extension/Makefile.am b/beagle/firefox-extension/Makefile.am
index ddcb47a..b5cfa81 100644
--- a/beagle/firefox-extension/Makefile.am
+++ b/beagle/firefox-extension/Makefile.am
@@ -1,6 +1,6 @@
 
 PROJECT = beagle
-VERSION = 1.1.0
+VERSION = 1.1.2
 
 INSTALL_RDF = install.rdf
 INSTALL_RDF_IN = $(INSTALL_RDF).in
@@ -73,5 +73,3 @@ EXTRA_DIST =			\
 CLEANFILES =			\
 	$(PROJECT).xpi		\
 	$(INSTALL_RDF)
-
--include $(top_srcdir)/git.mk
diff --git a/beagle/firefox-extension/chrome/content/beaglePrefs.js b/beagle/firefox-extension/chrome/content/beaglePrefs.js
index 5fe8c9e..339f058 100644
--- a/beagle/firefox-extension/chrome/content/beaglePrefs.js
+++ b/beagle/firefox-extension/chrome/content/beaglePrefs.js
@@ -4,7 +4,7 @@
  */
 
 // Initiate a new preference instance.
-var gPrefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch);
+_prefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch);
 
 var beaglePref = {
    
@@ -31,14 +31,14 @@ var beaglePref = {
     //functions used to get/set pref
     func_factory:{
         'get':{
-            'bool': Function.bind(gPrefService.getBoolPref,gPrefService),
-            'int': Function.bind(gPrefService.getIntPref,gPrefService),
-            'string' : Function.bind(gPrefService.getCharPref,gPrefService)
+            'bool': Function.bind(_prefService.getBoolPref,_prefService),
+            'int': Function.bind(_prefService.getIntPref,_prefService),
+            'string' : Function.bind(_prefService.getCharPref,_prefService)
         },
         'set':{
-            'bool': Function.bind(gPrefService.setBoolPref,gPrefService),
-            'int' : Function.bind(gPrefService.setIntPref,gPrefService),
-            'string' : Function.bind(gPrefService.setCharPref,gPrefService)
+            'bool': Function.bind(_prefService.setBoolPref,_prefService),
+            'int' : Function.bind(_prefService.setIntPref,_prefService),
+            'string' : Function.bind(_prefService.setCharPref,_prefService)
         }
     },
 
@@ -320,6 +320,6 @@ var beaglePref = {
             log("first run import error");
             log(ex);
         }
-    },
+    }
 }
 
diff --git a/beagle/firefox-extension/chrome/content/jslib/io/dir.js b/beagle/firefox-extension/chrome/content/jslib/io/dir.js
index c9921b3..8e9bf0a 100644
--- a/beagle/firefox-extension/chrome/content/jslib/io/dir.js
+++ b/beagle/firefox-extension/chrome/content/jslib/io/dir.js
@@ -221,7 +221,7 @@ function() {
   return help;
 });
 
-jslibDebug('*** load: '+JS_DIR_FILE+' OK');
+//jslibDebug('*** load: '+JS_DIR_FILE+' OK');
 
 } else {
     dump("JSLIB library not loaded:\n"                                  +
diff --git a/beagle/firefox-extension/chrome/content/jslib/io/dirUtils.js b/beagle/firefox-extension/chrome/content/jslib/io/dirUtils.js
index c5f533a..4fab30a 100644
--- a/beagle/firefox-extension/chrome/content/jslib/io/dirUtils.js
+++ b/beagle/firefox-extension/chrome/content/jslib/io/dirUtils.js
@@ -173,7 +173,7 @@ get help() {
 
 }; //END CLASS 
 
-jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK');
+//jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK');
 
 } // END BLOCK JS_LIB_LOADED CHECK
 
diff --git a/beagle/firefox-extension/chrome/content/jslib/io/file.js b/beagle/firefox-extension/chrome/content/jslib/io/file.js
index 4325e06..1b93275 100644
--- a/beagle/firefox-extension/chrome/content/jslib/io/file.js
+++ b/beagle/firefox-extension/chrome/content/jslib/io/file.js
@@ -758,7 +758,7 @@ function ()
   return help;
 })
 
-jslibDebug('*** load: '+JS_FILE_FILE+' OK');
+//jslibDebug('*** load: '+JS_FILE_FILE+' OK');
 
 } // END BLOCK JS_LIB_LOADED CHECK
 
diff --git a/beagle/firefox-extension/chrome/content/jslib/io/fileUtils.js b/beagle/firefox-extension/chrome/content/jslib/io/fileUtils.js
index 9283ff4..bce9613 100644
--- a/beagle/firefox-extension/chrome/content/jslib/io/fileUtils.js
+++ b/beagle/firefox-extension/chrome/content/jslib/io/fileUtils.js
@@ -584,7 +584,7 @@
   
 };
   
-jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK');
+//jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK');
   
 } // END BLOCK JS_LIB_LOADED CHECK
   
diff --git a/beagle/firefox-extension/chrome/locale/zh-CN/beagle.dtd b/beagle/firefox-extension/chrome/locale/zh-CN/beagle.dtd
index b504644..a96fa17 100755
--- a/beagle/firefox-extension/chrome/locale/zh-CN/beagle.dtd
+++ b/beagle/firefox-extension/chrome/locale/zh-CN/beagle.dtd
@@ -31,9 +31,11 @@
 <!ENTITY beagle.run.context.menu.label              "Beagle">
 <!ENTITY beagle.run.index.link.label                "索���">
 <!ENTITY beagle.run.index.image.label               "ç´¢å¼?å?¾ç??">
-
 <!ENTITY beagle.index.link.start.label              "��">
 <!ENTITY beagle.index.link.stop.label               "å??æ­¢">
 
 <!ENTITY beagle.bookmark.index.modified.label       "ç´¢å¼?æ?´æ?¹è¿?ç??书签">
 
+<!ENTITY beagle.sidebar.title "Beagle æ??ç´¢å??å?²ä¾§è¾¹æ ?">
+<!ENTITY beagle.sidebar.commandkey "B">
+<!ENTITY beagle.sidebar.modifierskey "shift é?®">
diff --git a/beagle/firefox-extension/install.rdf.in b/beagle/firefox-extension/install.rdf.in
index 7987b77..4898b77 100644
--- a/beagle/firefox-extension/install.rdf.in
+++ b/beagle/firefox-extension/install.rdf.in
@@ -23,7 +23,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>0.8</em:minVersion>
-        <em:maxVersion>3.0.*</em:maxVersion>
+        <em:maxVersion>3.5.*</em:maxVersion>
       </Description>
     </em:targetApplication>