libbonobo r3460 - in trunk: . activation-server bonobo-activation

[halfline svn gnome org]

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

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

	Consolidate ior and lock name getter logic to one
	place to facilitate changing that logic

	* bonobo-activation/bonobo-activation-private.h:
	* bonobo-activation/bonobo-activation-base-service.c:
	(get_lock_fname), (get_ior_fname),
	(_bonobo_activation_lock_fname_get),
	(_bonobo_activation_ior_fname_get): Rename and export
	get_lock_fname and get_ior_fname.
	(rloc_file_lock), (rloc_file_check), (rloc_file_register),
	(rloc_file_unregister): adapt for renamed functions
	* activation-server/activation-server-main.c
	(dump_ior): get ior name from libbonobo-activation instead
	of hardcoding it to "bonobo-activation-server-ior"


Modified:
   trunk/ChangeLog
   trunk/activation-server/activation-server-main.c
   trunk/bonobo-activation/bonobo-activation-base-service.c
   trunk/bonobo-activation/bonobo-activation-private.h

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:03:07 2008
@@ -363,9 +363,7 @@
 #endif
         if (server_reg) {
                 char *fname;
-                fname = g_build_filename (ORBit_get_safe_tmp (),
-                                          "bonobo-activation-server-ior",
-                                          NULL);
+                fname = _bonobo_activation_ior_fname_get ();
                 fh = g_fopen (fname, "w+");
 		fprintf (fh, "%s\n", ior);
 		fclose (fh);

Modified: trunk/bonobo-activation/bonobo-activation-base-service.c
==============================================================================
--- trunk/bonobo-activation/bonobo-activation-base-service.c	(original)
+++ trunk/bonobo-activation/bonobo-activation-base-service.c	Wed May  7 14:03:07 2008
@@ -498,16 +498,16 @@
         return tmpdir;
 }
 
-static char *
-get_lock_fname (void)
+char *
+_bonobo_activation_lock_fname_get (void)
 {
         return g_build_filename (get_tmpdir (),
                                  "bonobo-activation-register.lock",
                                  NULL);
 }
 
-static char *
-get_ior_fname (void)
+char *
+_bonobo_activation_ior_fname_get (void)
 {
         return g_build_filename (get_tmpdir (),
                                  "bonobo-activation-server-ior",
@@ -543,7 +543,7 @@
         int retval;
         char *err;
 
-        fn = get_lock_fname ();
+        fn = _bonobo_activation_lock_fname_get ();
 
 	while ((lock_fd = open (fn, O_CREAT | O_RDWR, 0700)) < 0) {
 
@@ -577,7 +577,7 @@
 
         g_free (fn);
 #elif defined (G_OS_WIN32)
-	char *fn = get_lock_fname ();
+	char *fn = _bonobo_activation_lock_fname_get ();
         wchar_t *wfn = g_utf8_to_utf16 (fn, -1, NULL, NULL, NULL);
         
 	while ((lock_fd = _wsopen (wfn, O_CREAT|O_RDWR|_O_SHORT_LIVED|_O_NOINHERIT, _SH_DENYRW, 0700)) < 0) {
@@ -630,7 +630,7 @@
 	FILE *fh;
 	char *fn;
 
-        fn = get_ior_fname ();
+        fn = _bonobo_activation_ior_fname_get ();
 	fh = g_fopen (fn, "r");
         g_free (fn);
 
@@ -662,7 +662,7 @@
 	char *fn;
 	FILE *fh;
 
-        fn = get_ior_fname ();
+        fn = _bonobo_activation_ior_fname_get ();
 	fh = g_fopen (fn, "w");
 
         if (fh != NULL) {
@@ -681,7 +681,7 @@
 {
 	char *fn;
 
-	g_unlink ((fn = get_ior_fname ()));
+	g_unlink ((fn = _bonobo_activation_ior_fname_get ()));
         g_free (fn);
 }
 

Modified: trunk/bonobo-activation/bonobo-activation-private.h
==============================================================================
--- trunk/bonobo-activation/bonobo-activation-private.h	(original)
+++ trunk/bonobo-activation/bonobo-activation-private.h	Wed May  7 14:03:07 2008
@@ -85,6 +85,9 @@
     /* used only for unit testing */
 CORBA_char * _bonobo_activation_get_activation_env_value (const char *name);
 
+char * _bonobo_activation_ior_fname_get (void);
+char * _bonobo_activation_lock_fname_get (void);
+
 #ifdef G_OS_WIN32
 
 char *_bonobo_activation_win32_replace_prefix (const char *runtime_prefix,