changeset 4246:2a2d6d21f1d7

[gaim-migrate @ 4496] Remove the builddate and buildtime thingies. If anyone actually uses this, like fire or something, and you really need it, let me know and I guess I could put it back in. I also moved the 1 remaining function from meta.c to util.c, because I'm weird like that. committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/Makefile.am	Wed Jan 08 05:52:17 2003 +0000
+++ b/src/protocols/oscar/Makefile.am	Wed Jan 08 06:56:31 2003 +0000
@@ -23,7 +23,6 @@
 	info.c         \
 	invite.c       \
 	md5.h          \
-	meta.c         \
 	misc.c         \
 	msgcookie.c    \
 	newsearch.c    \
@@ -41,9 +40,6 @@
 	util.c         \
 	oscar.c
 
-CURRENT_DATE := $(shell date +%Y%m%d)
-CURRENT_TIME := $(shell date +%H%M%S)
-
 AM_CFLAGS = $(st)
 
 liboscar_la_LDFLAGS = -module -avoid-version
@@ -65,6 +61,4 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
-	$(DEBUG_CFLAGS) \
-	-DAIM_BUILDDATE=\"$(CURRENT_DATE)\" \
-	-DAIM_BUILDTIME=\"$(CURRENT_TIME)\"
+	$(DEBUG_CFLAGS)

--- a/src/protocols/oscar/Makefile.mingw	Wed Jan 08 05:52:17 2003 +0000
+++ b/src/protocols/oscar/Makefile.mingw	Wed Jan 08 06:56:31 2003 +0000
@@ -82,7 +82,6 @@
 			im.c		\
 			info.c		\
 			invite.c	\
-			meta.c		\
 			misc.c		\
 			msgcookie.c	\
 			newsearch.c	\

--- a/src/protocols/oscar/aim.h	Wed Jan 08 05:52:17 2003 +0000
+++ b/src/protocols/oscar/aim.h	Wed Jan 08 06:56:31 2003 +0000
@@ -1315,11 +1315,6 @@
 /* for libc's that dont have it */
 faim_export char *aim_strsep(char **pp, const char *delim);
 
-/* meta.c */
-faim_export char *aim_getbuilddate(void);
-faim_export char *aim_getbuildtime(void);
-faim_export int aim_getbuildstring(char *buf, int buflen);
-
 #include <aim_internal.h>
 
 #endif /* __AIM_H__ */

--- a/src/protocols/oscar/meta.c	Wed Jan 08 05:52:17 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Administrative things for libfaim.
- *
- *  
- */
-
-#define FAIM_INTERNAL
-#include <aim.h>
-
-#ifdef _WIN32
-#include "win32dep.h"
-#endif
-
-faim_export char *aim_getbuilddate(void)
-{
-	return AIM_BUILDDATE;
-}
-
-faim_export char *aim_getbuildtime(void)
-{
-	return AIM_BUILDTIME;
-}
-
-faim_export int aim_getbuildstring(char *buf, int buflen)
-{
-
-	snprintf(buf, buflen, "%d.%d.%d-%s%s", 
-			FAIM_VERSION_MAJOR,
-			FAIM_VERSION_MINOR,
-			FAIM_VERSION_MINORMINOR,
-			aim_getbuilddate(),
-			aim_getbuildtime());
-
-	return 0;
-}
-
-faim_internal void faimdprintf(aim_session_t *sess, int dlevel, const char *format, ...)
-{
-	if (!sess) {
-		fprintf(stderr, "faimdprintf: no session! boo! (%d, %s)\n", dlevel, format);
-		return;
-	}
-
-	if ((dlevel <= sess->debug) && sess->debugcb) {
-		va_list ap;
-
-		va_start(ap, format);
-		sess->debugcb(sess, dlevel, format, ap);
-		va_end(ap);
-	}
-
-	return;
-}
-

--- a/src/protocols/oscar/oscar.c	Wed Jan 08 05:52:17 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Jan 08 06:56:31 2003 +0000
@@ -2815,15 +2815,12 @@
 	char *msg;
 	fu16_t id;
 	va_list ap;
-	char buildbuf[150];
 
 	va_start(ap, fr);
 	id  = (fu16_t) va_arg(ap, unsigned int);
 	msg = va_arg(ap, char *);
 	va_end(ap);
 
-	aim_getbuildstring(buildbuf, sizeof(buildbuf));
-
 	debug_printf("MOTD: %s (%hu)\n", msg ? msg : "Unknown", id);
 	if (id < 4)
 		do_error_dialog(_("Your AIM connection may be lost."), NULL, GAIM_WARNING);

--- a/src/protocols/oscar/util.c	Wed Jan 08 05:52:17 2003 +0000
+++ b/src/protocols/oscar/util.c	Wed Jan 08 06:56:31 2003 +0000
@@ -1,13 +1,34 @@
 /*
- *
- *
- *
+ * A little bit of this
+ * A little bit of that
+ * It started with a kiss
+ * Now we're up to bat
  */
 
 #define FAIM_INTERNAL
 #include <aim.h>
 #include <ctype.h>
 
+#ifdef _WIN32
+#include "win32dep.h"
+#endif
+
+faim_internal void faimdprintf(aim_session_t *sess, int dlevel, const char *format, ...)
+{
+	if (!sess) {
+		fprintf(stderr, "faimdprintf: no session! boo! (%d, %s)\n", dlevel, format);
+		return;
+	}
+	if ((dlevel <= sess->debug) && sess->debugcb) {
+		va_list ap;
+		va_start(ap, format);
+		sess->debugcb(sess, dlevel, format, ap);
+		va_end(ap);
+	}
+
+	return;
+}
+
 faim_export faim_shortfunc int aimutil_putstr(u_char *dest, const char *src, int len)
 {
 	memcpy(dest, src, len);

--- a/src/win32/global.mak	Wed Jan 08 05:52:17 2003 +0000
+++ b/src/win32/global.mak	Wed Jan 08 06:56:31 2003 +0000
@@ -12,9 +12,7 @@
 
 VERSION := $(shell cat $(GAIM_TOP)/VERSION)
 
-DEFINES += 	-DAIM_BUILDDATE=\"`date +%Y%m%d`\" \
-		-DAIM_BUILDTIME=\"`date +%H%M%S`\" \
-		-DVERSION=\"$(VERSION)\" \
+DEFINES += 	-DVERSION=\"$(VERSION)\" \
 		-DHAVE_CONFIG_H \
 		-DGTK_ENABLE_BROKEN