dasher r3470 - in trunk: . Src/Common Src/DasherCore Src/Gtk2

[alarson svn gnome org]

Author: alarson
Date: Sat Mar 22 13:35:10 2008
New Revision: 3470
URL: http://svn.gnome.org/viewvc/dasher?rev=3470&view=rev

Log:
Eliminate most compiler redifintion warnings for "_" (#519254).


Modified:
   trunk/ChangeLog
   trunk/Src/Common/I18n.h
   trunk/Src/DasherCore/SocketInput.cpp
   trunk/Src/Gtk2/module_settings_window.cpp

Modified: trunk/Src/Common/I18n.h
==============================================================================
--- trunk/Src/Common/I18n.h	(original)
+++ trunk/Src/Common/I18n.h	Sat Mar 22 13:35:10 2008
@@ -1,6 +1,6 @@
 // I18n.h
 //
-// Copyright (c) 2007 The Dasher Team
+// Copyright (c) 2008 The Dasher Team
 //
 // This file is part of Dasher.
 //
@@ -28,8 +28,12 @@
 #else
 
 #include <libintl.h>
+// Attempt to get rid of '"_" rededined' compiler warnings.  I'm not sure the
+// proper way to verify that gnome i18n support is present, so if you have a
+// better idea...
+#ifndef _
 #define _(szText) gettext(szText)
-
+#endif
 #endif
 
 #endif

Modified: trunk/Src/DasherCore/SocketInput.cpp
==============================================================================
--- trunk/Src/DasherCore/SocketInput.cpp	(original)
+++ trunk/Src/DasherCore/SocketInput.cpp	Sat Mar 22 13:35:10 2008
@@ -12,7 +12,7 @@
 #include <pthread.h>
 #include <libintl.h>
 
-#define _(_x) gettext(_x)
+#include "../Common/I18n.h"
 
 using namespace Dasher;
 

Modified: trunk/Src/Gtk2/module_settings_window.cpp
==============================================================================
--- trunk/Src/Gtk2/module_settings_window.cpp	(original)
+++ trunk/Src/Gtk2/module_settings_window.cpp	Sat Mar 22 13:35:10 2008
@@ -1,6 +1,6 @@
 // module_settings_window.cpp
 //
-// Copyright (c) 2007 The Dasher Team
+// Copyright (c) 2008 The Dasher Team
 //
 // This file is part of Dasher.
 //
@@ -18,10 +18,11 @@
 // along with Dasher; if not, write to the Free Software 
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#include "module_settings_window.h"
-
+#include "config.h"
 #include <glib/gi18n.h>
 
+#include "module_settings_window.h"
+
 typedef struct _ModuleSettingsData ModuleSettingsData;
 
 struct _ModuleSettingsData {