diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-12-18 20:15:50 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-12-18 20:15:50 +0000 |
| commit | b75b2ae8bbeada1a364332596a759f4d0410a852 (patch) | |
| tree | 22738b6fd641b63432b211ca5f04d1cbb20ef20b /gtk/dialogs/gtk_options.c | |
| parent | 46eaa6a0586dfafb4d0802c1583c86a6d155eaa3 (diff) | |
| download | netsurf-b75b2ae8bbeada1a364332596a759f4d0410a852.tar.gz netsurf-b75b2ae8bbeada1a364332596a759f4d0410a852.tar.bz2 | |
Merge r9731:HEAD from branches/MarkieB/gtkmain to trunk.
svn path=/trunk/netsurf/; revision=9737
Diffstat (limited to 'gtk/dialogs/gtk_options.c')
| -rw-r--r-- | gtk/dialogs/gtk_options.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gtk/dialogs/gtk_options.c b/gtk/dialogs/gtk_options.c index 00f73e97e..14467aa1b 100644 --- a/gtk/dialogs/gtk_options.c +++ b/gtk/dialogs/gtk_options.c @@ -476,6 +476,7 @@ static void nsgtk_options_theme_combo(void) { gtk_combo_box_append_text(GTK_COMBO_BOX(combotheme), buf); } + fclose(fp); gtk_combo_box_set_active(GTK_COMBO_BOX(combotheme), option_current_theme); gtk_box_pack_start(box, combotheme, FALSE, TRUE, 0); @@ -855,14 +856,17 @@ BUTTON_CLICKED(buttonaddtheme) "gtkThemeFolderInstructions"), 0); gtk_widget_destroy(GTK_WIDGET(fc)); - free(filename); - free(themesfolder); + if (filename != NULL) + free(filename); + if (themesfolder != NULL) + free(themesfolder); return FALSE; } else { directory++; } } else { - free(filename); + if (filename != NULL) + free(filename); filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(fc)); if (strcmp(filename, themesfolder) == 0) { @@ -877,7 +881,8 @@ BUTTON_CLICKED(buttonaddtheme) } gtk_widget_destroy(GTK_WIDGET(fc)); nsgtk_theme_add(directory); - free(filename); + if (filename != NULL) + free(filename); } END_HANDLER |