diff options
| -rw-r--r-- | ChangeLog-20000414 | 5 | ||||
| -rw-r--r-- | configure.in | 30 | ||||
| -rw-r--r-- | src/nautilus-applicable-views.c | 5 | ||||
| -rw-r--r-- | src/ntl-uri-map.c | 5 |
4 files changed, 30 insertions, 15 deletions
diff --git a/ChangeLog-20000414 b/ChangeLog-20000414 index b204312c0..63d49f80e 100644 --- a/ChangeLog-20000414 +++ b/ChangeLog-20000414 @@ -1,3 +1,8 @@ +1999-12-15 Elliot Lee <sopwith@redhat.com> + + * configure.in: Add --enable-more-warnings and --enable-fatal-warnings switches. + * src/ntl-uri-map.c: Add comment about functionality-in-waiting. + 1999-12-15 Darin Adler <darin@eazel.com> * libnautilus/gtkscrollframe.c (gtk_scroll_frame_size_allocate): diff --git a/configure.in b/configure.in index ed5c8f8c7..2d879f0eb 100644 --- a/configure.in +++ b/configure.in @@ -43,19 +43,23 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST dnl Some additional warning options. -CFLAGS="$CFLAGS \ --W \ --Wcast-align \ --Wchar-subscripts \ --Werror \ --Wmissing-declarations \ --Wmissing-prototypes \ --Wnested-externs \ --Wpointer-arith \ --Wno-sign-compare \ --Wsign-promo \ --trigraphs \ -" +AC_ARG_ENABLE(more-warnings, [--enable-more-warnings Maximum compiler warnings], + enable_compile_warnings="$enableval", enable_compile_warnings=yes) +AC_ARG_ENABLE(fatal-warnings, [--enable-fatal-warnings Make warnings fatal], + enable_fatal_warnings="$enableval", enable_fatal_warnings=yes) + +# Arg is enabled +if test "$GCC" = "yes" && test "$enable_compile_warnings" != "no"; then + CFLAGS="$CFLAGS \ + -W -Wcast-align -Wchar-subscripts \ + -Wmissing-declarations -Wmissing-prototypes \ + -Wnested-externs -Wpointer-arith \ + -Wno-sign-compare -Wsign-promo -Wshadow \ + -Wpadded -Wundef" +fi +if test "$GCC" = "yes" && test "$enable_fatal_warnings" != "no"; then + CFLAGS="$CFLAGS -Werror" +fi AC_OUTPUT([ Makefile diff --git a/src/nautilus-applicable-views.c b/src/nautilus-applicable-views.c index 02ae0b9a6..feca59ff6 100644 --- a/src/nautilus-applicable-views.c +++ b/src/nautilus-applicable-views.c @@ -34,7 +34,7 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo, Nautilus_NavigationInfo *old_navinfo, NautilusView *requesting_view) { - const gchar *meta_keys[] = {"icon-filename", NULL}; + const char *meta_keys[] = {"icon-filename", NULL}; memset(navinfo, 0, sizeof(*navinfo)); navinfo->navinfo.requested_uri = nri->requested_uri; @@ -79,6 +79,9 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo, g_message("Content type of %s is %s", navinfo->navinfo.requested_uri, navinfo->navinfo.content_type); + + /* This is just a hardcoded hack until OAF works with Bonobo. + In the future we will use OAF queries to determine this information. */ if(!strcmp(navinfo->navinfo.content_type, "text/html")) { navinfo->content_iid = "embeddable:explorer-html-component"; diff --git a/src/ntl-uri-map.c b/src/ntl-uri-map.c index 02ae0b9a6..feca59ff6 100644 --- a/src/ntl-uri-map.c +++ b/src/ntl-uri-map.c @@ -34,7 +34,7 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo, Nautilus_NavigationInfo *old_navinfo, NautilusView *requesting_view) { - const gchar *meta_keys[] = {"icon-filename", NULL}; + const char *meta_keys[] = {"icon-filename", NULL}; memset(navinfo, 0, sizeof(*navinfo)); navinfo->navinfo.requested_uri = nri->requested_uri; @@ -79,6 +79,9 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo, g_message("Content type of %s is %s", navinfo->navinfo.requested_uri, navinfo->navinfo.content_type); + + /* This is just a hardcoded hack until OAF works with Bonobo. + In the future we will use OAF queries to determine this information. */ if(!strcmp(navinfo->navinfo.content_type, "text/html")) { navinfo->content_iid = "embeddable:explorer-html-component"; |