2 files changed, 6 insertions, 10 deletions

diff --git a/content/fireflix.js b/content/fireflix.js
index 0f01d26..f180379 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -33,49 +33,51 @@ var fireflix = {
   this.no_auth_info_label = this.auth_info.value;
   this.set_auth_state(this.flickr.token,false);
   if(this.flickr.token) {
    this.refresh_stuff();
   }else{
    this.on_cmd_auth();
   }
  },
  set_auth_state: function(au,inp) { /* authorized, in progress */
   this.cmd_auth_unauth.disabled = !au;
   this.b_auth.hidden = au || inp;
   this.b_auth_done.hidden = !inp;
   this.menu_auth_done.hidden = !inp;
   this.cmd_auth_done.setAttribute('disabled',!inp);
   this.auth_info.disabled = !au;
   if(au) {
    this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */
   }else{
    this.auth_info.value = this.no_auth_info_label;
   }
  },
  on_cmd_auth: function() {
   var _this = this;
   this.flickr.authorize_0(
-   function() {
+   'delete',
+   function(x,f,u) {
+    _this.openTab(u);
     _this.set_auth_state(_this.flickr.token,true);
    }, function(x,s,c,m) {
     _this.flickr_failure(x,s,c,m);
    }
   );
  },
  on_cmd_auth_done: function() {
   this.set_auth_state(this.flickr.token,false);
   var _this = this;
   this.flickr.authorize_1(
    function() {
     _this.flickr.save_token();
     _this.refresh_stuff();
     _this.set_auth_state(_this.flickr.token,false);
     _this.auth_info.value = 
      _this.flickr.user.fullname+' ['+_this.flickr.user.username+']';
    }, function(x,s,c,m) {
     _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */
     _this.flickr_failure(x,s,c,m);
    }
   );
  },
  on_cmd_auth_unauth: function() {
   this.flickr.reset_token();
diff --git a/content/flickr.js b/content/flickr.js
index add628a..b5bfa43 100644
--- a/content/flickr.js
+++ b/content/flickr.js
@@ -124,63 +124,57 @@ Flickr.prototype = {
   x.open("GET",this.api_call_url(params));
   x.onreadystatechange=function() {
    if(x.readyState!=4) return false;
    if(x.status==200) {
     var stat = x.responseXML.firstChild.getAttribute('stat');
     if(stat=='ok') {
      if(on_success) on_success(x);
     }else{
      var e = x.responseXML.getElementsByTagName('err').item(0);
      var ecode = e.getAttribute('code');
      var emsg = e.getAttribute('msg');
      dump(params.method+' failed: '+ecode+' '+emsg+'\n');
      if(on_failure) on_failure(x,stat,ecode,emsg);
     }
    }else{
     if(on_failure) on_failure(x);
    }
    return true;
   }
   x.send(null);
   return true;
  },
 
  frob: null,
- authorize_0: function(on_s, on_f) {
+ authorize_0: function(perms, on_s, on_f) {
   var _this = this;
   this.api_call(
    { method: 'flickr.auth.getFrob' },
    function(x) {
     _this.frob = xp_str('/rsp/frob',x.responseXML);
     var u = _this.api_call_url(
-     { frob: _this.frob, perms: 'delete' }, _this.auth_url );
-    var wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(
-     Components.interfaces.nsIWindowMediator );
-    var bw = wm.getMostRecentWindow('navigator:browser');
-    var b = bw.getBrowser();
-    var t = b.addTab(u);
-    b.selectedTab = t;
-    if(on_s) on_s();
+     { frob: _this.frob, perms: perms?perms:'delete' }, _this.auth_url );
+    if(on_s) on_s(x,_this.frob,u);
    }, function(x,s,c,m) {
     if(on_f) on_f(x,s,c,m);
    }
   );
  },
  token: null,
  perms: null,
  user: null,
  authorize_1: function(on_s, on_f) {
   var _this = this;
   this.api_call(
    { method: 'flickr.auth.getToken', frob: this.frob },
    function(x) {
     _this.token = xp_str('/rsp/auth/token',x.responseXML);
     _this.perms = xp_str('/rsp/auth/perms',x.responseXML);
     var u = xp_node('/rsp/auth/user',x.responseXML);
     _this.user = {
      nsid: u.getAttribute('nsid'),
      username: u.getAttribute('username'),
      fullname: u.getAttribute('fullname')
     };
     if(on_s) on_s(x);
    }, function(x,s,c,m) {
     if(on_f) on_f(x,s,c,m);