fixed conflict

diff --cc sherman-aquarium/shermans/Makefile
index 6ef424e,037f764..08ca4a8
--- 1/sherman-aquarium/shermans/Makefile
--- 2/sherman-aquarium/shermans/Makefile
+++ b/sherman-aquarium/shermans/Makefile
@@@ -11,9 -11,9 +11,9 @@@ GNOMEDIR = /us
  INSTALL_PATH=$(DESTDIR)/usr
  
  # Setting up the CFLAGS and LDFLAGS variables 
- CFLAGS += -Wall -Wno-strict-aliasing -O3 -DIMAGE_PATH=\"/usr/share/pixmaps/shermans\"    -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DMAEMO_CHANGES -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12  
 -CFLAGS += -Wall -Wno-strict-aliasing -O3 -DIMAGE_PATH=\"/usr/share/pixmaps/shermans\"      -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/dbus-1.0/include  
++CFLAGS += -Wall -Wno-strict-aliasing -O3 -DIMAGE_PATH=\"/usr/share/pixmaps/shermans\"    -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DMAEMO_CHANGES -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12   -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/dbus-1.0/include  
  LDFLAGS_GAI = $(LDFLAGS)   
 -LDFLAGS_SDL = $(LDFLAGS)   
 +LDFLAGS_SDL = $(LDFLAGS) -L/usr/lib -lSDL  -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
  
  OBJS = fish.o background.o bubble.o draw.o bottom.o soundeffects.o images.o
  OBJS_GAI = settings.o pref.o date.o clock.o matrix.o over.o thermometer.o leds.o aquarium.o tetris.o plasma.o  status_linux26.o
@@@ -28,9 -28,9 +28,9 @@@ shermans_applet: $(OBJS_GAI) $(OBJS
  
  
  shermans: $(OBJS) $(OBJS_SDL)
-       $(CC) -o shermans $(OBJS) $(OBJS_SDL) $(LDFLAGS_SDL)
+       $(CC) -o shermans $(OBJS) $(OBJS_SDL) $(LDFLAGS_SDL) -ldbus-1 -lpthread -losso -ldbus-glib-1 -ldbus-1 -lpthread -lgobject-2.0 -lglib-2.0
  
 -install:    install-images  
 +install:   shermans install-images  install_screensaver
  
  install_applet: 
        install -d $(INSTALL_PATH)/bin

diff --cc sherman-aquarium/shermans/screensaver.c
Simple merge