diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2005-06-10 01:52:35 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2005-06-10 01:52:35 +0000 |
| commit | 877a850a75d23424b0af8aeb5bead12f9a5cf54f (patch) | |
| tree | 44bf4ccd354fd15375bb5b6316ea856f034f853d | |
| parent | 32c49fa5451aacc035824c0dc4b38e6ca91bdeb2 (diff) | |
| download | nautilus-877a850a75d23424b0af8aeb5bead12f9a5cf54f.tar.gz | |
Always initialize cut.
2005-06-10 Martin Wehner <martin.wehner@gmail.com>
* src/file-manager/fm-directory-view.c: (convert_lines_to_str_list):
* src/file-manager/fm-tree-view.c: (convert_lines_to_str_list):
Always initialize cut.
* configure.in:
Add --Wno-pointer-sign
Fix gcc4 compilation (#303491/#307038).
Based on patches from James M. Cape <jcape@ignore-your.tv>
and Kjartan Maraas <kmaraas@gnome.org>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-tree-view.c | 6 |
4 files changed, 20 insertions, 7 deletions
@@ -1,3 +1,16 @@ +2005-06-10 Martin Wehner <martin.wehner@gmail.com> + + * src/file-manager/fm-directory-view.c: (convert_lines_to_str_list): + * src/file-manager/fm-tree-view.c: (convert_lines_to_str_list): + Always initialize cut. + + * configure.in: + Add --Wno-pointer-sign + + Fix gcc4 compilation (#303491/#307038). + Based on patches from James M. Cape <jcape@ignore-your.tv> + and Kjartan Maraas <kmaraas@gnome.org> + 2005-05-27 Martin Wehner <martin.wehner@gmail.com> * libnautilus-private/nautilus-thumbnails.c: diff --git a/configure.in b/configure.in index bb1150d51..fcb9d5e77 100644 --- a/configure.in +++ b/configure.in @@ -248,7 +248,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then -Werror \ $CFLAGS" - for option in -Wno-strict-aliasing -Wno-sign-compare; do + for option in -Wno-strict-aliasing -Wno-sign-compare -Wno-pointer-sign; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 3cd3d417b..db2df78f3 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -5321,15 +5321,15 @@ convert_lines_to_str_list (char **lines, gboolean *cut) int i; GList *result; + *cut = FALSE; + if (lines[0] == NULL) { return NULL; } if (strcmp (lines[0], "cut") == 0) { *cut = TRUE; - } else if (strcmp (lines[0], "copy") == 0) { - *cut = FALSE; - } else { + } else if (strcmp (lines[0], "copy") != 0) { return NULL; } diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c index 3856db94c..535ea9853 100644 --- a/src/file-manager/fm-tree-view.c +++ b/src/file-manager/fm-tree-view.c @@ -927,15 +927,15 @@ convert_lines_to_str_list (char **lines, gboolean *cut) int i; GList *result; + *cut = FALSE; + if (lines[0] == NULL) { return NULL; } if (strcmp (lines[0], "cut") == 0) { *cut = TRUE; - } else if (strcmp (lines[0], "copy") == 0) { - *cut = FALSE; - } else { + } else if (strcmp (lines[0], "copy") != 0) { return NULL; } |