seamus

diff --git a/include/ui.h b/include/ui.h
index 97e359f639c73d70b86351bf6d81bb8ac89d5408..b70856eb7173623faa2f6ef89d9f657820937e25 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -8,13 +8,4 @@ int tickit_init(struct seamus_frontend *s);
 int tickit_start(struct seamus_frontend *s);
 int tickit_finish(struct seamus_frontend *s);
 
-static int on_key_event(TickitTerm *t, TickitEventFlags flags, void *_info, void *data);
-static int toggle_playing_status(struct seamus_frontend *seamus);
-static int update_scroll_position(struct seamus_frontend *seamus, int direction);
-static int update_status(Tickit *t, TickitEventFlags flags, void *_info, void *data);
-static int update_main_window(Tickit *t, TickitEventFlags flags, void *_info, void *data);
-static int render_main_window(TickitWindow *win, TickitEventFlags flags, void *_info, void *data);
-static int render_status_window(TickitWindow *win, TickitEventFlags flags, void *_info, void *data);
-static int render_root(TickitWindow *win, TickitEventFlags flags, void *_info, void *data);
-static int render_queue(struct seamus_frontend *seamus, TickitRenderBuffer *render_buffer);
 #endif




diff --git a/src/queue.c b/src/queue.c
index 611c6157a045fd89d623fe1838a5c5ded2d64d16..af8f25da8aed87c3dd87a669e9b2a273754dcbbe 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -47,7 +47,7 @@ 			} else {
 				enum mpd_entity_type type = mpd_entity_get_type(entity);
 
 				if (type == MPD_ENTITY_TYPE_SONG) {
-					struct mpd_song *song = mpd_entity_get_song(entity);
+					const struct mpd_song *song = mpd_entity_get_song(entity);
 
 					const char *stitle = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
 					const char *sartist = mpd_song_get_tag(song, MPD_TAG_ALBUM_ARTIST, 0);




diff --git a/src/seamus.c b/src/seamus.c
index 86abec87e5209b497d55651dd30c3c7c8bff390f..b4fb8a9591d00ccee27be6d1288af9e57112859c 100755
--- a/src/seamus.c
+++ b/src/seamus.c
@@ -60,6 +60,8 @@ 		log_error("Weren't able to connect with MPD");
 
 		return 1;
 	}
+
+	return 0;
 }
 
 int
@@ -91,6 +93,5 @@
 exit_mpd:
 	seamus_finish(&seamus);
 
-exit:
 	return 0;
 }




diff --git a/src/ui.c b/src/ui.c
index 4f6ad061d5f710eec6bae0c8241101dc177019e5..cecf69585a13b1e5e2656ff16713d29cf4bf2586 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -4,6 +4,16 @@ #include "ui.h"
 #include "queue.h"
 #include "status.h"
 
+static int on_key_event(TickitTerm *tt, TickitEventFlags flags, void *_info, void *data);
+static int toggle_playing_status(struct seamus_frontend *seamus);
+static int update_scroll_position(struct seamus_frontend *seamus, int direction);
+static int update_status(Tickit *t, TickitEventFlags flags, void *_info, void *data);
+static int update_main_window(Tickit *t, TickitEventFlags flags, void *_info, void *data);
+static int render_root(TickitWindow *win, TickitEventFlags flags, void *_info, void *data);
+static int render_status_window(TickitWindow *win, TickitEventFlags flags, void *_info, void *data);
+static int render_main_window(TickitWindow *win, TickitEventFlags flags, void *_info, void *data);
+static int render_queue(struct seamus_frontend *seamus, TickitRenderBuffer *render_buffer);
+
 int
 tickit_init(struct seamus_frontend *s)
 {
@@ -62,6 +72,8 @@ 	tickit_watch_timer_after_msec(s->t, 1000, 0, &update_status, s);
 	//tickit_watch_timer_after_msec(s->t, 1000, 0, &update_main_window, s);
 
 	tickit_run(s->t);
+
+	return 0;
 }
 
 static int
@@ -112,6 +124,8 @@ 	}
 
 	fetch_current_status(seamus);
 	tickit_window_expose(seamus->main_window, NULL);
+
+	return 0;
 }
 
 static int
@@ -133,6 +147,8 @@
 	seamus->scroll_position += direction;
 	// TODO: Deal with the current window focused
 	tickit_window_scroll(seamus->main_window, direction, 0);
+
+	return 0;
 }
 
 static int
@@ -334,6 +350,8 @@
 			free(song_str);
 		}
 	}
+
+	return 0;
 }
 
 int