diff options
| author | Alexander Larsson <alexl@redhat.com> | 2004-10-28 07:30:07 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2004-10-28 07:30:07 +0000 |
| commit | 14704c0966ac5c6d8ae65b0b62cd95d6fca8aa92 (patch) | |
| tree | eafe2aa2257ad3b168701dbdb61c0616292e7bd4 | |
| parent | c1103d9f354dfc9479a6d9c4f8b75f09af6d5b30 (diff) | |
| download | nautilus-14704c0966ac5c6d8ae65b0b62cd95d6fca8aa92.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-global-preferences.c | 2 | ||||
| -rw-r--r-- | src/nautilus-window-manage-views.c | 3 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +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> * libnautilus-private/nautilus-global-preferences.[ch]: diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c index c7ee693df..5a12b561e 100644 --- a/libnautilus-private/nautilus-global-preferences.c +++ b/libnautilus-private/nautilus-global-preferences.c @@ -409,7 +409,7 @@ static const PreferenceDefault preference_defaults[] = { }, { NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY, PREFERENCE_STRING, - NULL + "" }, { NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES, PREFERENCE_BOOLEAN, diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 979c15c0e..c2257f4f6 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -1267,7 +1267,8 @@ load_directory_metadata_callback (NautilusFile *file, if (NAUTILUS_IS_NAVIGATION_WINDOW (window)) { geometry_string = eel_preferences_get (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 * location is already showing. That way the two windows * wont appear at the exact same location on the screen. |