← Back to branch summary

~ubuntu-branches/ubuntu/saucy/amsn/saucy

« back to all changes in this revision

Viewing changes to roaming.tcl

  • Committer: Bazaar Package Importer
  • Author(s): Devid Antonio Filoni
  • Date: 2010-04-13 23:21:29 UTC
  • mfrom: (1.1.11 upstream) (3.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100413232129-vgpx20brdd2qavs7
Tags: 0.98.3-0ubuntu1
https://launchpad.net/bugs/449072
https://launchpad.net/bugs/562619
* Merge from Debian unstable (LP: #449072), remaining Ubuntu changes:
  - add 08_use_aplay_for_sound.dpatch patch by Festor Wailon Dacoba to use
    aplay to play sounds
  + debian/control:
    - modify iceweasel to firefox | abrowser in amsn Suggests field
    - add xdg-utils and gstreamer0.10-nice to amsn Depends field
    - mofify sox to alsa-utils in amsn Suggests field as we are now using
      aplay
* New upstream release (LP: #562619), tarball repacked according to
  debian/README.source.
* Fix missing-debian-source-format lintian warning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
roaming.tcl
1
1
 
2
 
::Version::setSubversionId {$Id: roaming.tcl 10880 2009-01-25 17:48:24Z vivia $}
 
2
::Version::setSubversionId {$Id: roaming.tcl 11891 2010-01-11 20:18:34Z vivia $}
3
3
 
4
4
snit::type ContentRoaming {
5
5
        # GetProfile, UpdateProfile,
77
77
                append xml {<PersonalStatus>true</PersonalStatus>}
78
78
                append xml {<PersonalStatusLastModified>true</PersonalStatusLastModified>}
79
79
                append xml {<StaticUserTilePublicURL>true</StaticUserTilePublicURL>}
80
 
                append xml {<Photo>true</Photo>}
81
 
                append xml {<Flags>true</Flags>}
 
80
                if {$email == "" } {
 
81
                        append xml {<Photo>true</Photo>}
 
82
                        append xml {<Flags>true</Flags>}
 
83
                }
82
84
                append xml {</ExpressionProfileAttributes>}
83
85
                append xml {</profileAttributes>}
84
86
                append xml {</GetProfile>}
111
113
                                        set last_modif [GetXmlEntry $result "GetProfileResult:ExpressionProfile:DisplayNameLastModified"]
112
114
                                        set psm [GetXmlEntry $result "GetProfileResult:ExpressionProfile:PersonalStatus"]
113
115
                                        
114
 
                                        #DP stuff
115
 
                                        set dp_resourceid [GetXmlEntry $result "GetProfileResult:ExpressionProfile:Photo:ResourceID"]
116
 
                                        ::abook::setPersonal dp_resourceid $dp_resourceid
117
 
                                        set dp_filename [GetXmlEntry $result "GetProfileResult:ExpressionProfile:Photo:Name"]
118
 
                                        ::abook::setPersonal dp_filename $dp_filename
119
 
                                        set dp_url [GetXmlEntry $result "GetProfileResult:ExpressionProfile:StaticUserTilePublicURL"]
120
 
                                        ::abook::setPersonal dp_url $dp_url
121
 
                                        set i 0
122
 
                                        while {1} {
123
 
                                                set subxml [GetXmlNode $result "GetProfileResult:ExpressionProfile:Photo:DocumentStreams" $i]
124
 
                                                incr i
125
 
                                                if  { $subxml == "" } {
126
 
                                                        break
127
 
                                                }
128
 
                                                set dsn [GetXmlEntry $subxml "DocumentStreams:DocumentStream:DocumentStreamName"]
129
 
                                                if {$dsn == "UserTileStatic"} {
130
 
                                                        set dp_mimetype [GetXmlEntry $subxml "DocumentStreams:DocumentStream:MimeType"]
131
 
                                                        ::abook::setPersonal dp_mimetype $dp_mimetype
132
 
#                                                       set dp_url [GetXmlEntry $subxml "DocumentStreams:DocumentStream:PreAuthURL"]
133
 
#                                                       ::abook::setPersonal dp_url $dp_url
 
116
                                        if {$email == "" } {
 
117
                                                #DP stuff
 
118
                                                set dp_resourceid [GetXmlEntry $result "GetProfileResult:ExpressionProfile:Photo:ResourceID"]
 
119
                                                ::abook::setPersonal dp_resourceid $dp_resourceid
 
120
                                                set dp_filename [GetXmlEntry $result "GetProfileResult:ExpressionProfile:Photo:Name"]
 
121
                                                ::abook::setPersonal dp_filename $dp_filename
 
122
                                                set dp_url [GetXmlEntry $result "GetProfileResult:ExpressionProfile:StaticUserTilePublicURL"]
 
123
                                                ::abook::setPersonal dp_url $dp_url
 
124
                                                set i 0
 
125
                                                while {1} {
 
126
                                                        set subxml [GetXmlNode $result "GetProfileResult:ExpressionProfile:Photo:DocumentStreams" $i]
 
127
                                                        incr i
 
128
                                                        if  { $subxml == "" } {
 
129
                                                                break
 
130
                                                        }
 
131
                                                        set dsn [GetXmlEntry $subxml "DocumentStreams:DocumentStream:DocumentStreamName"]
 
132
                                                        if {$dsn == "UserTileStatic"} {
 
133
                                                                set dp_mimetype [GetXmlEntry $subxml "DocumentStreams:DocumentStream:MimeType"]
 
134
                                                                ::abook::setPersonal dp_mimetype $dp_mimetype
 
135
                                                                #                                                       set dp_url [GetXmlEntry $subxml "DocumentStreams:DocumentStream:PreAuthURL"]
 
136
                                                                #                                                       ::abook::setPersonal dp_url $dp_url
 
137
                                                        }
134
138
                                                }
135
139
                                        }
136
140
                                } else {