Index: userinfo.tcl
===================================================================
--- userinfo.tcl	(revision 1979)
+++ userinfo.tcl	(working copy)
@@ -296,16 +296,8 @@
     # This strange trim is to distinguish different "about"s
     set about [$tab insert end about -text [string trim [::msgcat::mc "About "]]]
     
-    set b [pack_frame $about.bday [::msgcat::mc "Birthday"]]
-    if {!$editable} {
+    set b [pack_frame $about.bday [string trim [::msgcat::mc "Birthday"]]]
 	pack_entry $jid $b 0 bday [::msgcat::mc "Birthday:"]
-    } else {
-	pack_spinbox $jid $b 0 0 bdayyear 1900 1000000 [::msgcat::mc "Year:"]
-	grid [label $b.space0 -text " "] -row 0 -column 2
-	pack_spinbox $jid $b 0 3 bdaymonth 0 12 [::msgcat::mc "Month:"]
-	grid [label $b.space1 -text " "] -row 0 -column 5
-	pack_spinbox $jid $b 0 6 bdayday 0 31 [::msgcat::mc "Day:"]
-    }
 
     set a [pack_frame $about.about [string trim [::msgcat::mc "About "]]]
     set sw [ScrolledWindow $a.sw -scrollbar vertical]
@@ -336,7 +328,7 @@
 		     userinfo(desc,$jid) $editable]]]
     set userinfo(descfield,$jid) $a.text
 
-    manage_focus $jid about $b.bday[expr {$editable ? "year" : ""}] $editable
+    manage_focus $jid about $b.bday $editable
 
     if {!$editable} {
 	set photo [$tab insert end photo -text [::msgcat::mc "Photo"] \
@@ -613,14 +605,7 @@
 	ORG      {parse_vcard_org_item $jid $subels}
 	TITLE    {set userinfo(title,$jid)     $cdata}
 	ROLE     {set userinfo(role,$jid)      $cdata}
-	BDAY     {
-	    set userinfo(bday,$jid)      $cdata
-	    if {![catch {set bday [clock scan $cdata]}]} {
-		set userinfo(bdayyear,$jid) [clock format $bday -format %Y]
-		set userinfo(bdaymonth,$jid) [clock format $bday -format %m]
-		set userinfo(bdayday,$jid) [clock format $bday -format %d]
-	    }
-	}
+	BDAY     {set userinfo(bday,$jid)      $cdata}
 	UID      {set userinfo(uid,$jid)       $cdata}
 	URL      {set userinfo(url,$jid)       $cdata}
 	DESC     {set userinfo(desc,$jid)      $cdata}
@@ -929,14 +914,6 @@
     append_tag tags ORG ""   [make_org_item $jid]
     append_tag tags TITLE    $userinfo(title,$jid)
     append_tag tags ROLE     $userinfo(role,$jid)
-    if {($userinfo(bdaymonth,$jid) > 0) && ($userinfo(bdayday,$jid) > 0)} {
-	set userinfo(bday,$jid) [format "%d-%02d-%02d" \
-		[string trimleft $userinfo(bdayyear,$jid) "0"] \
-		[string trimleft $userinfo(bdaymonth,$jid) "0"] \
-		[string trimleft $userinfo(bdayday,$jid) "0"]]
-    } else {
-	set userinfo(bday,$jid) ""
-    }
     append_tag tags BDAY     $userinfo(bday,$jid)
     append_tag tags UID      $userinfo(uid,$jid)
     append_tag tags URL      $userinfo(url,$jid)