Index: src/orb/GIOP/giop-recv-buffer.c
===================================================================
--- src/orb/GIOP/giop-recv-buffer.c	(revision 2017)
+++ src/orb/GIOP/giop-recv-buffer.c	(working copy)
@@ -736,7 +736,7 @@
 			link_io_thread_remove_timeout (ent->cnx->parent.timeout_source_id);
 			ent->cnx->parent.timeout_source_id = 0;
 			ent->cnx->parent.timeout_status = LINK_TIMEOUT_NO;
-			g_object_unref (&ent->cnx->parent); // we remove the source so we must unref the connection
+			link_connection_unref (&ent->cnx->parent); // we remove the source so we must unref the connection
 		} else if (ent->cnx->parent.timeout_status == LINK_TIMEOUT_YES)
 			*timeout = TRUE;
 		g_mutex_unlock (ent->cnx->parent.timeout_mutex);
@@ -1382,7 +1382,7 @@
 	giop_incoming_signal_T (tdata, GIOP_CLOSECONNECTION);
 	g_mutex_unlock (tdata->lock); /* ent_lock */
 	
-	g_object_unref (lcnx); // we remove the source so we must unref lcnx
+	link_connection_unref (lcnx); // we remove the source so we must unref lcnx
 
 out:
 	return retv;
@@ -1403,7 +1403,7 @@
 	if (lcnx->timeout_source_id)
 		goto out;
 
-	g_object_ref (lcnx); // to be unref'ed by the one who removes the timeout source
+	link_connection_ref (lcnx); // to be unref'ed by the one who removes the timeout source
 	
 	if (!lcnx->timeout_mutex)
 		lcnx->timeout_mutex = g_mutex_new ();
Index: linc2/src/Makefile.am
===================================================================
--- linc2/src/Makefile.am	(revision 2017)
+++ linc2/src/Makefile.am	(working copy)
@@ -13,6 +13,7 @@
 	-I$(top_srcdir)/linc2/include    \
 	$(LINC_CFLAGS)             \
 	$(WARN_CFLAGS)             \
+        $(ORBIT_DEBUG_CFLAGS)      \
 	-DG_DISABLE_DEPRECATED	   \
 	-D_GNU_SOURCE
 
Index: configure.in
===================================================================
--- configure.in	(revision 2017)
+++ configure.in	(working copy)
@@ -103,8 +103,8 @@
 
 dnl --enable-debug=(yes|minimum|no)
 AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=minimum)
-if test "$enable_debug" = "yes"; then
-  ORBIT_DEBUG_CFLAGS="-DG_ENABLE_DEBUG"
+if test "x$enable_debug" = "xyes"; then
+  ORBIT_DEBUG_CFLAGS="-ggdb -DG_ENABLE_DEBUG"
 else
   if test "x$enable_debug" = "xno"; then
     ORBIT_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2017)
+++ ChangeLog	(working copy)
@@ -1,3 +1,14 @@
+2007-08-22  Jules Colding  <colding@omesc.com>
+
+	* src/orb/GIOP/giop-recv-buffer.c (giop_timeout_add): 
+	Use LinkConnection native ref function instead of g_object_ref()
+	(giop_recv_buffer_get): Use LinkConnection native unref function 
+	instead of g_object_unref()
+	(giop_timeout): Use LinkConnection native unref function instead 
+	of g_object_unref()
+
+	* configure.in: Fix 'if test' statement
+
 2007-08-14  Jules Colding  <colding@omesc.com>
 
 	* src/orb/GIOP/giop-send-buffer.c (giop_send_buffer_write): Do