rpms/dia/devel dia-0.95-diagram_ungroup_selected_v2.patch, NONE, 1.1 dia.spec, 1.11, 1.12

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15936

Modified Files:
	dia.spec 
Added Files:
	dia-0.95-diagram_ungroup_selected_v2.patch 
Log Message:
* Tue Jun  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-4
- Add a patch from upstream which fixes a crash when ungrouping
  multiple selected groups at once (bz 194149):
  http://bugzilla.gnome.org/show_bug.cgi?id=334771


dia-0.95-diagram_ungroup_selected_v2.patch:

--- NEW FILE dia-0.95-diagram_ungroup_selected_v2.patch ---
--- app/diagram.c.orig	2006-04-27 16:44:03.000000000 +0200
+++ app/diagram.c	2006-05-02 10:39:54.000000000 +0200
@@ -1139,7 +1139,7 @@
   DiaObject *group;
   GList *group_list;
 /*   GList *list; */
-  GList *selected;
+  GList *selected, *selection_copy;
   int group_index;
   int any_groups = 0;
   
@@ -1148,7 +1148,8 @@
     return;
   }
   
-  selected = dia->data->selected;
+  selection_copy = g_list_copy(dia->data->selected);
+  selected = selection_copy;
   while (selected != NULL) {
     group = (DiaObject *)selected->data;
 
@@ -1188,6 +1189,7 @@
     }
     selected = g_list_next(selected);
   }
+  g_list_free(selection_copy);
   
   if (any_groups) {
     diagram_modified(dia);


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dia.spec	23 May 2006 11:22:11 -0000	1.11
+++ dia.spec	6 Jun 2006 18:48:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		dia
 Version:	0.95
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	Diagram drawing program
 Group:		Applications/Multimedia
@@ -11,6 +11,7 @@
 Patch2:         dia-0.95-pre6-help.patch
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
 Patch4:         dia-0.95-formatstring.patch
+Patch5:         dia-0.95-diagram_ungroup_selected_v2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
 BuildRequires:	intltool docbook-utils docbook-style-dsssl docbook-style-xsl
@@ -30,6 +31,7 @@
 %patch2 -p1 -b .help
 %patch3 -p1 -b .fallbacktoxpmicons
 %patch4 -p1 -b .formatstring
+%patch5 -p0 -b .ungroup
 
 
 %build
@@ -99,6 +101,11 @@
 
 
 %changelog
+* Tue Jun  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-4
+- Add a patch from upstream which fixes a crash when ungrouping
+  multiple selected groups at once (bz 194149):
+  http://bugzilla.gnome.org/show_bug.cgi?id=334771
+
 * Tue May 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-3
 - Fix CVE-2006-2453.