libbonobo r3463 - in trunk: . activation-server

[halfline svn gnome org]

Author: halfline
Date: Wed May  7 14:16:03 2008
New Revision: 3463
URL: http://svn.gnome.org/viewvc/libbonobo?rev=3463&view=rev

Log:
2008-05-07  Ray Strode  <rstrode redhat com>

	* activation-server/activation-server-main.c:
	(cleanup_ior_and_lock_files), (main):
	remove ior and lock files on exit path


Modified:
   trunk/ChangeLog
   trunk/activation-server/activation-server-main.c

Modified: trunk/activation-server/activation-server-main.c
==============================================================================
--- trunk/activation-server/activation-server-main.c	(original)
+++ trunk/activation-server/activation-server-main.c	Wed May  7 14:16:03 2008
@@ -375,6 +375,20 @@
 	CORBA_free (ior);
 }
 
+static void
+cleanup_ior_and_lock_files (void)
+{
+    char *fname;
+
+    fname = _bonobo_activation_ior_fname_get ();
+    g_unlink (fname);
+    g_free (fname);
+
+    fname = _bonobo_activation_lock_fname_get ();
+    g_unlink (fname);
+    g_free (fname);
+}
+
 static DBusHandlerResult
 bus_message_handler (DBusConnection *connection,
                      DBusMessage    *message,
@@ -588,6 +602,8 @@
         bonobo_object_directory_shutdown (threaded_poa, ev);
         activation_context_shutdown ();
 
+        cleanup_ior_and_lock_files ();
+
 #ifdef HAVE_SYSLOG_H
 	closelog ();
 	g_free (syslog_ident);