Changeset 802

Timestamp:

07/31/08 07:36:43 (4 months ago)

Author:

kaz

Message:

• Remove cookie settings. Twitter no longer support same cookie for their web and API

Location:

trunk/twitternotifier

Files:

• components/nsTwitterNotifier.js (modified) (4 diffs)
• content/login.js (modified) (2 diffs)
• content/login.xul (modified) (1 diff)
• defaults/preferences/twitternotifier.js (modified) (1 diff)

trunk/twitternotifier/components/nsTwitterNotifier.js

@@ -114 +114 @@
   },
 
-  asyncOpen: function(noCookie) {
-    this.noCookie = noCookie;
+  asyncOpen: function() {
     this.channel.notificationCallbacks = this;
     this.channel.asyncOpen(this, null);
@@ -193 +192 @@
     //
     if (subject == this.channel) {
-      if (this.noCookie) {
-        if (topic == "http-on-modify-request") {
-          this.httpChannel().setRequestHeader("Cookie", "", false);
-        }
-        else if (topic == "http-on-examine-response") {
-          this.httpChannel().setResponseHeader("Set-Cookie", "", false);
-        }
+      if (topic == "http-on-modify-request") {
+        this.httpChannel().setRequestHeader("Cookie", "", false);
+      }
+      else if (topic == "http-on-examine-response") {
+        this.httpChannel().setResponseHeader("Set-Cookie", "", false);
       }
 
@@ -321 +318 @@
       request.setRequestHeader("If-Modified-Since", this._lastAccess[request.callback]);
     }
-
+    /*
     request.setRequestHeader("X-Twitter-Client", "TwitterFox");
     request.setRequestHeader("X-Twitter-Client-URL", "Http://www.naan.net/twitter/TwitterFox.xml");
     request.setRequestHeader("X-Twitter-Client-Version", "$VERSION$");
-
+    */
     this.log(requestURL + ":" + this._lastAccess[request.callback]);
 
@@ -335 +332 @@
       .getService(Components.interfaces.nsIPrefBranch);
 
-    request.asyncOpen(pref.getBoolPref("extensions.twitternotifier.noCookie"));
+    request.asyncOpen();
     return request;
   },

trunk/twitternotifier/content/login.js

@@ -31 +31 @@
 
     $("popup-autoclose").checked = this.util.pref().getBoolPref("autoClose");
-    $("no-cookie").checked       = !this.util.pref().getBoolPref("noCookie");
     $("balloon-popup").checked   = this.util.pref().getBoolPref("popup");
 
@@ -286 +285 @@
     this.util.pref().setIntPref("popup-interval", $("popup-interval").value);
     this.util.pref().setBoolPref("autoClose", $("popup-autoclose").checked);
-    this.util.pref().setBoolPref("noCookie", !$("no-cookie").checked);
     this.util.pref().setBoolPref("popup", $("balloon-popup").checked);
 

trunk/twitternotifier/content/login.xul

@@ -136 +136 @@
         <row>
           <hbox align="center">
-            <label value="&twitternotifier.cookie;"/>
-          </hbox>
-          <checkbox id="no-cookie" label="&twitternotifier.overwriteCookie;" tooltiptext="&twitternotifier.overwriteCookie.tooltip;"/>
-        </row>
-        <row>
-          <hbox align="center">
             <label value="&twitternotifier.sound;"/>
           </hbox>

trunk/twitternotifier/defaults/preferences/twitternotifier.js

@@ -2 +2 @@
 pref("extensions.twitternotifier.popup-interval", 3);
 pref("extensions.twitternotifier.popup", true);
-pref("extensions.twitternotifier.autoClose", true);
+pref("extensions.twitternotifier.autoClose", false);
 pref("extensions.twitternotifier.togglePopup", "P,,accel shift");
 pref("extensions.twitternotifier.insertURL", "L,,accel shift");
 pref("extensions.twitternotifier.currentUser", "");
 pref("extensions.twitternotifier.login", true);
-pref("extensions.twitternotifier.noCookie", false);
 pref("extensions.twitternotifier.sound", false);
 pref("extensions.twitternotifier.soundFile", "");