* ./include/vlc_common.h: we don't set _() and N_() in Gnome-enabled modules

    because <gnome.h> already does it for us.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 1be334513cc2895b4a458ade85985550c5a1d7a7..f0b907364eba4290d439ceb21fbc129dae0a97f2 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.20 2002/08/14 17:06:53 sam Exp $
+ * $Id: vlc_common.h,v 1.21 2002/08/21 15:53:06 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -467,7 +467,7 @@ typedef __int64 off_t;
 #endif
 #define VERSION VLC_VERSION
 
-#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ ) && !defined( MODULE_NAME_IS_gnome )
+#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ ) && !defined( NEED_GNOMESUPPORT_H )
 #   include <libintl.h>
 #   undef _
 #   define _(String) dgettext (PACKAGE, String)
@@ -476,7 +476,7 @@ typedef __int64 off_t;
 #   else
 #       define N_(String) (String)
 #   endif
-#elif !defined( MODULE_NAME_IS_gnome )
+#elif !defined( NEED_GNOMESUPPORT_H )
 #   define _(String) (String)
 #   define N_(String) (String)
 #endif

diff --git a/modules/misc/gtk_main.c b/modules/misc/gtk_main.c
index cb3fc7cfb0028492527ef8c7a7af94eb4ec469f5..78a30c5e042fa30e3344c83c165885801215235b 100644 (file)
--- a/modules/misc/gtk_main.c
+++ b/modules/misc/gtk_main.c
@@ -2,7 +2,7 @@
  * gtk_main.c : Gtk+ wrapper for gtk_main
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: gtk_main.c,v 1.1 2002/08/20 18:08:51 sam Exp $
+ * $Id: gtk_main.c,v 1.2 2002/08/21 15:53:06 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -213,7 +213,9 @@ static void GtkMain( vlc_object_t *p_this )
     /* gtk_init needs to know the command line. We don't care, so we
      * give it an empty one */
     static char  *p_args[] = { "" };
+#ifdef HAVE_GNOME_H
     static char **pp_args  = p_args;
+#endif
     static int    i_args   = 1;
 
     /* gtk_init will register stuff with g_atexit, so we need to have