anjuta r3440 - in trunk: . libanjuta

[naba svn gnome org]

Author: naba
Date: Wed Jan  9 21:51:03 2008
New Revision: 3440
URL: http://svn.gnome.org/viewvc/anjuta?rev=3440&view=rev

Log:
	* libanjuta/anjuta-plugin-manager.c:
	(anjuta_plugin_manager_activate_plugins):
	* libanjuta/anjuta-status.c: (anjuta_status_dispose): Fixes a memory
	corruption reported in bug #507491. Potentially fixes too.


Modified:
   trunk/ChangeLog
   trunk/libanjuta/anjuta-plugin-manager.c
   trunk/libanjuta/anjuta-status.c

Modified: trunk/libanjuta/anjuta-plugin-manager.c
==============================================================================
--- trunk/libanjuta/anjuta-plugin-manager.c	(original)
+++ trunk/libanjuta/anjuta-plugin-manager.c	Wed Jan  9 21:51:03 2008
@@ -2342,13 +2342,15 @@
 												  "Icon",
 											  &icon_filename))
 		{
-			gchar *title, *description;
+			gchar *title /*, *description */;
 			anjuta_plugin_description_get_locale_string (d, "Anjuta Plugin",
 														 "Name",
 														 &title);
+			/*
 			anjuta_plugin_description_get_locale_string (d, "Anjuta Plugin",
 														 "Description",
 														 &description);
+			*/
 			icon_path = g_strconcat (PACKAGE_PIXMAPS_DIR"/",
 									 icon_filename, NULL);
 			/* DEBUG_PRINT ("Icon: %s", icon_path); */
@@ -2359,6 +2361,7 @@
 						   icon_path);
 			g_free (icon_path);
 			g_free (icon_filename);
+			g_free (title);
 		}
 		
 		if (anjuta_plugin_description_get_string (d, "Anjuta Plugin",

Modified: trunk/libanjuta/anjuta-status.c
==============================================================================
--- trunk/libanjuta/anjuta-status.c	(original)
+++ trunk/libanjuta/anjuta-status.c	Wed Jan  9 21:51:03 2008
@@ -105,7 +105,12 @@
 		g_hash_table_destroy (status->priv->widgets);
 		status->priv->widgets = NULL;
 	}
-	
+	if (status->priv->window)
+	{
+		g_object_remove_weak_pointer (G_OBJECT (status->priv->window),
+						   (gpointer*)(gpointer)&status->priv->window);
+		status->priv->window = NULL;
+	}
 	GNOME_CALL_PARENT(G_OBJECT_CLASS, dispose, (widget));
 }