diff --git a/ChangeLog b/ChangeLog index 2be7dff3b4..c7dbbdfdd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-06-03 Tor Lillqvist + + * app/about_dialog.c (about_dialog_load_logo): As we open the ppm + file in binary mode, we shouldn't assume that the header lines + read with fgets end with just a '\n'. + 1999-06-02 Seth Burgess * app/Makefile.am : Added new Files, indicator_area.[ch] diff --git a/app/about_dialog.c b/app/about_dialog.c index 77c25c1991..90a3bfb8e2 100644 --- a/app/about_dialog.c +++ b/app/about_dialog.c @@ -302,7 +302,8 @@ about_dialog_load_logo (GtkWidget *window) return 0; fgets (buf, 1024, fp); - if (strcmp (buf, "P6\n") != 0) + + if (strncmp (buf, "P6", 2) != 0) { fclose (fp); return 0; @@ -313,7 +314,7 @@ about_dialog_load_logo (GtkWidget *window) sscanf (buf, "%d %d", &logo_width, &logo_height); fgets (buf, 1024, fp); - if (strcmp (buf, "255\n") != 0) + if (strncmp (buf, "255", 3) != 0) { fclose (fp); return 0; diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c index 77c25c1991..90a3bfb8e2 100644 --- a/app/dialogs/about-dialog.c +++ b/app/dialogs/about-dialog.c @@ -302,7 +302,8 @@ about_dialog_load_logo (GtkWidget *window) return 0; fgets (buf, 1024, fp); - if (strcmp (buf, "P6\n") != 0) + + if (strncmp (buf, "P6", 2) != 0) { fclose (fp); return 0; @@ -313,7 +314,7 @@ about_dialog_load_logo (GtkWidget *window) sscanf (buf, "%d %d", &logo_width, &logo_height); fgets (buf, 1024, fp); - if (strcmp (buf, "255\n") != 0) + if (strncmp (buf, "255", 3) != 0) { fclose (fp); return 0; diff --git a/app/gui/about-dialog.c b/app/gui/about-dialog.c index 77c25c1991..90a3bfb8e2 100644 --- a/app/gui/about-dialog.c +++ b/app/gui/about-dialog.c @@ -302,7 +302,8 @@ about_dialog_load_logo (GtkWidget *window) return 0; fgets (buf, 1024, fp); - if (strcmp (buf, "P6\n") != 0) + + if (strncmp (buf, "P6", 2) != 0) { fclose (fp); return 0; @@ -313,7 +314,7 @@ about_dialog_load_logo (GtkWidget *window) sscanf (buf, "%d %d", &logo_width, &logo_height); fgets (buf, 1024, fp); - if (strcmp (buf, "255\n") != 0) + if (strncmp (buf, "255", 3) != 0) { fclose (fp); return 0;