From 526fc5eb584f1437c2a81719460b96a9bb463cfa Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 25 Feb 2004 11:13:00 +0000 Subject: Check for NULL before converting filename to UTF-8. 2004-02-25 Christian Persch * src/window-commands.c: (open_response_cb): Check for NULL before converting filename to UTF-8. --- ChangeLog | 6 ++++++ src/window-commands.c | 23 +++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09899a626..d5c464a6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-02-25 Christian Persch + + * src/window-commands.c: (open_response_cb): + + Check for NULL before converting filename to UTF-8. + 2004-02-25 Marco Pesenti Gritti * embed/ephy-embed-persist.c: (ephy_embed_persist_set_max_size), diff --git a/src/window-commands.c b/src/window-commands.c index 5a39dee4e..f1efa3c2d 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -362,23 +362,26 @@ window_cmd_file_bookmark_page (GtkAction *action, } static void -open_response_cb (GtkDialog *dialog, gint response, EphyWindow *window) +open_response_cb (GtkDialog *dialog, int response, EphyWindow *window) { if (response == EPHY_RESPONSE_OPEN) { char *uri, *converted; uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); - converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL); - - if (converted != NULL) + if (uri != NULL) { - ephy_window_load_url(window, converted); - } - - g_free (converted); - g_free (uri); - } + converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL); + + if (converted != NULL) + { + ephy_window_load_url (window, converted); + } + + g_free (converted); + g_free (uri); + } + } gtk_widget_destroy (GTK_WIDGET (dialog)); } -- cgit v1.2.3