--- xcdroast-0.98alpha15.orig/po/de.po Thu Oct 30 21:14:00 2003 +++ xcdroast-0.98alpha15/po/de.po Sun Feb 12 18:42:21 2006 @@ -4285,7 +4285,7 @@ #: src/setup.c:2712 msgid "Progress-indicator in window-title" -msgstr "Fortschrittsanzeige im Festertitel" +msgstr "Fortschrittsanzeige im Fenstertitel" #: src/setup.c:2719 msgid "" --- xcdroast-0.98alpha15.orig/src/create.c Thu Oct 30 12:28:10 2003 +++ xcdroast-0.98alpha15/src/create.c Mon Feb 13 01:48:21 2006 @@ -2277,7 +2277,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - bigtmp, strlen(bigtmp)); + (const unsigned char *) bigtmp, strlen(bigtmp)); data_sent = TRUE; } } else { @@ -2301,7 +2301,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - bigtmp, strlen(bigtmp)); + (const unsigned char *) bigtmp, strlen(bigtmp)); data_sent = TRUE; } } @@ -2314,7 +2314,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - cstrptr, strlen(cstrptr)); + (const unsigned char *) cstrptr, strlen(cstrptr)); } } @@ -2360,7 +2360,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - bigtmp, strlen(bigtmp)); + (const unsigned char *) bigtmp, strlen(bigtmp)); data_sent = TRUE; } } else { @@ -2384,7 +2384,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - bigtmp, strlen(bigtmp)); + (const unsigned char *) bigtmp, strlen(bigtmp)); data_sent = TRUE; } } @@ -2397,7 +2397,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - cstrptr, strlen(cstrptr)); + (const unsigned char *) cstrptr, strlen(cstrptr)); } } @@ -2532,7 +2532,7 @@ match = "xcdr:"; } - text = selection_data->data; + text = (char *) selection_data->data; if (extract_glist_drag_filenames(text, selection_data->length, match, &input)) { @@ -2592,7 +2592,7 @@ if ((info == DRAG_TAR_INFO_0) || (info == DRAG_TAR_INFO_1) || (info == DRAG_TAR_INFO_2)) { - text = selection_data->data; + text = (char *) selection_data->data; if (extract_glist_drag_filenames(text, selection_data->length, "xrmv:", &input)) { @@ -4262,7 +4262,7 @@ if ((info == DRAG_TAR_INFO_0) || (info == DRAG_TAR_INFO_1) || (info == DRAG_TAR_INFO_2)) { - text = selection_data->data; + text = (char *) selection_data->data; if (extract_single_drag_filename(text, selection_data->length, newdir)) { /* extracted the plain filename from drag */ if (strcmp(newdir,"") != 0) { @@ -4298,7 +4298,7 @@ if ((info == DRAG_TAR_INFO_0) || (info == DRAG_TAR_INFO_1) || (info == DRAG_TAR_INFO_2)) { - text = selection_data->data; + text = (char *) selection_data->data; if (extract_glist_drag_filenames(text, selection_data->length, "file:", &input)) { @@ -4368,7 +4368,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - bigtmp, strlen(bigtmp)); + (const unsigned char *) bigtmp, strlen(bigtmp)); data_sent = TRUE; } else { /* return not from focus but all selected */ @@ -4393,7 +4393,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - bigtmp, strlen(bigtmp)); + (const unsigned char *) bigtmp, strlen(bigtmp)); data_sent = TRUE; } } @@ -4406,7 +4406,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - cstrptr, strlen(cstrptr)); + (const unsigned char *) cstrptr, strlen(cstrptr)); } } @@ -5706,7 +5706,7 @@ if ((info == DRAG_TAR_INFO_0) || (info == DRAG_TAR_INFO_1) || (info == DRAG_TAR_INFO_2)) { - text = selection_data->data; + text = (char *) selection_data->data; if (extract_single_drag_filename(text, selection_data->length, newdir)) { /* extracted the plain filename from drag */ if (strcmp(newdir,"") != 0) { --- xcdroast-0.98alpha15.orig/src/menus.c Thu Oct 30 21:11:47 2003 +++ xcdroast-0.98alpha15/src/menus.c Mon Feb 13 01:49:56 2006 @@ -1086,7 +1086,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - tmp, strlen(tmp)); + (const unsigned char *) tmp, strlen(tmp)); data_sent = TRUE; } } else { @@ -1113,7 +1113,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - bigtmp, strlen(bigtmp)); + (const unsigned char *) bigtmp, strlen(bigtmp)); data_sent = TRUE; } } @@ -1126,7 +1126,7 @@ gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, 8, - cstrptr, strlen(cstrptr)); + (const unsigned char *) cstrptr, strlen(cstrptr)); } } @@ -1153,7 +1153,7 @@ if ((info == DRAG_TAR_INFO_0) || (info == DRAG_TAR_INFO_1) || (info == DRAG_TAR_INFO_2)) { - text = selection_data->data; + text = (char *) selection_data->data; /* this drag was received in the master menu file tree */ if (mastermenu) { --- xcdroast-0.98alpha15.orig/src/setup.c Thu Oct 30 12:50:25 2003 +++ xcdroast-0.98alpha15/src/setup.c Mon Feb 13 01:50:44 2006 @@ -176,6 +176,8 @@ /* calculate all setup-data before leaving setup-menu */ +extern gchar security_key[MAXLINE]; + static gint menu_setup_ok_work(GtkWidget *widget, gpointer data) { gint i, n; gchar *rowdata[2]; @@ -1688,7 +1690,7 @@ if ((info == DRAG_TAR_INFO_0) || (info == DRAG_TAR_INFO_1) || (info == DRAG_TAR_INFO_2)) { - text = selection_data->data; + text = (char *) selection_data->data; if (extract_single_drag_filename(text, selection_data->length, newdir)) { /* extracted the plain filename from drag */ if (strcmp(newdir,"") != 0) { @@ -2148,7 +2150,7 @@ if ((info == DRAG_TAR_INFO_0) || (info == DRAG_TAR_INFO_1) || (info == DRAG_TAR_INFO_2)) { - text = selection_data->data; + text = (char *) selection_data->data; if (extract_single_drag_filename(text, selection_data->length, newdir)) { /* extracted the plain filename from drag */ if (strcmp(newdir,"") != 0) { --- xcdroast-0.98alpha15.orig/src/xtools.c Thu Oct 30 14:06:17 2003 +++ xcdroast-0.98alpha15/src/xtools.c Mon Feb 13 01:52:25 2006 @@ -1851,7 +1851,6 @@ /* return 1 if, 0 if not */ gint check_wav_file(gchar *wavname) { -guchar waveHdr[44]; gint fd; fd = open (wavname, O_RDONLY, 0); @@ -1859,20 +1858,12 @@ return 0; } - read(fd, &waveHdr, sizeof(waveHdr)); - - if (!is_std_wav_file(waveHdr)) { - /* no wav at all */ + if (!is_std_wav_file(fd, NULL)) { + /* no wav at all or not cd-quality */ close(fd); return 0; } - /* is it in cd-quality? */ - if (!is_in_cd_quality(waveHdr)) { - close(fd); - return 0; - } - /* passed all tests */ close(fd); return 1; @@ -3615,7 +3606,7 @@ } utfstr = NULL; - utfstr = g_locale_to_utf8(str, strlen(str), &in, &out, NULL); + utfstr = g_locale_to_utf8(str, strlen(str), (unsigned int *) &in, (unsigned int *) &out, NULL); if (utfstr) { /* overwrite old string with new */ @@ -3637,7 +3628,7 @@ gchar *locstr; gint in, out; - locstr = g_locale_from_utf8(str, strlen(str), &in, &out, NULL); + locstr = g_locale_from_utf8(str, strlen(str), (unsigned int *) &in, (unsigned int *) &out, NULL); if (locstr) { strncpy(str, locstr, MAXLINE); } @@ -3664,7 +3655,7 @@ /* should be logical to use g_filename_from_utf8() here, but somehow this works not correctly on my testsystem */ - locstr = g_locale_from_utf8(str, strlen(str), &in, &out, NULL); + locstr = g_locale_from_utf8(str, strlen(str), (unsigned int *) &in, (unsigned int *) &out, NULL); if (locstr) { strncpy(str, locstr, MAXLINE); }