gnome-panel r10983 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Fri Apr  4 17:23:14 2008
New Revision: 10983
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10983&view=rev

Log:

2008-04-04  Vincent Untz  <vuntz gnome org>

	* panel-applet-frame.c: (panel_applet_frame_load): plug potential leak
	(panel_applet_frame_finalize): correctly release the bonobo object.
	This fixes bug #513347, and also bug #522025 as a side-effect.
	Thanks to Michael Meeks <michael meeks novell com> for the hint!


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/panel-applet-frame.c

Modified: trunk/gnome-panel/panel-applet-frame.c
==============================================================================
--- trunk/gnome-panel/panel-applet-frame.c	(original)
+++ trunk/gnome-panel/panel-applet-frame.c	Fri Apr  4 17:23:14 2008
@@ -359,6 +359,8 @@
 	bonobo_activation_activate_from_id_async (frame->priv->iid, 0,
 						  (BonoboActivationCallback) panel_applet_frame_activated,
 						  frame_act, &ev);
+
+	CORBA_exception_free (&ev);
 }
 
 void
@@ -540,7 +542,7 @@
 		 * like we can receive some events when unref'ing them */
 		ORBit_small_unlisten_for_broken (frame->priv->control,
 						 G_CALLBACK (panel_applet_frame_cnx_broken));
-		CORBA_Object_release (frame->priv->control, NULL);
+		bonobo_object_release_unref (frame->priv->control, NULL);
 		frame->priv->control = CORBA_OBJECT_NIL;
 	}