gnumeric r17241 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Thu Mar 26 15:22:00 2009
New Revision: 17241
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17241&view=rev

Log:
2009-03-26  Morten Welinder  <terra gnome org>

	* src/gnm-plugin.c (plugin_service_ui_activate): Free layout here.

	* src/application.c (gnm_app_add_extra_ui): constify layout and copy it.
	(gnm_app_remove_extra_ui): Destroy layout here.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/application.c
   trunk/src/application.h
   trunk/src/gnm-plugin.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Mar 26 15:22:00 2009
@@ -2,6 +2,7 @@
 
 Morten:
 	* Handle elapsed time formats better on text export.
+	* Plug leak.
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.5

Modified: trunk/src/application.c
==============================================================================
--- trunk/src/application.c	(original)
+++ trunk/src/application.c	Thu Mar 26 15:22:00 2009
@@ -830,7 +830,8 @@
 
 GnmAppExtraUI *
 gnm_app_add_extra_ui (char const *group_name,
-		      GSList *actions, char *layout,
+		      GSList *actions,
+		      const char *layout,
 		      char const *domain,
 		      gpointer user_data)
 {
@@ -838,7 +839,7 @@
 	extra_uis = g_slist_prepend (extra_uis, extra_ui);
 	extra_ui->group_name = g_strdup (group_name);
 	extra_ui->actions = actions;
-	extra_ui->layout = layout;
+	extra_ui->layout = g_strdup (layout);
 	extra_ui->user_data = user_data;
 	g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_ADDED], 0, extra_ui);
 	return extra_ui;
@@ -849,6 +850,7 @@
 {
 	g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_REMOVED], 0, extra_ui);
 	g_free (extra_ui->group_name);
+	g_free (extra_ui->layout);
 	g_free (extra_ui);
 }
 

Modified: trunk/src/application.h
==============================================================================
--- trunk/src/application.h	(original)
+++ trunk/src/application.h	Thu Mar 26 15:22:00 2009
@@ -93,7 +93,7 @@
 void	   gnm_action_free (GnmAction *action);
 
 GnmAppExtraUI *gnm_app_add_extra_ui (char const *group_name,
-				     GSList *actions, char *layout,
+				     GSList *actions, const char *layout,
 				     char const *domain,
 				     gpointer user_data);
 void	   gnm_app_remove_extra_ui  (GnmAppExtraUI *extra_ui);

Modified: trunk/src/gnm-plugin.c
==============================================================================
--- trunk/src/gnm-plugin.c	(original)
+++ trunk/src/gnm-plugin.c	Thu Mar 26 15:22:00 2009
@@ -388,6 +388,7 @@
 		service_ui->actions,
 		xml_ui, textdomain, service);
 	g_free (group_name);
+	g_free (xml_ui);
 	service->is_active = TRUE;
 }