fixed conflict

diff --git a/sherman-aquarium/debian/control b/sherman-aquarium/debian/control
index 983c188..8cf07d9 100644 (file)
--- a/sherman-aquarium/debian/control
+++ b/sherman-aquarium/debian/control
@@ -2,7 +2,7 @@ Source: shermans-aquarium
 Section: gnome
 Priority: optional
 Maintainer: Jose M. Moya <josem@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, libsdl1.2-dev, libgai-dev (>= 0.5.3), autotools-dev, libsdl1.2-dev
+Build-Depends: debhelper (>= 4.1.0), cdbs, libsdl1.2-dev, autotools-dev
 Standards-Version: 3.7.3
 Homepage: http://aquariumapplet.sourceforge.net/
 

diff --git a/sherman-aquarium/shermans/Makefile b/sherman-aquarium/shermans/Makefile
index 037f764..08ca4a8 100644 (file)
--- a/sherman-aquarium/shermans/Makefile
+++ b/sherman-aquarium/shermans/Makefile
@@ -11,17 +11,17 @@ GNOMEDIR = /usr
 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/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
 OBJS_SDL = screensaver.o grabscreen.o
 
-.PHONY: all install clean   install-images  
+.PHONY: all install clean  shermans install-images  install_screensaver
 
-all:  
+all:  shermans
 
 shermans_applet: $(OBJS_GAI) $(OBJS)
        $(CC) -o shermans_applet $(OBJS) $(OBJS_GAI) $(LDFLAGS_GAI)
@@ -30,7 +30,7 @@ shermans_applet: $(OBJS_GAI) $(OBJS)
 shermans: $(OBJS) $(OBJS_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
@@ -39,7 +39,7 @@ install_applet:
        install -m 644 ../shermans_icon.png $(INSTALL_PATH)/share/pixmaps
 install_screensaver: shermans
        install -d $(INSTALL_PATH)/bin
-       install -m 755  $(INSTALL_PATH)/bin
+       install -m 755 shermans $(INSTALL_PATH)/bin
        install -d $(INSTALL_PATH)/share/xscreensaver/config
        install -m 644 ../shermans.xml $(INSTALL_PATH)/share/xscreensaver/config
 
@@ -63,7 +63,7 @@ install-rox:
        ln -s $(INSTALL_PATH)/bin/shermans_applet "$(DESTDIR)/Sherman's aquarium/shermans_applet"
        install -m 644 AppInfo.xml "$(DESTDIR)/Sherman's aquarium"
 clean:
-       rm -rf *.o .xvpics *~  
+       rm -rf *.o .xvpics *~  shermans
 
 # Dependencies:
 

diff --git a/sherman-aquarium/shermans/fish.c b/sherman-aquarium/shermans/fish.c
index c935ab6..a23ca9c 100644 (file)
--- a/sherman-aquarium/shermans/fish.c
+++ b/sherman-aquarium/shermans/fish.c
@@ -564,8 +564,7 @@ void fish_update(void)
 #ifdef DEBUG
     printf("\t\t - Done special hits.\n");
 #endif
-
-
+    
     for(i = 0;i < fish_settings.num_fish; i++){
        aquarium_clean_image((int) fishes[i].tx,
                             fishes[i].y - ad->viewpoint_start_y,
@@ -649,9 +648,7 @@ void fish_update(void)
 
        if(fishes[i].is_dead == TRUE){
 
-               fprintf(stderr,"ddddddddddddddddd33333333\n");
            if(fish_settings.rebirth){
-               fprintf(stderr,"ddddddddddddddddd\n");
                if(g_rand_int_range(ad->rnd, 0, 100) < 20){
                    //              printf("Rebirth and salvation..\n");
                    /* Salvation and rebirth...*/
@@ -693,8 +690,8 @@ void fish_update(void)
 
        /* move fish in horizontal direction, left or right */
        /* Large aquarium, the fishes are shown more seldom */
-
-       if (!fishes[i].rev) {
+       
+    if (!fishes[i].rev) {
 
            fishes[i].tx -=
                (fishes[i].speed[fishes[i].frame]) * (fishes[i].speed_mul * fish_settings.speed / 100);
@@ -703,6 +700,7 @@ void fish_update(void)
                /* we moved out of bounds. change direction,
                 * position, speed. */
 
+
                fishes[i].travel = g_rand_int_range(ad->rnd, 0, (ad->virtual_aquarium_x - ad->xmax) / 2) +
                    fishes[i].width;
                fishes[i].tx = -fishes[i].width - fishes[i].travel;
@@ -721,7 +719,6 @@ void fish_update(void)
            }
        } else {
 
-
            fishes[i].tx +=
                (fishes[i].speed[fishes[i].frame]) * (fishes[i].speed_mul * fish_settings.speed / 100);
 

diff --git a/sherman-aquarium/shermans/screensaver.c b/sherman-aquarium/shermans/screensaver.c
index 2e80812..3a5aff9 100644 (file)
--- a/sherman-aquarium/shermans/screensaver.c
+++ b/sherman-aquarium/shermans/screensaver.c
@@ -581,7 +581,8 @@ void screensaver_init()
        screen_height = win_attr.height;
        screen_width = win_attr.width;
        fullscreen = 0;
-       ad.proximity = 1;                       /* No sound effects */
+       //ad.proximity = 1;                     /* No sound effects */
+    ad.proximity = 0;
        window = gdk_window_foreign_new((Window)window_id);
        gdk_window_show(window);
        gc = gdk_gc_new(window);
@@ -982,12 +983,10 @@ int main(int argc, char **argv)
     screensaver_init(0);
 
     if(window_id==-1){
-       fprintf(stderr, "screensaver_main_sdl\n");
-       screensaver_main_sdl();
+           screensaver_main_sdl();
     }
     else{
-        fprintf(stderr, "screensaver_main_GDK\n");
-       screensaver_main_gdk();
+           screensaver_main_gdk();
     }
     return 0;
 }