← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric

« back to all changes in this revision

Viewing changes to src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/XamlG.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2010-02-02 11:39:59 UTC
  • mfrom: (1.4.4 upstream)
  • mto: (1.5.1 sid)
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: james.westby@ubuntu.com-20100202113959-n3u848nfj35yyd03
* New upstream release
* debian/control:
  + Standards version 3.8.4 (no changes needed)
* debian/patches/remove_support_for_non_debian_functionality.patch,
  debian/patches/remove_support_for_soft_debugger.patch,
  debian/patches/remove_support_for_moonlight.patch,
  debian/rules:
  + Split patch into two pieces, to make it easier to enable either
    SDB or Moonlight support with a rebuild
* debian/monodevelop-moonlight.install,
  debian/monodevelop-debugger-sdb.install,
  debian/control:
  + Create packaging data for the Soft Debugger addin and Moonlight addin -
    and comment them out of debian/control as we can't provide them on
    Debian for now

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/XamlG.cs
63
63
 
64
64
                        XmlAttribute root_class = root.Attributes ["x:Class"];
65
65
                        if (root_class == null) {
66
 
                                result.AddError (xaml_file, 0, 0, "", "Does not contain an x:Class attribute.");
 
66
                                File.WriteAllText (out_file, "");
67
67
                                return result;
68
68
                        }
69
69
 
130
130
                        if (!is_application) {
131
131
                                foreach (DictionaryEntry entry  in names_and_types) {
132
132
                                        string name = (string) entry.Key;
133
 
                                        string type = (string) entry.Value;
 
133
                                        CodeTypeReference type = (CodeTypeReference) entry.Value;
134
134
 
135
135
                                        CodeMemberField field = new CodeMemberField ();
136
136
 
138
138
                                                field.Attributes = MemberAttributes.Assembly;
139
139
 
140
140
                                        field.Name = name;
141
 
                                        field.Type = new CodeTypeReference (type);
 
141
                                        field.Type = type;
142
142
 
143
143
                                        decl_type.Members.Add (field);
144
144
 
182
182
                                if (ns != null)
183
183
                                        member_type = String.Concat (ns, ".", member_type);
184
184
 
185
 
                                res [name] = member_type;
 
185
                                CodeTypeReference type = new CodeTypeReference (member_type);
 
186
                                if (ns != null)
 
187
                                        type.Options |= CodeTypeReferenceOptions.GlobalReference;
 
188
 
 
189
                                res [name] = type;
186
190
                        }
187
191
 
188
192
                        return res;