diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-29 13:01:03 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-29 13:01:03 +0000 |
| commit | 43acaf0eaac077f84802f05058b1303088ff0b31 (patch) | |
| tree | af9a0d6df9d30692520a507631c0b9c297f15967 /x11-fm/nautilus2 | |
| parent | Don't try to free() statically allocated array. (diff) | |
Take into account that not only -current, but the -stable as well now has
nl_langinfo() interface. Also remove iconv->giconv hack while I here.
PR: 36064
Submitted by: Joe Marcus Clarke <marcus@marcuscom.com>
Notes
Notes:
svn path=/head/; revision=56868
Diffstat (limited to 'x11-fm/nautilus2')
| -rw-r--r-- | x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-desktop-file-loader.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-desktop-file-loader.c b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-desktop-file-loader.c index 96681a3d1fe9..c47d0202fcd1 100644 --- a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-desktop-file-loader.c +++ b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-desktop-file-loader.c @@ -1,15 +1,13 @@ $FreeBSD$ ---- libnautilus-private/nautilus-desktop-file-loader.c.orig Wed Sep 26 16:37:15 2001 -+++ libnautilus-private/nautilus-desktop-file-loader.c Tue Oct 30 09:33:26 2001 -@@ -38,8 +38,10 @@ - #include <errno.h> +--- libnautilus-private/nautilus-desktop-file-loader.c.orig Wed Sep 26 19:37:15 2001 ++++ libnautilus-private/nautilus-desktop-file-loader.c Fri Mar 29 14:58:54 2002 +@@ -39,7 +39,9 @@ #include <ctype.h> #include <locale.h> --#include <iconv.h> -+#include <giconv.h> -+#if (defined __FreeBSD__) && (__FreeBSD_version > 500000) + #include <iconv.h> ++#if (defined __FreeBSD__) && (__FreeBSD_version > 450001) #include <langinfo.h> +#endif @@ -19,7 +17,7 @@ $FreeBSD$ const char *value); static void addition_free (NautilusDesktopFileAddition *addition); -+#if (defined __FreeBSD__) && (__FreeBSD_version < 500000) ++#if (defined __FreeBSD__) && (__FreeBSD_version < 450001) +/* Quick and dirty implementation of nl_langinfo(CODESET) */ +static char * +nl_langinfo(void) { |