[gom] gom: Fix unsetting the repo property in GomResource

[Bastien Nocera <hadess src gnome org>]

commit e943a41e164c1894927329f8e310c028694af639
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Nov 4 17:09:30 2014 +0100

    gom: Fix unsetting the repo property in GomResource
    
    Awkward if ((foo = bar)) construct, and style fixes.

 gom/gom-resource.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/gom/gom-resource.c b/gom/gom-resource.c
index 762e3c3..21e4456 100644
--- a/gom/gom-resource.c
+++ b/gom/gom-resource.c
@@ -273,16 +273,17 @@ gom_resource_set_repository (GomResource   *resource,
 
    priv = resource->priv;
 
-   if ((old = priv->repository)) {
+   old = priv->repository;
+   if (old) {
+      g_object_remove_weak_pointer(G_OBJECT(priv->repository),
+                                   (gpointer *)&priv->repository);
       priv->repository = NULL;
-      g_object_remove_weak_pointer(G_OBJECT(old),
-                                   (gpointer  *)&priv->repository);
    }
 
    if (repository) {
       priv->repository = repository;
       g_object_add_weak_pointer(G_OBJECT(priv->repository),
-                                (gpointer  *)&priv->repository);
+                                (gpointer *)&priv->repository);
       g_object_notify_by_pspec(G_OBJECT(resource),
                                gParamSpecs[PROP_REPOSITORY]);
    }