Mercurial > audlegacy

changeset 625:0a73d1faeb4e trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] GCC 4.1 warning fixes by Diego 'Flameeyes' Petteno from Gentoo.
author chainsaw
date Mon, 06 Feb 2006 17:10:47 -0800
parents a4ab65713d46
children eb0c533e7c48
files Plugins/Input/adplug/core/dmo.cpp Plugins/Input/adplug/core/fmopl.c Plugins/Input/adplug/core/fprovide.h Plugins/Input/adplug/core/opl.h Plugins/Input/adplug/core/realopl.cpp Plugins/Input/adplug/core/rix.cpp Plugins/Input/mpg123/mpg123.c audacious/controlsocket.c audacious/equalizer.c audacious/iir_cfs.c audacious/input.c audacious/logger.c audacious/main.c audacious/mainwin.c audacious/menurow.c audacious/output.c audacious/playlist_list.c audacious/prefswin.c audacious/skin.c audacious/softvolume.c audacious/ui_playlist.c audacious/util.c libaudacious/beepctrl.c libaudacious/xconvert.c libaudacious/xentry.c
diffstat 25 files changed, 183 insertions(+), 164 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/adplug/core/dmo.cpp	Mon Feb 06 16:52:28 2006 -0800
+++ b/Plugins/Input/adplug/core/dmo.cpp	Mon Feb 06 17:10:47 2006 -0800
@@ -310,8 +310,8 @@
 	  ax = ((code & 0x3F) << 3) + ((par1 & 0xE0) >> 5) + 1;
 	  cx = (par1 & 0x1F) + 3;
 
-	  for(int i=0;i<cx;i++)
-	    *opos++ = *(opos - ax);
+	  for(int i=0;i<cx;i++,opos++)
+	    *opos = *(opos - ax);
 
 	  continue;
 	}
@@ -327,8 +327,8 @@
 	  cx = ((par1 & 0x70) >> 4) + 3;
 	  bx = par1 & 0x0F;
 
-	  for(i=0;i<cx;i++)
-	    *opos++ = *(opos - ax);
+	  for(i=0;i<cx;i++,opos++)
+	    *opos = *(opos - ax);
 
 	  for (i=0;i<bx;i++)
 	    *opos++ = *ipos++;
@@ -348,8 +348,8 @@
 	  cx = ((par1 & 0x01) << 4) + (par2 >> 4) + 4;
 	  ax = par2 & 0x0F;
 
-	  for(i=0;i<cx;i++)
-	    *opos++ = *(opos - bx);
+	  for(i=0;i<cx;i++,opos++)
+	    *opos = *(opos - bx);
 
 	  for (i=0;i<ax;i++)
 	    *opos++ = *ipos++;
--- a/Plugins/Input/adplug/core/fmopl.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/Plugins/Input/adplug/core/fmopl.c	Mon Feb 06 17:10:47 2006 -0800
@@ -755,7 +755,7 @@
 {
 	OPL_CH *CH;
 	int slot;
-	int block_fnum;
+	size_t block_fnum;
 
 	switch(r&0xe0)
 	{
@@ -1343,8 +1343,10 @@
 		{
 			if(OPL->keyboardhandler_r)
 				return OPL->keyboardhandler_r(OPL->keyboard_param);
-			else
+			else {
 				LOG(LOG_WAR,("OPL:read unmapped KEYBOARD port\n"));
+				return 0; /* Avoid warning about empty else clause */
+			}
 		}
 		return 0;
 #if 0
@@ -1356,8 +1358,10 @@
 		{
 			if(OPL->porthandler_r)
 				return OPL->porthandler_r(OPL->port_param);
-			else
+			else {
 				LOG(LOG_WAR,("OPL:read unmapped I/O port\n"));
+				return 0; /* Avoid warning about empty else clause */
+			}
 		}
 		return 0;
 	case 0x1a: /* PCM-DATA    */
--- a/Plugins/Input/adplug/core/fprovide.h	Mon Feb 06 16:52:28 2006 -0800
+++ b/Plugins/Input/adplug/core/fprovide.h	Mon Feb 06 17:10:47 2006 -0800
@@ -28,6 +28,7 @@
 class CFileProvider
 {
 public:
+  virtual ~CFileProvider() { }
   virtual binistream *open(std::string) const = 0;
   virtual void close(binistream *) const = 0;
 
@@ -39,6 +40,7 @@
 class CProvider_Filesystem: public CFileProvider
 {
 public:
+  virtual ~CProvider_Filesystem() { }
   virtual binistream *open(std::string filename) const;
   virtual void close(binistream *f) const;
 };
--- a/Plugins/Input/adplug/core/opl.h	Mon Feb 06 16:52:28 2006 -0800
+++ b/Plugins/Input/adplug/core/opl.h	Mon Feb 06 17:10:47 2006 -0800
@@ -25,6 +25,7 @@
 class Copl
 {
  public:
+  virtual ~Copl() { }
   typedef enum {
     TYPE_OPL2, TYPE_OPL3, TYPE_DUAL_OPL2
   } ChipType;
--- a/Plugins/Input/adplug/core/realopl.cpp	Mon Feb 06 16:52:28 2006 -0800
+++ b/Plugins/Input/adplug/core/realopl.cpp	Mon Feb 06 17:10:47 2006 -0800
@@ -87,8 +87,10 @@
   hardwrite(4,0x60); hardwrite(4,0x80);
   stat1 = INP(adp);
   hardwrite(2,0xff); hardwrite(4,0x21);
+#if INP != 0
   for(i=0;i<80;i++)			// wait for adlib
     INP(adp);
+#endif
   stat2 = INP(adp);
   hardwrite(4,0x60); hardwrite(4,0x80);
 
@@ -152,11 +154,13 @@
   unsigned short	adp = (currChip == 0 ? adlport : adlport + 2);
 
   OUTP(adp,reg);		// set register
+#if INP != 0
   for(i=0;i<SHORTDELAY;i++)	// wait for adlib
     INP(adp);
   OUTP(adp+1,val);		// set value
   for(i=0;i<LONGDELAY;i++)	// wait for adlib
     INP(adp);
+#endif
 }
 
 void CRealopl::write(int reg, int val)
--- a/Plugins/Input/adplug/core/rix.cpp	Mon Feb 06 16:52:28 2006 -0800
+++ b/Plugins/Input/adplug/core/rix.cpp	Mon Feb 06 17:10:47 2006 -0800
@@ -199,7 +199,7 @@
 	buffer[index*12] = (low+4)>>3;
 	for(i=1;i<=11;i++)
 	{
-		res *= 1.06;
+		res = (unsigned int)((double)res * 1.06);
 		buffer[index*12+i] = res>>3;
 	}
 }
@@ -235,7 +235,7 @@
                 {
                         mutex++;
                         band_sus = rix_proc();
-                        if(band_sus) sustain += band_sus * 1.06;
+                        if(band_sus) sustain += (int)((double)band_sus * 1.06);
 							mstotal+=sustain;
 							dro[T++]=(sustain>=0x100?1:0);
 							dro[T++]=sustain&0xff;
@@ -504,6 +504,6 @@
 /*----------------------------------------------------------------------*/
 inline unsigned int CrixPlayer::strm_and_fr(unsigned short parm)
 {
-	return ((unsigned int)parm*6+10000)*0.27461678223;
+	return (int)(((unsigned int)parm*6+10000)*0.27461678223);
 }
 
--- a/Plugins/Input/mpg123/mpg123.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/Plugins/Input/mpg123/mpg123.c	Mon Feb 06 17:10:47 2006 -0800
@@ -575,7 +575,8 @@
 {
     struct id3_frame *id3frm;
     gchar *txt;
-    gint tlen, num;
+    gsize tlen;
+    gint num;
 
 #define ID3_SET(_tid,_fld)                                              \
 {                                                                       \
--- a/audacious/controlsocket.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/controlsocket.c	Mon Feb 06 17:10:47 2006 -0800
@@ -204,7 +204,7 @@
 
     pkthdr.version = XMMS_PROTOCOL_VERSION;
     pkthdr.data_length = length;
-    if (write_all(fd, &pkthdr, sizeof(ServerPktHeader)) < sizeof(pkthdr))
+    if ((size_t)write_all(fd, &pkthdr, sizeof(ServerPktHeader)) < sizeof(pkthdr))
         return;
     if (data && length > 0)
         write_all(fd, data, length);
@@ -311,7 +311,7 @@
             continue;
 
         pkt = g_new0(PacketNode, 1);
-        if (read_all(fd, &pkt->hdr, sizeof(ClientPktHeader))
+        if ((size_t)read_all(fd, &pkt->hdr, sizeof(ClientPktHeader))
             < sizeof(ClientPktHeader)) {
             g_free(pkt);
             continue;
@@ -320,7 +320,7 @@
         if (pkt->hdr.data_length) {
             size_t data_length = pkt->hdr.data_length;
             pkt->data = g_malloc0(data_length);
-            if (read_all(fd, pkt->data, data_length) < data_length) {
+            if ((size_t)read_all(fd, pkt->data, data_length) < data_length) {
                 g_free(pkt->data);
                 g_free(pkt);
                 g_warning("ctrlsocket_func(): Incomplete data packet dropped");
@@ -574,23 +574,23 @@
             break;
         case CMD_PLAYQUEUE_ADD:
             num = *((guint32 *) data);
-            if (num < playlist_get_length())
+            if (num < (guint)playlist_get_length())
                 playlist_queue_position(num);
             break;
         case CMD_PLAYQUEUE_REMOVE:
             num = *((guint32 *) data);
-            if (num < playlist_get_length())
+            if (num < (guint)playlist_get_length())
                 playlist_queue_remove(num);
             break;
         case CMD_SET_PLAYLIST_POS:
             num = *((guint32 *) data);
-            if (num < playlist_get_length())
+            if (num < (guint)playlist_get_length())
                 playlist_set_position(num);
             break;
         case CMD_JUMP_TO_TIME:
             num = *((guint32 *) data);
             if (playlist_get_current_length() > 0 &&
-                num < playlist_get_current_length())
+                num < (guint)playlist_get_current_length())
                 bmp_playback_seek(num / 1000);
             break;
         case CMD_SET_VOLUME:
--- a/audacious/equalizer.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/equalizer.c	Mon Feb 06 17:10:47 2006 -0800
@@ -123,41 +123,41 @@
                                          GtkWidget * w);
 
 static GtkItemFactoryEntry equalizerwin_presets_menu_entries[] = {
-    {N_("/Load"), NULL, NULL, 0, "<Branch>"},
+    {N_("/Load"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Load/Preset"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_LOAD_PRESET, "<Item>"},
+     EQUALIZER_PRESETS_LOAD_PRESET, "<Item>", NULL},
     {N_("/Load/Auto-load preset"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_LOAD_AUTOPRESET, "<Item>"},
+     EQUALIZER_PRESETS_LOAD_AUTOPRESET, "<Item>", NULL},
     {N_("/Load/Default"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_LOAD_DEFAULT, "<Item>"},
-    {"/Load/-", NULL, NULL, 0, "<Separator>"},
+     EQUALIZER_PRESETS_LOAD_DEFAULT, "<Item>", NULL},
+    {"/Load/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Load/Zero"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_LOAD_ZERO, "<Item>"},
-    {"/Load/-", NULL, NULL, 0, "<Separator>"},
+     EQUALIZER_PRESETS_LOAD_ZERO, "<Item>", NULL},
+    {"/Load/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Load/From file"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_LOAD_FROM_FILE, "<Item>"},
+     EQUALIZER_PRESETS_LOAD_FROM_FILE, "<Item>", NULL},
     {N_("/Load/From WinAMP EQF file"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_LOAD_FROM_WINAMPFILE, "<Item>"},
-    {N_("/Import"), NULL, NULL, 0, "<Branch>"},
+     EQUALIZER_PRESETS_LOAD_FROM_WINAMPFILE, "<Item>", NULL},
+    {N_("/Import"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Import/WinAMP Presets"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_IMPORT_WINAMPFILE, "<Item>"},
-    {N_("/Save"), NULL, NULL, 0, "<Branch>"},
+     EQUALIZER_PRESETS_IMPORT_WINAMPFILE, "<Item>", NULL},
+    {N_("/Save"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Save/Preset"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_SAVE_PRESET, "<Item>"},
+     EQUALIZER_PRESETS_SAVE_PRESET, "<Item>", NULL},
     {N_("/Save/Auto-load preset"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_SAVE_AUTOPRESET, "<Item>"},
+     EQUALIZER_PRESETS_SAVE_AUTOPRESET, "<Item>", NULL},
     {N_("/Save/Default"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_SAVE_DEFAULT, "<Item>"},
-    {"/Save/-", NULL, NULL, 0, "<Separator>"},
+     EQUALIZER_PRESETS_SAVE_DEFAULT, "<Item>", NULL},
+    {"/Save/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Save/To file"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_SAVE_TO_FILE, "<Item>"},
+     EQUALIZER_PRESETS_SAVE_TO_FILE, "<Item>", NULL},
     {N_("/Save/To WinAMP EQF file"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_SAVE_TO_WINAMPFILE, "<Item>"},
-    {N_("/Delete"), NULL, NULL, 0, "<Branch>"},
+     EQUALIZER_PRESETS_SAVE_TO_WINAMPFILE, "<Item>", NULL},
+    {N_("/Delete"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Delete/Preset"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_DELETE_PRESET, "<Item>"},
+     EQUALIZER_PRESETS_DELETE_PRESET, "<Item>", NULL},
     {N_("/Delete/Auto-load preset"), NULL, equalizerwin_presets_menu_cb,
-     EQUALIZER_PRESETS_DELETE_AUTOPRESET, "<Item>"},
+     EQUALIZER_PRESETS_DELETE_AUTOPRESET, "<Item>", NULL},
 };
 
 static gint equalizerwin_presets_menu_entries_num =
--- a/audacious/iir_cfs.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/iir_cfs.c	Mon Feb 06 17:10:47 2006 -0800
@@ -113,7 +113,7 @@
   { iir_cf25_48000,         band_f025,          1.0/3.0, 25, 48000.0 },
   { iir_cf31_44100,         band_f031,          1.0/3.0, 31, 44100.0 },
   { iir_cf31_48000,         band_f031,          1.0/3.0, 31, 48000.0 },
-  { 0 }
+  { 0, 0, 0, 0, 0 }
 };
 
 /*************
--- a/audacious/input.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/input.c	Mon Feb 06 17:10:47 2006 -0800
@@ -59,7 +59,8 @@
     NULL,
     NULL,
     FALSE,
-    FALSE
+    FALSE,
+    NULL
 };
 
 static GList *vis_list = NULL;
--- a/audacious/logger.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/logger.c	Mon Feb 06 17:10:47 2006 -0800
@@ -51,9 +51,9 @@
 G_LOCK_DEFINE_STATIC(bmp_log_file);
 
 static LogHandler log_handlers[] = {
-    {NULL, LOG_ALL_LEVELS},
-    {"Glib", LOG_ALL_LEVELS},
-    {"Gtk", LOG_ALL_LEVELS}
+    {NULL, LOG_ALL_LEVELS, 0},
+    {"Glib", LOG_ALL_LEVELS, 0},
+    {"Gtk", LOG_ALL_LEVELS, 0}
 };
 
 static guint log_handler_count = G_N_ELEMENTS(log_handlers);
--- a/audacious/main.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/main.c	Mon Feb 06 17:10:47 2006 -0800
@@ -359,7 +359,7 @@
 const gchar *
 xmms_get_gentitle_format(void)
 {
-    gint titlestring_preset = cfg.titlestring_preset;
+    guint titlestring_preset = cfg.titlestring_preset;
 
     if (titlestring_preset < n_titlestring_presets)
 	return bmp_titlestring_presets[titlestring_preset];
--- a/audacious/mainwin.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/mainwin.c	Mon Feb 06 17:10:47 2006 -0800
@@ -243,9 +243,9 @@
 GtkItemFactoryEntry mainwin_songname_menu_entries[] = {
     {N_("/View Track Details"), "<alt>i", mainwin_general_menu_callback,
      MAINWIN_GENERAL_FILEINFO, "<ImageItem>", my_pixbuf},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Autoscroll Songname"), NULL, mainwin_songname_menu_callback,
-     MAINWIN_SONGNAME_SCROLL, "<ToggleItem>"},
+     MAINWIN_SONGNAME_SCROLL, "<ToggleItem>", NULL},
 };
 
 static gint mainwin_songname_menu_entries_num =
@@ -254,71 +254,71 @@
 /* Mini-visualizer area menu */
 
 GtkItemFactoryEntry mainwin_vis_menu_entries[] = {
-    {N_("/Visualization Mode"), NULL, NULL, 0, "<Branch>"},
+    {N_("/Visualization Mode"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Visualization Mode/Analyzer"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_ANALYZER, "<RadioItem>"},
+     MAINWIN_VIS_ANALYZER, "<RadioItem>", NULL},
     {N_("/Visualization Mode/Scope"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_SCOPE, "/Visualization Mode/Analyzer"},
+     MAINWIN_VIS_SCOPE, "/Visualization Mode/Analyzer", NULL},
     {N_("/Visualization Mode/Off"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_OFF, "/Visualization Mode/Analyzer"},
-    {N_("/Analyzer Mode"), NULL, NULL, 0, "<Branch>"},
+     MAINWIN_VIS_OFF, "/Visualization Mode/Analyzer", NULL},
+    {N_("/Analyzer Mode"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Analyzer Mode/Normal"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_ANALYZER_NORMAL, "<RadioItem>"},
+     MAINWIN_VIS_ANALYZER_NORMAL, "<RadioItem>", NULL},
     {N_("/Analyzer Mode/Fire"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_ANALYZER_FIRE, "/Analyzer Mode/Normal"},
+     MAINWIN_VIS_ANALYZER_FIRE, "/Analyzer Mode/Normal", NULL},
     {N_("/Analyzer Mode/Vertical Lines"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_ANALYZER_VLINES, "/Analyzer Mode/Normal"},
-    {"/Analyzer Mode/-", NULL, NULL, 0, "<Separator>"},
+     MAINWIN_VIS_ANALYZER_VLINES, "/Analyzer Mode/Normal", NULL},
+    {"/Analyzer Mode/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Analyzer Mode/Lines"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_ANALYZER_LINES, "<RadioItem>"},
+     MAINWIN_VIS_ANALYZER_LINES, "<RadioItem>", NULL},
     {N_("/Analyzer Mode/Bars"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_ANALYZER_BARS, "/Analyzer Mode/Lines"},
-    {"/Analyzer Mode/-", NULL, NULL, 0, "<Separator>"},
+     MAINWIN_VIS_ANALYZER_BARS, "/Analyzer Mode/Lines", NULL},
+    {"/Analyzer Mode/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Analyzer Mode/Peaks"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_ANALYZER_PEAKS, "<ToggleItem>"},
-    {N_("/Scope Mode"), NULL, NULL, 0, "<Branch>"},
+     MAINWIN_VIS_ANALYZER_PEAKS, "<ToggleItem>", NULL},
+    {N_("/Scope Mode"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Scope Mode/Dot Scope"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_SCOPE_DOT, "<RadioItem>"},
+     MAINWIN_VIS_SCOPE_DOT, "<RadioItem>", NULL},
     {N_("/Scope Mode/Line Scope"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_SCOPE_LINE, "/Scope Mode/Dot Scope"},
+     MAINWIN_VIS_SCOPE_LINE, "/Scope Mode/Dot Scope", NULL},
     {N_("/Scope Mode/Solid Scope"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_SCOPE_SOLID, "/Scope Mode/Dot Scope"},
-    {N_("/WindowShade VU Mode"), NULL, NULL, 0, "<Branch>"},
+     MAINWIN_VIS_SCOPE_SOLID, "/Scope Mode/Dot Scope", NULL},
+    {N_("/WindowShade VU Mode"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/WindowShade VU Mode/Normal"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_VU_NORMAL, "<RadioItem>"},
+     MAINWIN_VIS_VU_NORMAL, "<RadioItem>", NULL},
     {N_("/WindowShade VU Mode/Smooth"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_VU_SMOOTH, "/WindowShade VU Mode/Normal"},
-    {N_("/Refresh Rate"), NULL, NULL, 0, "<Branch>"},
+     MAINWIN_VIS_VU_SMOOTH, "/WindowShade VU Mode/Normal", NULL},
+    {N_("/Refresh Rate"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Refresh Rate/Full (~50 fps)"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_REFRESH_FULL, "<RadioItem>"},
+     MAINWIN_VIS_REFRESH_FULL, "<RadioItem>", NULL},
     {N_("/Refresh Rate/Half (~25 fps)"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_REFRESH_HALF, "/Refresh Rate/Full (~50 fps)"},
+     MAINWIN_VIS_REFRESH_HALF, "/Refresh Rate/Full (~50 fps)", NULL},
     {N_("/Refresh Rate/Quarter (~13 fps)"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_REFRESH_QUARTER, "/Refresh Rate/Full (~50 fps)"},
+     MAINWIN_VIS_REFRESH_QUARTER, "/Refresh Rate/Full (~50 fps)", NULL},
     {N_("/Refresh Rate/Eighth (~6 fps)"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_REFRESH_EIGHTH, "/Refresh Rate/Full (~50 fps)"},
-    {N_("/Analyzer Falloff"), NULL, NULL, 0, "<Branch>"},
+     MAINWIN_VIS_REFRESH_EIGHTH, "/Refresh Rate/Full (~50 fps)", NULL},
+    {N_("/Analyzer Falloff"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Analyzer Falloff/Slowest"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_AFALLOFF_SLOWEST, "<RadioItem>"},
+     MAINWIN_VIS_AFALLOFF_SLOWEST, "<RadioItem>", NULL},
     {N_("/Analyzer Falloff/Slow"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_AFALLOFF_SLOW, "/Analyzer Falloff/Slowest"},
+     MAINWIN_VIS_AFALLOFF_SLOW, "/Analyzer Falloff/Slowest", NULL},
     {N_("/Analyzer Falloff/Medium"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_AFALLOFF_MEDIUM, "/Analyzer Falloff/Slowest"},
+     MAINWIN_VIS_AFALLOFF_MEDIUM, "/Analyzer Falloff/Slowest", NULL},
     {N_("/Analyzer Falloff/Fast"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_AFALLOFF_FAST, "/Analyzer Falloff/Slowest"},
+     MAINWIN_VIS_AFALLOFF_FAST, "/Analyzer Falloff/Slowest", NULL},
     {N_("/Analyzer Falloff/Fastest"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_AFALLOFF_FASTEST, "/Analyzer Falloff/Slowest"},
-    {N_("/Peaks Falloff"), NULL, NULL, 0, "<Branch>"},
+     MAINWIN_VIS_AFALLOFF_FASTEST, "/Analyzer Falloff/Slowest", NULL},
+    {N_("/Peaks Falloff"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Peaks Falloff/Slowest"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_PFALLOFF_SLOWEST, "<RadioItem>"},
+     MAINWIN_VIS_PFALLOFF_SLOWEST, "<RadioItem>", NULL},
     {N_("/Peaks Falloff/Slow"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_PFALLOFF_SLOW, "/Peaks Falloff/Slowest"},
+     MAINWIN_VIS_PFALLOFF_SLOW, "/Peaks Falloff/Slowest", NULL},
     {N_("/Peaks Falloff/Medium"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_PFALLOFF_MEDIUM, "/Peaks Falloff/Slowest"},
+     MAINWIN_VIS_PFALLOFF_MEDIUM, "/Peaks Falloff/Slowest", NULL},
     {N_("/Peaks Falloff/Fast"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_PFALLOFF_FAST, "/Peaks Falloff/Slowest"},
+     MAINWIN_VIS_PFALLOFF_FAST, "/Peaks Falloff/Slowest", NULL},
     {N_("/Peaks Falloff/Fastest"), NULL, mainwin_vis_menu_callback,
-     MAINWIN_VIS_PFALLOFF_FASTEST, "/Peaks Falloff/Slowest"}
+     MAINWIN_VIS_PFALLOFF_FASTEST, "/Peaks Falloff/Slowest", NULL}
 };
 
 static const gint mainwin_vis_menu_entries_num =
@@ -329,14 +329,14 @@
 GtkItemFactoryEntry mainwin_playback_menu_entries[] = {
     {N_("/Play CD"), "<alt>C", mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAYCD, "<StockItem>", GTK_STOCK_CDROM},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Repeat"), "R", mainwin_play_menu_callback,
-     MAINWIN_OPT_REPEAT, "<ToggleItem>"},
+     MAINWIN_OPT_REPEAT, "<ToggleItem>", NULL},
     {N_("/Shuffle"), "S", mainwin_play_menu_callback,
-     MAINWIN_OPT_SHUFFLE, "<ToggleItem>"},
+     MAINWIN_OPT_SHUFFLE, "<ToggleItem>", NULL},
     {N_("/No Playlist Advance"), "<control>N", mainwin_play_menu_callback,
-     MAINWIN_OPT_NPA, "<ToggleItem>"},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+     MAINWIN_OPT_NPA, "<ToggleItem>", NULL},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Play"), "x", mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAY, "<StockItem>", GTK_STOCK_MEDIA_PLAY},
     {N_("/Pause"), "c", mainwin_general_menu_callback,
@@ -347,15 +347,15 @@
      MAINWIN_GENERAL_PREV, "<StockItem>", GTK_STOCK_MEDIA_PREVIOUS},
     {N_("/Next"), "b", mainwin_general_menu_callback,
      MAINWIN_GENERAL_NEXT, "<StockItem>", GTK_STOCK_MEDIA_NEXT},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Jump to Playlist Start"), "<control>Z", mainwin_general_menu_callback,
      MAINWIN_GENERAL_START, "<StockItem>", GTK_STOCK_GOTO_TOP},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Jump to File"), "J", mainwin_general_menu_callback,
      MAINWIN_GENERAL_JTF, "<StockItem>", GTK_STOCK_JUMP_TO},
     {N_("/Jump to Time"), "<control>J", mainwin_general_menu_callback,
      MAINWIN_GENERAL_JTT, "<StockItem>", GTK_STOCK_JUMP_TO},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/View Track Details"), "<alt>I", mainwin_general_menu_callback,
      MAINWIN_GENERAL_FILEINFO, "<ImageItem>", my_pixbuf}
 };
@@ -368,16 +368,16 @@
 GtkItemFactoryEntry mainwin_general_menu_entries[] = {
     {N_("/About Audacious"), NULL, mainwin_general_menu_callback,
      MAINWIN_GENERAL_ABOUT, "<StockItem>", GTK_STOCK_DIALOG_INFO},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Play File"), "L", mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAYFILE, "<StockItem>", GTK_STOCK_OPEN},
     {N_("/Play Location"), "<control>L", mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAYLOCATION, "<StockItem>", GTK_STOCK_NETWORK},
-    {"/-", NULL, NULL, 0, "<Separator>"},
-    {N_("/V_isualization"), NULL, NULL, 0, "<Item>"},
-    {N_("/_Playback"), NULL, NULL, 0, "<Item>"},
-    {N_("/_View"), NULL, NULL, 0, "<Item>"},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
+    {N_("/V_isualization"), NULL, NULL, 0, "<Item>", NULL},
+    {N_("/_Playback"), NULL, NULL, 0, "<Item>", NULL},
+    {N_("/_View"), NULL, NULL, 0, "<Item>", NULL},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Preferences"), "<control>P", mainwin_general_menu_callback,
      MAINWIN_GENERAL_PREFS, "<StockItem>", GTK_STOCK_PREFERENCES},
     {N_("/_Quit"), NULL, mainwin_general_menu_callback,
@@ -403,26 +403,26 @@
 
 GtkItemFactoryEntry mainwin_view_menu_entries[] = {
     {N_("/Show Playlist Editor"), "<alt>E", mainwin_general_menu_callback,
-     MAINWIN_GENERAL_SHOWPLWIN, "<ToggleItem>"},
+     MAINWIN_GENERAL_SHOWPLWIN, "<ToggleItem>", NULL},
     {N_("/Show Equalizer"), "<alt>G", mainwin_general_menu_callback,
-     MAINWIN_GENERAL_SHOWEQWIN, "<ToggleItem>"},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+     MAINWIN_GENERAL_SHOWEQWIN, "<ToggleItem>", NULL},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Time Elapsed"), "<control>E", mainwin_view_menu_callback,
-     MAINWIN_OPT_TELAPSED, "<RadioItem>"},
+     MAINWIN_OPT_TELAPSED, "<RadioItem>", NULL},
     {N_("/Time Remaining"), "<control>R", mainwin_view_menu_callback,
-     MAINWIN_OPT_TREMAINING, "/Time Elapsed"},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+     MAINWIN_OPT_TREMAINING, "/Time Elapsed", NULL},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Always On Top"), "<control>o", mainwin_view_menu_callback,
-     MAINWIN_OPT_ALWAYS, "<ToggleItem>"},
+     MAINWIN_OPT_ALWAYS, "<ToggleItem>", NULL},
     {N_("/Put on All Workspaces"), "<control>S",
-     mainwin_view_menu_callback, MAINWIN_OPT_STICKY, "<ToggleItem>"},
-    {"/-", NULL, NULL, 0, "<Separator>"},
+     mainwin_view_menu_callback, MAINWIN_OPT_STICKY, "<ToggleItem>", NULL},
+    {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Roll up Player"), "<control>W", mainwin_view_menu_callback,
-     MAINWIN_OPT_WS, "<ToggleItem>"},
+     MAINWIN_OPT_WS, "<ToggleItem>", NULL},
     {N_("/Roll up Playlist Editor"), "<control><shift>W", mainwin_view_menu_callback,
-     MAINWIN_OPT_PWS, "<ToggleItem>"},
+     MAINWIN_OPT_PWS, "<ToggleItem>", NULL},
     {N_("/Roll up Equalizer"), "<control><alt>W", mainwin_view_menu_callback,
-     MAINWIN_OPT_EQWS, "<ToggleItem>"}
+     MAINWIN_OPT_EQWS, "<ToggleItem>", NULL}
 };
 
 static const gint mainwin_view_menu_entries_num =
@@ -1234,7 +1234,8 @@
 mainwin_jump_to_time_cb(GtkWidget * widget,
                         GtkWidget * entry)
 {
-    guint min = 0, sec = 0, params, time;
+    guint min = 0, sec = 0, params;
+    gint time;
 
     params = sscanf(gtk_entry_get_text(GTK_ENTRY(entry)), "%u:%u",
                     &min, &sec);
--- a/audacious/menurow.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/menurow.c	Mon Feb 06 17:10:47 2006 -0800
@@ -149,7 +149,7 @@
         if (mr->mr_selected == MENUROW_DOUBLESIZE)
             mr->mr_doublesize_selected = !mr->mr_doublesize_selected;
 
-        if (mr->mr_selected != -1 && mr->mr_release_callback)
+        if ((int)(mr->mr_selected) != -1 && mr->mr_release_callback)
             mr->mr_release_callback(mr->mr_selected);
 
         mr->mr_selected = MENUROW_NONE;
--- a/audacious/output.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/output.c	Mon Feb 06 17:10:47 2006 -0800
@@ -185,7 +185,7 @@
 {
     static int init = 0;
     int swapped = 0;
-    int myorder = G_BYTE_ORDER == G_LITTLE_ENDIAN ? FMT_S16_LE : FMT_S16_BE;
+    guint myorder = G_BYTE_ORDER == G_LITTLE_ENDIAN ? FMT_S16_LE : FMT_S16_BE;
     int caneq = (fmt == FMT_S16_NE || fmt == myorder);
     OutputPlugin *op = get_current_output_plugin();
 
--- a/audacious/playlist_list.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/playlist_list.c	Mon Feb 06 17:10:47 2006 -0800
@@ -641,7 +641,8 @@
      */
 
     if (pl->pl_drag_motion) {
-        guint pos, x, y, plx, ply, plength, lpadding;
+        guint pos, plength, lpadding;
+	gint x, y, plx, ply;
 
         if (cfg.show_numbers_in_pl) {
             lpadding = gint_count_digits(playlist_get_length_nolock()) + 1;
--- a/audacious/prefswin.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/prefswin.c	Mon Feb 06 17:10:47 2006 -0800
@@ -828,7 +828,7 @@
 {
     gtk_combo_box_set_active(GTK_COMBO_BOX(cbox), cfg.titlestring_preset);
     gtk_widget_set_sensitive(GTK_WIDGET(data), 
-                             (cfg.titlestring_preset == n_titlestring_presets));
+                             (cfg.titlestring_preset == (gint)n_titlestring_presets));
 }
 
 static void
@@ -1445,7 +1445,7 @@
 static gboolean
 prefswin_get_skin_update(void)
 {
-    return (gboolean) g_object_get_data(G_OBJECT(prefswin), "update-skins");
+    return g_object_get_data(G_OBJECT(prefswin), "update-skins") != 0;
 }
 
 static gboolean
@@ -1645,7 +1645,7 @@
     GtkWidget *widget, *widget2;
 
     GtkWidget *titlestring_tag_menu, *menu_item;
-    gint i;
+    guint i;
         
     /* load the interface */
     xml = glade_xml_new_or_die(_("Preferences Window"), glade_file, NULL,
--- a/audacious/skin.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/skin.c	Mon Feb 06 17:10:47 2006 -0800
@@ -76,20 +76,20 @@
 };
 
 static SkinPixmapIdMapping skin_pixmap_id_map[] = {
-    {SKIN_MAIN, "main", NULL},
-    {SKIN_CBUTTONS, "cbuttons", NULL},
-    {SKIN_SHUFREP, "shufrep", NULL},
-    {SKIN_TEXT, "text", NULL},
-    {SKIN_TITLEBAR, "titlebar", NULL},
-    {SKIN_VOLUME, "volume", NULL},
-    {SKIN_BALANCE, "balance", "volume"},
-    {SKIN_MONOSTEREO, "monoster", NULL},
-    {SKIN_PLAYPAUSE, "playpaus", NULL},
-    {SKIN_NUMBERS, "nums_ex", "numbers"},
-    {SKIN_POSBAR, "posbar", NULL},
-    {SKIN_EQMAIN, "eqmain", NULL},
-    {SKIN_PLEDIT, "pledit", NULL},
-    {SKIN_EQ_EX, "eq_ex", NULL}
+    {SKIN_MAIN, "main", NULL, 0, 0},
+    {SKIN_CBUTTONS, "cbuttons", NULL, 0, 0},
+    {SKIN_SHUFREP, "shufrep", NULL, 0, 0},
+    {SKIN_TEXT, "text", NULL, 0, 0},
+    {SKIN_TITLEBAR, "titlebar", NULL, 0, 0},
+    {SKIN_VOLUME, "volume", NULL, 0, 0},
+    {SKIN_BALANCE, "balance", "volume", 0, 0},
+    {SKIN_MONOSTEREO, "monoster", NULL, 0, 0},
+    {SKIN_PLAYPAUSE, "playpaus", NULL, 0, 0},
+    {SKIN_NUMBERS, "nums_ex", "numbers", 0, 0},
+    {SKIN_POSBAR, "posbar", NULL, 0, 0},
+    {SKIN_EQMAIN, "eqmain", NULL, 0, 0},
+    {SKIN_PLEDIT, "pledit", NULL, 0, 0},
+    {SKIN_EQ_EX, "eq_ex", NULL, 0, 0}
 };
 
 static guint skin_pixmap_id_map_size = G_N_ELEMENTS(skin_pixmap_id_map);
@@ -224,9 +224,9 @@
 }
 
 const SkinPixmapIdMapping *
-skin_pixmap_id_lookup(gint id)
+skin_pixmap_id_lookup(guint id)
 {
-    gint i;
+    guint i;
 
     for (i = 0; i < skin_pixmap_id_map_size; i++) {
         if (id == skin_pixmap_id_map[i].id) {
@@ -240,7 +240,7 @@
 const gchar *
 skin_pixmap_id_to_name(SkinPixmapId id)
 {
-    gint i;
+    guint i;
 
     for (i = 0; i < skin_pixmap_id_map_size; i++) {
         if (id == skin_pixmap_id_map[i].id)
@@ -418,7 +418,7 @@
 static void
 skin_query_color(GdkColormap * cm, GdkColor * c)
 {
-    XColor xc = { 0 };
+    XColor xc = { 0,0,0,0,0,0 };
 
     xc.pixel = c->pixel;
     XQueryColor(GDK_COLORMAP_XDISPLAY(cm), GDK_COLORMAP_XCOLORMAP(cm), &xc);
@@ -581,7 +581,8 @@
     gchar *filename = NULL;
     gboolean created_mask = FALSE;
     GArray *num, *point;
-    gint i, j, k;
+    guint i, j;
+    gint k;
 
     if (path)
         filename = find_file_recursively(path, file);
@@ -613,7 +614,7 @@
 
     j = 0;
     for (i = 0; i < num->len; i++) {
-        if ((point->len - j) >= (g_array_index(num, gint, i) * 2)) {
+        if ((int)(point->len - j) >= (g_array_index(num, gint, i) * 2)) {
             created_mask = TRUE;
             gpoints = g_new(GdkPoint, g_array_index(num, gint, i));
             for (k = 0; k < g_array_index(num, gint, i); k++) {
--- a/audacious/softvolume.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/softvolume.c	Mon Feb 06 17:10:47 2006 -0800
@@ -121,7 +121,8 @@
 effect_16bit(gint max, gint min, guint length, gint16 * sdata,
              SoftVolumeConfig * c)
 {
-    gint i, v;
+    guint i;
+    gint v;
 
     for (i = 0; i < (length >> 2); ++i) {   /* ie. length/4 */
         v = (gint) ((*sdata * c->volume_left) / 100);
@@ -143,7 +144,8 @@
 effect_8bit(gint max, gint min, guint length, gint8 * sdata,
             SoftVolumeConfig * c)
 {
-    gint i, v;
+    guint i;
+    gint v;
 
     for (i = 0; i < (length >> 1); ++i) {   /* ie. length/2 */
         v = (gint) ((*sdata * c->volume_left) / 100);
--- a/audacious/ui_playlist.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/ui_playlist.c	Mon Feb 06 17:10:47 2006 -0800
@@ -58,7 +58,7 @@
 #include "images/audacious_playlist.xpm"
 
 
-#define ITEM_SEPARATOR {"/-", NULL, NULL, 0, "<Separator>"}
+#define ITEM_SEPARATOR {"/-", NULL, NULL, 0, "<Separator>", NULL}
 
 
 enum {
@@ -161,7 +161,7 @@
 static GtkItemFactoryEntry pldel_menu_entries[] = {
     {N_("/Clear Queue"), "<shift>Q",
      playlistwin_popup_menu_callback,
-     PLIST_CQUEUE, "<Item>"},
+     PLIST_CQUEUE, "<Item>", NULL},
 
     ITEM_SEPARATOR,
 
@@ -224,28 +224,28 @@
 
 static GtkItemFactoryEntry plsort_menu_entries[] = {
     {N_("/Randomize List"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_RANDOMIZE, "<Item>"},
+     PLAYLISTWIN_SORT_RANDOMIZE, "<Item>", NULL},
     {N_("/Reverse List"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_REVERSE, "<Item>"},
+     PLAYLISTWIN_SORT_REVERSE, "<Item>", NULL},
     ITEM_SEPARATOR,
-    {N_("/Sort List"), NULL, NULL, 0, "<Branch>"},
+    {N_("/Sort List"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Sort List/By Title"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_BYTITLE, "<Item>"},
+     PLAYLISTWIN_SORT_BYTITLE, "<Item>", NULL},
     {N_("/Sort List/By Filename"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_BYFILENAME, "<Item>"},
+     PLAYLISTWIN_SORT_BYFILENAME, "<Item>", NULL},
     {N_("/Sort List/By Path + Filename"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_BYPATH, "<Item>"},
+     PLAYLISTWIN_SORT_BYPATH, "<Item>", NULL},
     {N_("/Sort List/By Date"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_BYDATE, "<Item>"},
-    {N_("/Sort Selection"), NULL, NULL, 0, "<Branch>"},
+     PLAYLISTWIN_SORT_BYDATE, "<Item>", NULL},
+    {N_("/Sort Selection"), NULL, NULL, 0, "<Branch>", NULL},
     {N_("/Sort Selection/By Title"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_SEL_BYTITLE, "<Item>"},
+     PLAYLISTWIN_SORT_SEL_BYTITLE, "<Item>", NULL},
     {N_("/Sort Selection/By Filename"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_SEL_BYFILENAME, "<Item>"},
+     PLAYLISTWIN_SORT_SEL_BYFILENAME, "<Item>", NULL},
     {N_("/Sort Selection/By Path + Filename"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_SEL_BYPATH, "<Item>"},
+     PLAYLISTWIN_SORT_SEL_BYPATH, "<Item>", NULL},
     {N_("/Sort Selection/By Date"), NULL, plsort_menu_callback,
-     PLAYLISTWIN_SORT_SEL_BYDATE, "<Item>"}
+     PLAYLISTWIN_SORT_SEL_BYDATE, "<Item>", NULL}
 };
 
 
@@ -342,7 +342,8 @@
 playlistwin_update_sinfo(void)
 {
     gchar *posstr, *timestr, *title, *info, *dots;
-    gint pos, time, max_len;
+    gint pos, time;
+    guint max_len;
 
     pos = playlist_get_position();
     title = playlist_get_songtitle(pos);
@@ -1467,7 +1468,7 @@
                                selection_data, guint info,
                                guint time, gpointer user_data)
 {
-    guint pos;
+    gint pos;
 
     g_return_if_fail(selection_data != NULL);
 
--- a/audacious/util.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/audacious/util.c	Mon Feb 06 17:10:47 2006 -0800
@@ -394,11 +394,11 @@
                 const gchar * key)
 {
     gchar *buffer, *ret_buffer = NULL;
-    gint found_section = 0, off = 0, len = 0;
-    gsize filesize;
+    gint found_section = 0, len = 0;
+    gsize filesize, off = 0;
     gchar *outbuf;
     unsigned char x[] = { 0xff, 0xfe, 0x00 };
-    int counter;
+    guint counter;
 
     if (!filename)
         return NULL;
--- a/libaudacious/beepctrl.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/libaudacious/beepctrl.c	Mon Feb 06 17:10:47 2006 -0800
@@ -99,7 +99,7 @@
         if (pkt_hdr->data_length) {
             size_t data_length = pkt_hdr->data_length;
             data = g_malloc0(data_length);
-            if (read_all(fd, data, data_length) < data_length) {
+            if ((size_t)read_all(fd, data, data_length) < data_length) {
                 g_free(data);
                 data = NULL;
             }
@@ -129,7 +129,7 @@
     pkt_hdr.version = XMMS_PROTOCOL_VERSION;
     pkt_hdr.command = command;
     pkt_hdr.data_length = data_length;
-    if (write_all(fd, &pkt_hdr, sizeof(ClientPktHeader)) < sizeof(pkt_hdr))
+    if ((size_t)write_all(fd, &pkt_hdr, sizeof(ClientPktHeader)) < sizeof(pkt_hdr))
         return;
     if (data_length && data)
         write_all(fd, data, data_length);
--- a/libaudacious/xconvert.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/libaudacious/xconvert.c	Mon Feb 06 17:10:47 2006 -0800
@@ -29,7 +29,7 @@
 static void *
 convert_get_buffer(struct buffer *buffer, size_t size)
 {
-    if (size > 0 && size <= buffer->size)
+    if (size > 0 && size <= (size_t)buffer->size)
         return buffer->buffer;
 
     buffer->size = size;
--- a/libaudacious/xentry.c	Mon Feb 06 16:52:28 2006 -0800
+++ b/libaudacious/xentry.c	Mon Feb 06 17:10:47 2006 -0800
@@ -215,7 +215,7 @@
 
     if (return_val && (editable->current_pos != initial_pos)) {
         if (extend_selection) {
-            int cpos = gtk_editable_get_position(GTK_EDITABLE(editable));
+            size_t cpos = gtk_editable_get_position(GTK_EDITABLE(editable));
             if (cpos < sel_start_pos)
                 sel_start_pos = cpos;
             else if (cpos > sel_end_pos)