Merge lp:~mhr3/dee/no-magic-ref-stealing into lp:dee

[Michal Hruby]

[Mikkel Kamstrup Erlandsen (kamstrup)]

This looks good in principle. Ilike the less magical ref semantics :-)

It is an API break though - so I think we need to figure out how to
align landing all of this (if we want it in Precise that is)

[Mikkel Kamstrup Erlandsen (kamstrup)]

And... *if* we want this in Precise I'd also like to see some tests
for the ref counting logic. lp:gtx that we have an optional dep on has
gtx_assert_last_unref() which is mighty handy for this - alas, as
said, this is only an optional dep... I think we need to talk about
this?

[Michal Hruby (mhr3)]

I don't think this breaks any public API, it should be completely transparent to the outside world. I'll add some tests to make sure this works properly.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Ok, Michal wins. Without this patch we get:

>>> from gi.repository import Dee
>>> m = Dee.SequenceModel.new()
>>> p = Dee.Peer.new("org.foo")
>>> s = Dee.SharedModel(back_end=m, peer=p)
>>> del m
>>> s.set_schema("s", "i")

(process:6009): dee-CRITICAL **: dee_model_get_schema: assertion `DEE_IS_MODEL (self)' failed

(process:6009): dee-CRITICAL **: dee_model_set_schema_full: assertion `DEE_IS_MODEL (self)' failed
>>>

review: Approve

=== modified file 'dee/dee-filter-model.c'
--- dee/dee-filter-model.c	2011-07-14 08:50:02 +0000
+++ dee/dee-filter-model.c	2011-10-24 19:54:23 +0000
@@ -184,6 +184,11 @@
   if (priv->on_orig_row_changed_id != 0)
     g_signal_handler_disconnect (priv->orig_model, priv->on_orig_row_changed_id);
 
+  if (priv->orig_model)
+    {
+      g_object_unref (priv->orig_model);
+    }
+
   G_OBJECT_CLASS (dee_filter_model_parent_class)->finalize (object);
 }
 
@@ -199,7 +204,8 @@
                   "creating a DeeFilterModel");
       return;
     }
-  
+ 
+  /* This will return a new reference on back-end */
   g_object_get (object, "back-end", &(priv->orig_model), NULL);
   
   /* Map the end iter of the orig_model to the end iter of our iter list */
@@ -360,6 +366,7 @@
                                   "back-end", orig_model,
                                   "proxy-signals", FALSE,
                                   NULL));
+
   return self;
 }
 

=== modified file 'dee/dee-proxy-model.c'
--- dee/dee-proxy-model.c	2011-03-03 13:13:37 +0000
+++ dee/dee-proxy-model.c	2011-10-24 19:54:23 +0000
@@ -284,12 +284,11 @@
                               GParamSpec    *pspec)
 {
   DeeProxyModelPrivate *priv = DEE_PROXY_MODEL (object)->priv;
-  
+
   switch (id)
     {
     case PROP_BACK_END:
-      /* Steal ref to the back end model */
-      priv->back_end = g_value_get_object (value);
+      priv->back_end = g_value_dup_object (value);
       break;
     case PROP_PROXY_SIGNALS:
       priv->proxy_signals = g_value_get_boolean (value);
@@ -339,8 +338,7 @@
   /**
    * DeeProxyModel:back-end:
    *
-   * The backend model used by this proxy model. The ownership of the ref to
-   * the back end model is transfered to the proxy model.
+   * The backend model used by this proxy model.
    **/
   pspec = g_param_spec_object ("back-end", "Back end",
                                "Back end model",

=== modified file 'dee/dee-shared-model.c'
--- dee/dee-shared-model.c	2011-07-14 08:50:02 +0000
+++ dee/dee-shared-model.c	2011-10-24 19:54:23 +0000
@@ -461,10 +461,9 @@
   switch (id)
   {
     case PROP_PEER:
-      /* Steal ref to peer */
       if (priv->swarm != NULL)
         g_object_unref (priv->swarm);
-      priv->swarm = g_value_get_object (value);
+      priv->swarm = g_value_dup_object (value);
       break;
     case PROP_SYNCHRONIZED:
       g_critical ("Trying to set read only property DeeSharedModel:synchronized");
@@ -551,7 +550,7 @@
   obj_class->constructed  = dee_shared_model_constructed;
 
   /**
-   * DeeSharedModel:peer: (transfer full):
+   * DeeSharedModel:peer:
    *
    * The #DeePeer that this model uses to connect to the swarm
    */
@@ -1309,6 +1308,9 @@
                        "peer", swarm,
                        NULL);
 
+  g_object_unref (back_end);
+  g_object_unref (swarm);
+
   return self;
 }