Commit 14704c09 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Fix warning due to NULL default string.

2004-10-28  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/nautilus-global-preferences.c:
	* src/nautilus-window-manage-views.c:
	Fix warning due to NULL default string.
parent c1103d9f
2004-10-28 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-global-preferences.c:
* src/nautilus-window-manage-views.c:
Fix warning due to NULL default string.
2004-10-26 Alexander Larsson <alexl@redhat.com> 2004-10-26 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-global-preferences.[ch]: * libnautilus-private/nautilus-global-preferences.[ch]:
......
...@@ -409,7 +409,7 @@ static const PreferenceDefault preference_defaults[] = { ...@@ -409,7 +409,7 @@ static const PreferenceDefault preference_defaults[] = {
}, },
{ NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY, { NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY,
PREFERENCE_STRING, PREFERENCE_STRING,
NULL ""
}, },
{ NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES, { NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
PREFERENCE_BOOLEAN, PREFERENCE_BOOLEAN,
......
...@@ -1267,7 +1267,8 @@ load_directory_metadata_callback (NautilusFile *file, ...@@ -1267,7 +1267,8 @@ load_directory_metadata_callback (NautilusFile *file,
if (NAUTILUS_IS_NAVIGATION_WINDOW (window)) { if (NAUTILUS_IS_NAVIGATION_WINDOW (window)) {
geometry_string = eel_preferences_get geometry_string = eel_preferences_get
(NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY); (NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY);
if (geometry_string != NULL) { if (geometry_string != NULL &&
geometry_string[0] != 0) {
/* Ignore saved window position if a window with the same /* Ignore saved window position if a window with the same
* location is already showing. That way the two windows * location is already showing. That way the two windows
* wont appear at the exact same location on the screen. * wont appear at the exact same location on the screen.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment