[GnomeMeeting-devel-list] Very simple patches to review

[Julien PUYDT <jpuydt free fr>]

Hi,

ldap.patch makes LDAP_CFLAGS available for lib/xdap/*, since openldap is 
used there too.

passertfunc.patch removes the definition of a function that seems to be 
in pwlib anyway...

Do they look good ?

Snark

diff -ur gnomemeeting-opal/configure.in gnomemeeting/configure.in
--- gnomemeeting-opal/configure.in	2005-11-23 20:56:55.000000000 +0100
+++ gnomemeeting/configure.in	2005-11-27 18:28:01.000000000 +0100
@@ -546,6 +546,7 @@
 dnl  The various CFLAGS are merged into GNOMEMEETING_CFLAGS and 
 dnl  GNOMEMEETING_LIB_CFLAGS
 dnl ###########################################################################
+GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $LDAP_CFLAGS"
 GNOMEMEETING_LIB_CFLAGS="$GNOMEMEETING_CFLAGS"
 GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $PWLIB_CFLAGS $LDAP_INCLUDES $OPAL_CFLAGS $SDL_CFLAGS $LDAP_CFLAGS $ARCH_OPAL_CFLAGS"
 GNOMEMEETING_LIBS="$PWLIB_LIBS $OPAL_LIBS $GNOMEMEETING_LIBS $LDAP_LIBS $SDL_LDFLAGS $ARCH_OPAL_LIBS"

diff -ur gnomemeeting-opal/src/misc.cpp gnomemeeting/src/misc.cpp
--- gnomemeeting-opal/src/misc.cpp	2005-11-23 20:56:56.000000000 +0100
+++ gnomemeeting/src/misc.cpp	2005-11-27 18:54:43.000000000 +0100
@@ -119,23 +119,6 @@
   return FALSE;
 }
 
-
-void 
-PAssertFunc (const char *file, int line, 
-	     const char *className, const char *msg)
-{
-  static bool inAssert;
-
-  if (inAssert)
-    return;
-
-  cout << file << "-" << line << "-" << className << "-" << msg << endl << flush;
-  inAssert = true;
-
-  g_idle_add (assert_error_msg, (gpointer) msg);
-
-  inAssert = FALSE;
-}
 #endif