commit 6802ca4ac71da099aac4be52489d6f0bc7b2f60a
parent 9ab7e4ff24d6c718415fecae8ad58acbc62e223e
Author: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Sat, 27 Oct 2007 19:08:21 +0000
revert that last change. aliases should be able to have spaces
git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@623 5c8cc53c-5e98-4d25-b20a-d8db53a31250
Diffstat:
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/lib/sup/contact.rb b/lib/sup/contact.rb
@@ -1,7 +1,5 @@
module Redwood
-class InvalidAliasError < StandardError; end
-
class ContactManager
include Singleton
@@ -25,8 +23,6 @@ class ContactManager
def contacts; @p2a.keys; end
def set_contact person, aalias
- raise InvalidAliasError unless valid_alias? aalias
-
if(pold = @a2p[aalias]) && (pold != person)
drop_contact pold
end
@@ -43,10 +39,6 @@ class ContactManager
def alias_for person; @p2a[person]; end
def is_contact? person; @p2a.member? person; end
- def valid_alias? a
- a =~ /^\S+$/
- end
-
def save
File.open(@fn, "w") do |f|
@p2a.each do |p, a|
diff --git a/lib/sup/modes/contact-list-mode.rb b/lib/sup/modes/contact-list-mode.rb
@@ -6,11 +6,7 @@ module CanAliasContacts
if a.empty?
ContactManager.drop_contact p
else
- begin
- ContactManager.set_contact p, a
- rescue InvalidAliasError
- BufferManager.flash "Error: nickname cannot contain spaces."
- end
+ ContactManager.set_contact p, a
end
end
end