Bug 614598 - Set feedback add-on back to beta [r=vingtetun]
authorMark Finkle <mfinkle@mozilla.com>
Thu, 16 Dec 2010 00:12:59 -0500
changeset 67131 4145b3de866633a2d202180d4505d0e036dfc031
parent 67130 1eea279a516b0cc93a3ef22846cb890da51113e1
child 67132 e41f8ed0a62954a7eabe5a68b650c27c8edcad98
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvingtetun
bugs614598
Bug 614598 - Set feedback add-on back to beta [r=vingtetun]
mobile/app/profile/extensions/Makefile.in
mobile/app/profile/extensions/feedback@mobile.mozilla.org/content/overlay.js
--- a/mobile/app/profile/extensions/Makefile.in
+++ b/mobile/app/profile/extensions/Makefile.in
@@ -39,26 +39,26 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-#ifeq (beta,$(MOZ_UPDATE_CHANNEL))
+ifeq (beta,$(MOZ_UPDATE_CHANNEL))
 EXTENSIONS = \
   feedback@mobile.mozilla.org \
   $(NULL)
 
 ABS_DIST = $(call core_abspath,$(DIST))
 
 define _PACKAGE_EXTENSIONS
 rm -f $(ABS_DIST)/bin/extensions/$(dir).xpi
 mkdir -p $(ABS_DIST)/bin/extensions
 cd $(srcdir)/$(dir)/; $(ZIP) -r9 $(ABS_DIST)/bin/extensions/$(dir).xpi *
 
 endef # do not remove the blank line!
 
 libs::
 	$(foreach dir,$(EXTENSIONS),$(_PACKAGE_EXTENSIONS))
 
-#endif
+endif
--- a/mobile/app/profile/extensions/feedback@mobile.mozilla.org/content/overlay.js
+++ b/mobile/app/profile/extensions/feedback@mobile.mozilla.org/content/overlay.js
@@ -60,20 +60,16 @@ var Feedback = {
   
         let value = Services.prefs.getPrefType(pref) == Ci.nsIPrefBranch.PREF_INVALID ? false : Services.prefs.getBoolPref(pref);
         Feedback._prefs.push({ "name": pref, "value": value });
       }
 
       let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
       Feedback._device = sysInfo.get("device");
       Feedback._manufacturer = sysInfo.get("manufacturer");
-
-      // XXX Simple debugging. Remove when tested
-      Services.console.logStringMessage("Device: " + Feedback._device);
-      Services.console.logStringMessage("Manufacturer: " + Feedback._manufacturer);
     }, false);
   },
 
   openFeedback: function(aName) {
     let pref = "extensions.feedback.url." + aName;
     let url = Services.prefs.getPrefType(pref) == Ci.nsIPrefBranch.PREF_INVALID ? "" : Services.prefs.getCharPref(pref);
     if (!url)
       return;