* configure.ac: removed -Winline which in fact was the culprit for the verbosity...

* modules/gui/skins/src/skin_main.cpp: fixed icon loading.

diff --git a/configure.ac b/configure.ac
index b79e1672ee77224d9325fcfe809b4436bb12064e..6b38a015c1d2957b81885033144f2510f5d87cb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -589,46 +589,18 @@ AC_CACHE_CHECK([if \$CC accepts -Wsign-compare],
     [CFLAGS="-Wsign-compare ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wsign_compare=yes, ac_cv_c_Wsign_compare=no)])
 
-AC_CACHE_CHECK([if \$CC accepts -Winline],
-    [ac_cv_c_Winline],
-    [CFLAGS="-Winline ${CFLAGS_save}"
-     AC_TRY_COMPILE([],,ac_cv_c_Winline=yes, ac_cv_c_Winline=no)])
-
 if test "${ac_cv_c_Wall}" != "no"; then
     CFLAGS_save="-Wall ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
     CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
     OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
 fi
 
-if test "${ac_cv_c_Wunreachable_code}" != "no"; then
-#    CFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
-#    CXXFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
-#    OBJCFLAGS_save="-Wunreachable-code ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
-
-    dnl -Wunreachable-code means gcc-3.x, we can use -Wconversion and we can
-    dnl activate -Winline for C++, it won't choke on system headers.
-#    if test "${ac_cv_c_Wconversion}" != "no"; then
-#        CFLAGS_save="-Wconversion ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
-#        CXXFLAGS_save="-Wconversion ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
-#        OBJCFLAGS_save="-Wconversion ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
-#    fi
-    if test "${ac_cv_c_Winline}" != "no"; then
-        CXXFLAGS_save="-Winline ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
-    fi
-
-fi
-
 if test "${ac_cv_c_Wsign_compare}" != "no"; then
     CFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
     CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
     OBJCFLAGS_save="-Wsign-compare ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
 fi
 
-if test "${ac_cv_c_Winline}" != "no"; then
-    CFLAGS_save="-Winline ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
-    OBJCFLAGS_save="-Winline ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
-fi
-
 dnl Check for -pipe
 AC_CACHE_CHECK([if \$CC accepts -pipe],
     [ac_cv_c_pipe],

diff --git a/modules/gui/skins/src/skin_main.cpp b/modules/gui/skins/src/skin_main.cpp
index 754c4d66f2898a452ee0689da182a21168ef2c13..c18235c8f6d6660a6a958418109e35fa3f69d01a 100644 (file)
--- a/modules/gui/skins/src/skin_main.cpp
+++ b/modules/gui/skins/src/skin_main.cpp
@@ -2,7 +2,7 @@
  * skin-main.cpp: skins plugin for VLC
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.40 2003/06/14 18:49:02 gbazin Exp $
+ * $Id: skin_main.cpp,v 1.41 2003/06/22 17:52:12 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -149,7 +149,7 @@ static int Open ( vlc_object_t *p_this )
     imlib_context_set_colormap( DefaultColormap( display, screen ) );
     imlib_context_set_dither( 1 );
     imlib_context_set_blend( 1 );
-    Imlib_Image img = imlib_load_image_immediately( DATA_PATH "vlc32x32.png" );
+    Imlib_Image img = imlib_load_image_immediately( DATA_PATH"/vlc32x32.png" );
     if( img == NULL )
     {
         // for developers ;)