Re: oaf patch to improve ORBit2 detection ...

[Maciej Stachowiak <mjs eazel com>]

Michael Meeks <michael ximian com> writes:

> May I commit this to HEAD oaf ?
> 

Please do.

> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/oaf/ChangeLog,v
> retrieving revision 1.141
> diff -u -r1.141 ChangeLog
> --- ChangeLog	2001/04/17 13:28:27	1.141
> +++ ChangeLog	2001/05/04 15:21:23
> @@ -1,3 +1,7 @@
> +2001-05-04  Michael Meeks  <michael ximian com>
> +
> +	* liboaf/oaf-mainloop.c: improve ORBit2 detection...
> +
>  2001-04-17  Martin Baulig  <baulig suse de>
>  
>  	* configure.in: Use pkg-config to check for ORBit-martin-forked.
> Index: liboaf/oaf-mainloop.c
> ===================================================================
> RCS file: /cvs/gnome/oaf/liboaf/oaf-mainloop.c,v
> retrieving revision 1.30
> diff -u -r1.30 oaf-mainloop.c
> --- liboaf/oaf-mainloop.c	2001/03/23 19:32:19	1.30
> +++ liboaf/oaf-mainloop.c	2001/05/04 15:21:23
> @@ -49,13 +49,12 @@
>  
>  #include <orbit/orbit.h>
>  
> -static int oaf_corba_prio = G_PRIORITY_LOW;
> -
> -#ifdef ORBIT2
> -#define ORBIT_USES_GLIB_MAIN_LOOP 1
> +#if ORBIT_MAJOR_VERSION >= 2
> +#  define ORBIT_USES_GLIB_MAIN_LOOP 1
>  #endif
>  
>  #ifndef ORBIT_USES_GLIB_MAIN_LOOP
> +static int oaf_corba_prio = G_PRIORITY_LOW;
>  
>  static gboolean
>  orb_handle_connection (GIOChannel * source, GIOCondition cond,
> 
> 
> 	Regards,
> 
> 		Michael.
> 
> -- 
>  mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot
> 
> 

-- 
Maciej Stachowiak
Eazel, Inc.