dia r4192 - in trunk: . app

[hans svn gnome org]

Author: hans
Date: Sun Jan 11 23:16:14 2009
New Revision: 4192
URL: http://svn.gnome.org/viewvc/dia?rev=4192&view=rev

Log:
2009-01-12  Hans Breuer  <hans breuer org>

	* app/sheets_dialog_callbacks.c : don't leak a superfluous SheetObject
	fixes bug #564677



Modified:
   trunk/ChangeLog
   trunk/app/sheets_dialog_callbacks.c

Modified: trunk/app/sheets_dialog_callbacks.c
==============================================================================
--- trunk/app/sheets_dialog_callbacks.c	(original)
+++ trunk/app/sheets_dialog_callbacks.c	Sun Jan 11 23:16:14 2009
@@ -1468,7 +1468,6 @@
   SheetMod *sm;
   SheetObjectMod *som;
   SheetObjectMod *som_new;
-  SheetObject *so;
 
   sm = gtk_object_get_data(GTK_OBJECT(target_wrapbox), "sheet_mod");
   som = gtk_object_get_data(GTK_OBJECT(active_button), "sheet_object_mod");
@@ -1476,18 +1475,21 @@
   if (!som)
     return;
 
-  so = g_new0(SheetObject, 1);
-  so->object_type = g_strdup(som->sheet_object.object_type);
-  so->description = g_strdup(som->sheet_object.description);
-  so->pixmap = som->sheet_object.pixmap;
-  so->user_data = som->sheet_object.user_data;
-  so->user_data_type = som->sheet_object.user_data_type;
-  so->line_break = FALSE;          /* must be false--we don't copy linebreaks */
-  so->pixmap_file = g_strdup(som->sheet_object.pixmap_file);
-  so->has_icon_on_sheet = som->sheet_object.has_icon_on_sheet;
 
   som_new = g_new0(SheetObjectMod, 1);
-  som_new->sheet_object = *so;
+  {
+    SheetObject *so = &som_new->sheet_object;
+
+    so->object_type = g_strdup(som->sheet_object.object_type);
+    so->description = g_strdup(som->sheet_object.description);
+    so->pixmap = som->sheet_object.pixmap;
+    so->user_data = som->sheet_object.user_data;
+    so->user_data_type = som->sheet_object.user_data_type;
+    so->line_break = FALSE;          /* must be false--we don't copy linebreaks */
+    so->pixmap_file = g_strdup(som->sheet_object.pixmap_file);
+    so->has_icon_on_sheet = som->sheet_object.has_icon_on_sheet;
+  }
+
   som_new->type = som->type;
   som_new->mod = SHEET_OBJECT_MOD_NONE;