Merge lp:~ken-vandine/gwibber/lp_937607 into lp:gwibber

[Ken VanDine]

Make sure we don't keep references to Dee.ModelIter that has been removed (LP: #937607)

[David Klasinc (bigwhale)]

Looks good.

review: Approve

=== modified file 'libgwibber/streams.vala'
--- libgwibber/streams.vala	2012-03-08 15:07:19 +0000
+++ libgwibber/streams.vala	2012-03-14 20:57:39 +0000
@@ -212,6 +212,15 @@
                 model = null;
                 model = create_model ();
               }
+              model.row_removed.connect((_m, _i) => {
+                foreach (var v in seen.entries)
+                {
+                  if (v.value == _i)
+                  {
+                    seen.unset(v.key);
+                  }
+                }
+              });
               Idle.add(() => {
                 refresh_model_async.begin ();
                 return false;
@@ -696,22 +705,25 @@
             {
               iter = seen.get(_textid);
               if (iter == null)
+                seen.unset(_textid);
+              else
+              {
+                string[] _accounts_array = (string[])_model.get_value (iter, StreamModelColumn.ACCOUNTS);
+                if (!(_acct in _accounts_array))
+                {
+                  foreach (var a in _accounts_array)
+                    builder.add ("s", a);
+                  var _accounts = new Variant ("as",  builder);
+                  _model.set_value (iter, StreamModelColumn.ACCOUNTS, _accounts);
+                }
+                _model.set_value (iter, StreamModelColumn.MESSAGE, _text);
+                _model.set_value (iter, StreamModelColumn.HTML, _html);
+                _model.set_value (iter, StreamModelColumn.TIMESTRING, _t);
+                _model.set_value (iter, StreamModelColumn.LIKES, _likes);
+                _model.set_value (iter, StreamModelColumn.LIKED, _liked);
+                iter = null;
                 return;
-              string[] _accounts_array = (string[])_model.get_value (iter, StreamModelColumn.ACCOUNTS);
-              if (!(_acct in _accounts_array))
-              {
-                foreach (var a in _accounts_array)
-                  builder.add ("s", a);
-                var _accounts = new Variant ("as",  builder);
-                _model.set_value (iter, StreamModelColumn.ACCOUNTS, _accounts);
               }
-              _model.set_value (iter, StreamModelColumn.MESSAGE, _text);
-              _model.set_value (iter, StreamModelColumn.HTML, _html);
-              _model.set_value (iter, StreamModelColumn.TIMESTRING, _t);
-              _model.set_value (iter, StreamModelColumn.LIKES, _likes);
-              _model.set_value (iter, StreamModelColumn.LIKED, _liked);
-              iter = null;
-              return;
             }
 
             var _accounts = new Variant ("as",  builder);