[dia] Fix data emission for ungroup undo

[Hans Breuer <hans src gnome org>]

commit 7b9372306dcbe3c2ccfdd9d774f94eab69e0c011
Author: Hans Breuer <hans breuer org>
Date:   Sat Jul 20 20:13:47 2013 +0200

    Fix data emission for ungroup undo
    
    The diagram tree was rightly complaining about
    invalid objects being signaled for add/remove.

 app/undo.c  |    7 -------
 lib/layer.c |    2 +-
 2 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/app/undo.c b/app/undo.c
index 733a016..bf8cd7a 100644
--- a/app/undo.c
+++ b/app/undo.c
@@ -1089,13 +1089,6 @@ ungroup_objects_revert(struct UngroupObjectsChange *change, Diagram *dia)
 
     list = g_list_next(list);
   }
-
-  data_emit (DIA_DIAGRAM_DATA(dia), change->layer, change->group, "object_add");
-  list = change->obj_list;
-  while (list) {
-    data_emit (DIA_DIAGRAM_DATA(dia), change->layer, list->data, "object_remove");
-    list = g_list_next(list);
-  }
 }
 
 static void
diff --git a/lib/layer.c b/lib/layer.c
index 0fc9fed..e8057b0 100644
--- a/lib/layer.c
+++ b/lib/layer.c
@@ -584,9 +584,9 @@ layer_replace_object_with_list(Layer *layer, DiaObject *remove_obj,
   list = g_list_find(layer->objects, remove_obj);
 
   g_assert(list!=NULL);
-  set_parent_layer(remove_obj, NULL);
   dynobj_list_remove_object(remove_obj);
   data_emit (layer_get_parent_diagram(layer), layer, remove_obj, "object_remove");
+  set_parent_layer(remove_obj, NULL);
   g_list_foreach(insert_list, set_parent_layer, layer);
 
   if (list->prev == NULL) {