← Back to branch summary

~ubuntu-branches/ubuntu/precise/gwibber/precise-proposed

« back to all changes in this revision

Viewing changes to libgwibber/streams.vala

  • Committer: Package Import Robot
  • Author(s): Ken VanDine
  • Date: 2012-01-13 12:38:23 UTC
  • mto: This revision was merged to the branch mainline in revision 112.
  • Revision ID: package-import@ubuntu.com-20120113123823-cxid00tup8k99srw
Tags: upstream-3.3.2
Import upstream version 3.3.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgwibber/streams.vala
167
167
            if (stream == "home") {
168
168
              return model;
169
169
            } else {
170
 
              stream_filter = new Dee.Filter.for_key_column (StreamModelColumn.STREAM, stream);
 
170
              stream_filter = Dee.Filter.new_for_key_column (StreamModelColumn.STREAM, stream);
171
171
            }
172
 
            var filtered_model = new Dee.FilterModel (stream_filter, model);
 
172
            var filtered_model = new Dee.FilterModel (model, stream_filter);
173
173
            return filtered_model;
174
174
        }
175
175
 
176
176
        public Dee.Model? transient_filter_model (Dee.Model model, string transient)
177
177
        {
178
178
            Dee.Filter transient_filter;
179
 
            transient_filter = new Dee.Filter.for_key_column (StreamModelColumn.TRANSIENT, transient);
180
 
            var filtered_model = new Dee.FilterModel (transient_filter, model);
 
179
            transient_filter = Dee.Filter.new_for_key_column (StreamModelColumn.TRANSIENT, transient);
 
180
            var filtered_model = new Dee.FilterModel (model, transient_filter);
181
181
            return filtered_model;
182
182
        }
183
183
 
194
194
            uint schema_length = 35;
195
195
            var timer = new Timer();
196
196
 
 
197
            resources = Dee.ResourceManager.get_default ();
 
198
 
197
199
            if (!transients)
198
200
            {
199
201
              debug ("Getting non-transient model");
200
202
              Dee.SequenceModel? model = resources.load ("gwibber.stream_model") as Dee.SequenceModel;
201
 
              debug ("stream_model from resources has %u rows", model.get_n_rows ());
 
203
              if (model is Dee.Model)
 
204
                debug ("stream_model from resources has %u rows", model.get_n_rows ());
 
205
              else
 
206
                debug ("stream_model from resources isn't valid");
202
207
              if (!(model is Dee.SequenceModel))
203
208
              {
204
209
                debug ("Didn't get model from resource manager, creating a new one");
621
626
              }
622
627
            }
623
628
 
 
629
            /* escape markup in some strings, pango doesn't like it */
 
630
            if (_link_name != null)
 
631
              _link_name = GLib.Markup.escape_text (_link_name);
 
632
            if (_link_description != null)
 
633
              _link_description = GLib.Markup.escape_text (_link_description);
 
634
            if (_image_name != null)
 
635
              _image_name = GLib.Markup.escape_text (_image_name);
 
636
            if (_video_name != null)
 
637
              _video_name = GLib.Markup.escape_text (_video_name);
 
638
 
624
639
            /* FIXME: hacky scrubbing of the html, we should find a 
625
640
               better way */
626
641
            _html = _html.replace("&query", "&query");