# HG changeset patch # User Eric Warmenhoven # Date 960386664 0 # Node ID 29f95b2b3e38bbd2cb278f865a9df37dc845d76c # Parent d64101dc5c7e5bbc1d231d6945822e2a19a90442 [gaim-migrate @ 358] GNOME already defines these committer: Tailor Script diff -r d64101dc5c7e -r 29f95b2b3e38 src/gaim.h --- a/src/gaim.h Wed Jun 07 13:30:04 2000 +0000 +++ b/src/gaim.h Wed Jun 07 14:04:24 2000 +0000 @@ -73,6 +73,7 @@ #define REG_SRVR "blueridge.net" #define REG_PORT 25 +#ifndef USE_APPLET #ifdef ENABLE_NLS # include # define _(x) gettext(x) @@ -85,6 +86,7 @@ # define N_(String) (String) # define _(x) (x) #endif +#endif extern struct prefs_data *pd; extern struct debug_window *dw; @@ -370,7 +372,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 355 $" +#define REVISION "gaim:$Revision: 358 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc"