diff -Naur bmp-0.9.7.1/Input/cdaudio/cdaudio.c bmp-0.9.7.1-fixed/Input/cdaudio/cdaudio.c --- bmp-0.9.7.1/Input/cdaudio/cdaudio.c 2004-09-17 01:45:15.000000000 +0200 +++ bmp-0.9.7.1-fixed/Input/cdaudio/cdaudio.c 2008-03-28 18:40:50.000000000 +0100 @@ -40,6 +40,11 @@ #include #include "beep/output.h" +#if defined(HAVE_GETMNTINFO) +# include +# include +#endif + #ifdef CDROMSTOP # define XMMS_STOP CDROMSTOP #elif defined CDIOCSTOP @@ -579,7 +584,7 @@ FILE *mounts; struct mntent *mnt; #elif defined(HAVE_GETMNTINFO) - struct statfs *fsp; + struct statvfs *fsp; int entries; #endif @@ -605,7 +610,7 @@ #elif defined(HAVE_GETMNTINFO) entries = getmntinfo(&fsp, MNT_NOWAIT); if (entries < 0) - return NULL; + return FALSE; while (entries-- > 0) { if (!strcmp(fsp->f_mntfromname, devname)) diff -Naur bmp-0.9.7.1/beep/controlsocket.c bmp-0.9.7.1-fixed/beep/controlsocket.c --- bmp-0.9.7.1/beep/controlsocket.c 2005-09-05 00:36:04.000000000 +0200 +++ bmp-0.9.7.1-fixed/beep/controlsocket.c 2008-03-28 18:25:20.000000000 +0100 @@ -288,7 +288,7 @@ struct timeval tv; struct sockaddr_un saddr; gint fd, b, i; - guint32 info[3]; + gint32 info[3]; gint32 v[2]; PacketNode *pkt; socklen_t len; diff -Naur bmp-0.9.7.1/beep/getopt.c bmp-0.9.7.1-fixed/beep/getopt.c --- bmp-0.9.7.1/beep/getopt.c 2004-06-20 20:48:54.000000000 +0200 +++ bmp-0.9.7.1-fixed/beep/getopt.c 2008-03-28 18:34:32.000000000 +0100 @@ -631,6 +631,7 @@ optarg = nameend + 1; else { if (opterr) + { if (argv[optind - 1][1] == '-') /* --option */ fprintf(stderr, @@ -644,6 +645,7 @@ ("%s: option `%c%s' doesn't allow an argument\n"), argv[0], argv[optind - 1][0], pfound->name); + } nextchar += strlen(nextchar); diff -Naur bmp-0.9.7.1/beep/logger.c bmp-0.9.7.1-fixed/beep/logger.c --- bmp-0.9.7.1/beep/logger.c 2005-02-22 23:15:38.000000000 +0100 +++ bmp-0.9.7.1-fixed/beep/logger.c 2008-03-28 18:31:49.000000000 +0100 @@ -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); diff -Naur bmp-0.9.7.1/beep/main.c bmp-0.9.7.1-fixed/beep/main.c --- bmp-0.9.7.1/beep/main.c 2005-08-27 13:20:04.000000000 +0200 +++ bmp-0.9.7.1-fixed/beep/main.c 2008-03-28 18:31:20.000000000 +0100 @@ -351,7 +351,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]; diff -Naur bmp-0.9.7.1/beep/playlist_list.c bmp-0.9.7.1-fixed/beep/playlist_list.c --- bmp-0.9.7.1/beep/playlist_list.c 2005-01-15 10:06:30.000000000 +0100 +++ bmp-0.9.7.1-fixed/beep/playlist_list.c 2008-03-28 18:30:44.000000000 +0100 @@ -635,7 +635,8 @@ */ if (pl->pl_drag_motion) { - guint pos, x, y, plx, ply, plength, lpadding; + gint pos, x, plx, ply, plength, lpadding; + gint y; if (cfg.show_numbers_in_pl) { lpadding = gint_count_digits(playlist_get_length_nolock()) + 1; diff -Naur bmp-0.9.7.1/beep/prefswin.c bmp-0.9.7.1-fixed/beep/prefswin.c --- bmp-0.9.7.1/beep/prefswin.c 2005-05-02 02:54:05.000000000 +0200 +++ bmp-0.9.7.1-fixed/beep/prefswin.c 2008-03-28 18:33:10.000000000 +0100 @@ -1426,7 +1426,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") != NULL; } static gboolean diff -Naur bmp-0.9.7.1/beep/skin.c bmp-0.9.7.1-fixed/beep/skin.c --- bmp-0.9.7.1/beep/skin.c 2005-01-06 18:10:49.000000000 +0100 +++ bmp-0.9.7.1-fixed/beep/skin.c 2008-03-28 18:03:10.000000000 +0100 @@ -72,20 +72,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); @@ -220,9 +220,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) { @@ -236,7 +236,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) @@ -396,8 +396,9 @@ static void skin_query_color(GdkColormap * cm, GdkColor * c) { - XColor xc = { 0 }; + XColor xc; + memset(&xc, 0, sizeof(xc)); xc.pixel = c->pixel; XQueryColor(GDK_COLORMAP_XDISPLAY(cm), GDK_COLORMAP_XCOLORMAP(cm), &xc); c->red = xc.red; @@ -559,7 +560,7 @@ gchar *filename = NULL; gboolean created_mask = FALSE; GArray *num, *point; - gint i, j, k; + guint i, j, k; if (path) filename = find_file_recursively(path, file); @@ -591,10 +592,10 @@ j = 0; for (i = 0; i < num->len; i++) { - if ((point->len - j) >= (g_array_index(num, gint, i) * 2)) { + if ((point->len - j) >= (g_array_index(num, guint, 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++) { + for (k = 0; k < g_array_index(num, guint, i); k++) { gpoints[k].x = g_array_index(point, gint, j + k * 2); gpoints[k].y = g_array_index(point, gint, j + k * 2 + 1); } diff -Naur bmp-0.9.7.1/beep/textbox.c bmp-0.9.7.1-fixed/beep/textbox.c --- bmp-0.9.7.1/beep/textbox.c 2004-12-31 00:13:39.000000000 +0100 +++ bmp-0.9.7.1-fixed/beep/textbox.c 2008-03-28 18:27:08.000000000 +0100 @@ -442,9 +442,10 @@ gc = tb->tb_widget.gc; for (i = 0; i < length; i++) { - gchar c; + gint c; x = y = -1; - c = toupper(pixmaptext[i]); + c = pixmaptext[i]; + c = toupper(c); if (c >= 'A' && c <= 'Z') { x = 5 * (c - 'A'); y = 0; diff -Naur bmp-0.9.7.1/beep/util.c bmp-0.9.7.1-fixed/beep/util.c --- bmp-0.9.7.1/beep/util.c 2005-08-01 20:16:52.000000000 +0200 +++ bmp-0.9.7.1-fixed/beep/util.c 2008-03-28 18:09:31.000000000 +0100 @@ -392,7 +392,9 @@ const gchar * key) { gchar *buffer, *ret_buffer = NULL; - gint found_section = 0, off = 0, len = 0; + gint found_section = 0; + gsize off = 0; + gint len = 0; gsize filesize; if (!filename) diff -Naur bmp-0.9.7.1/libbeep/xentry.c bmp-0.9.7.1-fixed/libbeep/xentry.c --- bmp-0.9.7.1/libbeep/xentry.c 2004-06-20 20:48:56.000000000 +0200 +++ bmp-0.9.7.1-fixed/libbeep/xentry.c 2008-03-28 18:23:03.000000000 +0100 @@ -215,7 +215,7 @@ if (return_val && (editable->current_pos != initial_pos)) { if (extend_selection) { - int cpos = gtk_editable_get_position(GTK_EDITABLE(editable)); + gint cpos = gtk_editable_get_position(GTK_EDITABLE(editable)); if (cpos < sel_start_pos) sel_start_pos = cpos; else if (cpos > sel_end_pos)