libbonobo r3514 - in trunk: . activation-server bonobo-activation tests/test-activation

[kmaraas svn gnome org]

Author: kmaraas
Date: Tue Dec  9 11:43:40 2008
New Revision: 3514
URL: http://svn.gnome.org/viewvc/libbonobo?rev=3514&view=rev

Log:
2008-12-09  Kjartan Maraas  <kmaraas gnome org>

	* activation-server/object-directory-load.c:
	glib include fix. Patch from PrzemysÅaw Grzegorczyk
	Closes bug #563712.

Modified:
   trunk/ChangeLog
   trunk/activation-server/activation-server-main.c
   trunk/activation-server/object-directory-load.c
   trunk/bonobo-activation/bonobo-activation-shlib.c
   trunk/tests/test-activation/bonobo-activation-test.c
   trunk/tests/test-activation/empty-client.c

Modified: trunk/activation-server/activation-server-main.c
==============================================================================
--- trunk/activation-server/activation-server-main.c	(original)
+++ trunk/activation-server/activation-server-main.c	Tue Dec  9 11:43:40 2008
@@ -477,11 +477,6 @@
         LIBXML_TEST_VERSION;
 	xmlKeepBlanksDefault(0);
 
-#if 0
-        while (!g_file_test ("/tmp/orbit-go", G_FILE_TEST_EXISTS))
-                sleep (1);
-#endif
-
 #ifdef HAVE_SYSLOG_H
 	syslog_ident = g_strdup_printf ("bonobo-activation-server (%s-%u)", g_get_user_name (), (guint) getpid ());
 

Modified: trunk/activation-server/object-directory-load.c
==============================================================================
--- trunk/activation-server/object-directory-load.c	(original)
+++ trunk/activation-server/object-directory-load.c	Tue Dec  9 11:43:40 2008
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <glib/gmarkup.h>
+#include <glib.h>
 
 #include "bonobo-activation/bonobo-activation-private.h"
 #include "server.h"

Modified: trunk/bonobo-activation/bonobo-activation-shlib.c
==============================================================================
--- trunk/bonobo-activation/bonobo-activation-shlib.c	(original)
+++ trunk/bonobo-activation/bonobo-activation-shlib.c	Tue Dec  9 11:43:40 2008
@@ -255,11 +255,6 @@
 	ActivePluginInfo *local_plugin_info = impl_ptr;
 
 	local_plugin_info->refcount++;
-
-#if 0
-	ORBit_servant_set_deathwatch (servant, &(local_plugin_info->refcount),
-				      gnome_plugin_unload, local_plugin_info);
-#endif
 }
 
 static gboolean

Modified: trunk/tests/test-activation/bonobo-activation-test.c
==============================================================================
--- trunk/tests/test-activation/bonobo-activation-test.c	(original)
+++ trunk/tests/test-activation/bonobo-activation-test.c	Tue Dec  9 11:43:40 2008
@@ -274,19 +274,8 @@
 
         for (i = 0; i < 1000; i++) {
                 Bonobo_ServerInfoList *copy;
-#if 0
-                info = bonobo_activation_query (query, sort_by, &ev);
-
-                if (ev._major == CORBA_NO_EXCEPTION) {
-                        CORBA_free (info);
-                } else {
-                        fprintf (stderr, "Test of query failed '%s'\n",
-                                 bonobo_activation_exception_id (&ev));
-                }
-#else
                 copy = Bonobo_ServerInfoList_duplicate (info);
                 CORBA_free (copy);
-#endif
         }
         g_timer_stop (timer);
 

Modified: trunk/tests/test-activation/empty-client.c
==============================================================================
--- trunk/tests/test-activation/empty-client.c	(original)
+++ trunk/tests/test-activation/empty-client.c	Tue Dec  9 11:43:40 2008
@@ -21,12 +21,6 @@
 	CORBA_exception_init (&ev);
 	orb = CORBA_ORB_init (&argc, argv, "orbit-local-orb", &ev);
 
-#if 0
-	for (i = 0; i < (sizeof (theblah) - 1); i++)
-		theblah[i] = 'a';
-	theblah[sizeof (theblah) - 1] = '\0';
-#endif
-
 	if (argc < 2) {
 		printf ("Need a binding ID thing as argv[1]\n");
 		return 1;