[MPlayer-dev-eng] [PATCH] Add support for GNOME screensaver

[Piotr Kaczuba]

On Thu, Apr 27, 2006 at 06:56:29PM +0200, Bernd Ernesti wrote:
> On Thu, Apr 27, 2006 at 05:30:18PM +0200, Piotr Kaczuba wrote:
> [..]
> > Index: libvo/Makefile
> > ===================================================================
> > RCS file: /cvsroot/mplayer/main/libvo/Makefile,v
> > retrieving revision 1.54
> > diff -u -r1.54 Makefile
> > --- libvo/Makefile	28 Mar 2006 22:44:16 -0000	1.54
> > +++ libvo/Makefile	27 Apr 2006 14:56:51 -0000
> > @@ -62,6 +62,9 @@
> >  vo_mpegpes.o: vo_mpegpes.c
> >  	$(CC) -c $(CFLAGS) $(DVB_INC) -o $@ $<
> >  
> > +gnome_screensaver.o: gnome_screensaver.c
> > +	$(CC) -c $(CFLAGS) $(DBUS_GLIB_INC) -o $@ $<
> > +
> >  all:    $(LIBNAME)
> >  
> >  clean:
> 
> Hmm,
> how would that work if there is no dbus support installed?
> 
> There is no check in the next file which would prevent it to
> fail.
> 
> > Index: libvo/gnome_screensaver.c
> > ===================================================================
> > RCS file: libvo/gnome_screensaver.c
> > diff -N libvo/gnome_screensaver.c
> > --- /dev/null	1 Jan 1970 00:00:00 -0000
> > +++ libvo/gnome_screensaver.c	27 Apr 2006 14:56:51 -0000
> > @@ -0,0 +1,107 @@
> > +#include <stdlib.h>
> > +#include <unistd.h>
> > +#include <dbus/dbus-glib.h>
> 
> Here, you are including something without protecting it.
> 
> Maybe you should check for HAVE_DBUS_GLIB in libvo/Makefile and
> protect the new lines which you just added in that Makefile.

It's not necessary to protect the includes because if configure detects
that dbus glib is not present, gnome_screensaver.o isn't compiled, i.e.
the c file isn't included in config.mak. For the same reason, the
makefile rule doesn't hurt.

Piotr