diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-01-14 04:54:44 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-01-14 04:54:44 +0800 |
| commit | c0f7f7b356da2665cef68281b711f780ece55e0e (patch) | |
| tree | cfc8cc3bff317f32bb7d1af37b3e91e9ea4416b5 | |
| parent | 0b915d7b876435fdd1292f1d8c0f35628c8e859d (diff) | |
| download | gsoc2013-epiphany-c0f7f7b356da2665cef68281b711f780ece55e0e.tar gsoc2013-epiphany-c0f7f7b356da2665cef68281b711f780ece55e0e.tar.gz gsoc2013-epiphany-c0f7f7b356da2665cef68281b711f780ece55e0e.tar.bz2 gsoc2013-epiphany-c0f7f7b356da2665cef68281b711f780ece55e0e.tar.lz gsoc2013-epiphany-c0f7f7b356da2665cef68281b711f780ece55e0e.tar.xz gsoc2013-epiphany-c0f7f7b356da2665cef68281b711f780ece55e0e.tar.zst gsoc2013-epiphany-c0f7f7b356da2665cef68281b711f780ece55e0e.zip | |
Dont crash when schemas installed incorrectly
2003-01-13 Marco Pesenti Gritti <marco@it.gnome.org>
* embed/mozilla/FilePicker.cpp:
* src/general-prefs.c: (create_default_charset_menu):
Dont crash when schemas installed incorrectly
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/mozilla/FilePicker.cpp | 1 | ||||
| -rwxr-xr-x | src/general-prefs.c | 1 |
3 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2003-01-13 Marco Pesenti Gritti <marco@it.gnome.org> + + * embed/mozilla/FilePicker.cpp: + * src/general-prefs.c: (create_default_charset_menu): + + Dont crash when schemas installed incorrectly + 2003-01-13 Alex Duggan <aldug@gnome.org> * configure.in: diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index 3a51fc12b..424bc8910 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -406,6 +406,7 @@ NS_METHOD GFilePicker::SanityCheck (PRBool *retIsSane) gtk_window_set_modal (GTK_WINDOW(errorDialog), TRUE); gtk_dialog_run (GTK_DIALOG(errorDialog)); + gtk_widget_destroy (errorDialog); *retIsSane = PR_FALSE; } g_free (errorText); diff --git a/src/general-prefs.c b/src/general-prefs.c index d3d322054..114fde7ac 100755 --- a/src/general-prefs.c +++ b/src/general-prefs.c @@ -242,6 +242,7 @@ create_default_charset_menu (GeneralPrefs *dialog) /* init value */ charsets = l; value = eel_gconf_get_string (CONF_LANGUAGE_DEFAULT_CHARSET); + g_return_if_fail (value != NULL); charsets = g_list_find_custom (charsets, (gconstpointer)value, (GCompareFunc)find_charset_in_list_cmp); gtk_option_menu_set_history (GTK_OPTION_MENU(optionmenu), |