r13824 mmu_man - in /trunk/netsurf/gtk: dialogs/options.c gui.c
Author: mmu_man
Date: Sat Apr 7 13:32:11 2012
New Revision: 13824
URL: http://source.netsurf-browser.org?rev=13824&view=rev
Log:
Fix a crash when opening Preferences panel and Choices file doesn't exist:
- add missing strdup(),
- fix free() vs g_free() mixups.
Modified:
trunk/netsurf/gtk/dialogs/options.c
trunk/netsurf/gtk/gui.c
Modified: trunk/netsurf/gtk/dialogs/options.c
URL:
http://source.netsurf-browser.org/trunk/netsurf/gtk/dialogs/options.c?rev...
==============================================================================
--- trunk/netsurf/gtk/dialogs/options.c (original)
+++ trunk/netsurf/gtk/dialogs/options.c Sat Apr 7 13:32:11 2012
@@ -577,7 +577,7 @@
if (lang == NULL)
return FALSE;
- nsoption_set_charp(accept_language, lang);
+ nsoption_set_charp(accept_language, strdup(lang));
g_free(lang);
@@ -863,9 +863,13 @@
END_HANDLER
static gboolean on_fileChooserDownloads_changed(GtkWidget *widget, gpointer data)
-{
- LOG(("Signal emitted on '%s'", "fileChooserDownloads"));
- nsoption_set_charp(downloads_directory,
gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER((widget))));
+{
+ gchar *dir;
+ LOG(("Signal emitted on '%s'", "fileChooserDownloads"));
+
+ dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER((widget)));
+ nsoption_set_charp(downloads_directory, strdup(dir));
+ g_free(dir);
return FALSE;
}
@@ -968,21 +972,21 @@
0);
gtk_widget_destroy(GTK_WIDGET(fc));
if (filename != NULL)
- free(filename);
+ g_free(filename);
return FALSE;
} else {
directory++;
}
} else {
if (filename != NULL)
- free(filename);
+ g_free(filename);
filename = gtk_file_chooser_get_filename(
GTK_FILE_CHOOSER(fc));
if (strcmp(filename, themesfolder) == 0) {
warn_user(messages_get("gtkThemeFolderSub"),
0);
gtk_widget_destroy(GTK_WIDGET(fc));
- free(filename);
+ g_free(filename);
return FALSE;
}
directory = strrchr(filename, '/') + 1;
@@ -990,7 +994,7 @@
gtk_widget_destroy(GTK_WIDGET(fc));
nsgtk_theme_add(directory);
if (filename != NULL)
- free(filename);
+ g_free(filename);
}
}
END_HANDLER
Modified: trunk/netsurf/gtk/gui.c
URL:
http://source.netsurf-browser.org/trunk/netsurf/gtk/gui.c?rev=13824&r...
==============================================================================
--- trunk/netsurf/gtk/gui.c (original)
+++ trunk/netsurf/gtk/gui.c Sat Apr 7 13:32:11 2012
@@ -287,7 +287,7 @@
if (nsoption_charp(downloads_directory) == NULL) {
LOG(("Using '%s' as download directory", hdir));
- nsoption_set_charp(downloads_directory, hdir);
+ nsoption_set_charp(downloads_directory, strdup(hdir));
}
filepath_sfinddef(respath, buf, "icons/", "~/.netsurf/");