From df5ea9932f08abc6788be49e654d74056fa3407b Mon Sep 17 00:00:00 2001 From: Onkar Shinde Date: Tue, 25 May 2010 20:46:27 +0530 Subject: [PATCH] Fix for LP: #579319 --- ChangeLog | 6 ++++++ NEWS | 2 ++ src/support.c | 7 ++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40b3734..ae506ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-05-25 Onkar Shinde + + * src/support.c: Fix stupid mistake - trying to access message from + null error object. Remove the corresponding variable as it is never + initialized. Fixes LP: #579319. + 2010-05-23 Onkar Shinde * po/it.po: Updated Italian translation from launchpad. diff --git a/NEWS b/NEWS index a7ba91e..27331b7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ GNUSim8085 1.3.7 (UNRELEASED) +Fix: LP: #579319 - Help -> about = crash + Translations: New - Brazilian Portuguese (pt_BR), Greek (el). Updated - Gujarati (gu), Kannada (kn), Italian (it), Spanish (es). diff --git a/src/support.c b/src/support.c index 9b7f8ef..d4c2aa3 100644 --- a/src/support.c +++ b/src/support.c @@ -110,7 +110,6 @@ gchar** read_authors (){ gchar *pathname = NULL; gchar **authors; - GError *error = NULL; FILE *fp; GString *gstr; char *ret; @@ -131,7 +130,6 @@ read_authors (){ if (fp == NULL) { GString *str; - error = NULL; pathname = NULL; str = g_string_new(""); g_string_append(str, "AUTHORS"); @@ -142,9 +140,8 @@ read_authors (){ if (fp == NULL) { - fprintf (stderr, "Failed to load authors file: %s: %s\n", - pathname, error->message); - g_error_free (error); + fprintf (stderr, "Failed to load authors file: %s\n", + pathname); return NULL; }