From f75bd6bc2e645b227b44ffa239bf962b695d8a12 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Fri, 29 Oct 2010 13:05:35 -0700
Subject: [PATCH] whoops, taking out queue stuff untill i finish

---
 lib/diaspora/user/friending.rb | 4 ++--
 spec/models/user_spec.rb       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb
index 96144c910..db3a30c4d 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -72,7 +72,7 @@ module Diaspora
           activate_friend(friend_request.person, destination_aspect)
           Rails.logger.info("#{self.real_name}'s friend request has been accepted")
           friend_request.destroy
-          Notifier.async.request_accepted(self, friend_request.person, destination_aspect).deliver.commit(1)
+          Notifier.request_accepted(self, friend_request.person, destination_aspect)
 
         #this is a new friend request
         elsif !from_me 
@@ -80,7 +80,7 @@ module Diaspora
           self.save
           Rails.logger.info("#{self.real_name} has received a friend request")
           friend_request.save
-          Notifier.async.new_request(self, friend_request.person).deliver.commit(1)
+          Notifier.new_request(self, friend_request.person).deliver
         else
           Rails.logger.info("unsolicited friend request: #{friend_request.to_json}")
         end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 032422538..a1735b625 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -132,7 +132,8 @@ describe User do
         user.language.should == 'fr'
       end
     end
-  end
+
+   end
 
   describe ".build" do
     context 'with valid params' do