# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1198323361 0
# Node ID 64aeaed21477f1d51fd48b616935c4abd0ed94b1
# Parent  3ef7dae7c8045e142eba0c19500134c0a2a1e5d9# Parent  6492a6ca4b0314221f26da47adb2e4a7437a382c
merge of '3a8b6b71a880d8b8152d3ad4c4ade2d3df3b0f5c'
     and 'c06b8cca480ac664ddec99c4a2ab51b00f30240e'

diff -r 6492a6ca4b03 -r 64aeaed21477 libpurple/version.c
--- a/libpurple/version.c	Fri Dec 21 21:03:35 2007 +0000
+++ b/libpurple/version.c	Sat Dec 22 11:36:01 2007 +0000
@@ -42,21 +42,3 @@
 		return "libpurple version too old (micro mismatch)";
 	return NULL;
 }
-
-guint
-purple_version_get_major()
-{
-	return purple_major_version;
-}
-
-guint
-purple_version_get_minor()
-{
-	return purple_minor_version;
-}
-
-guint
-purple_version_get_micro()
-{
-	return purple_micro_version;
-}
diff -r 6492a6ca4b03 -r 64aeaed21477 libpurple/version.h.in
--- a/libpurple/version.h.in	Fri Dec 21 21:03:35 2007 +0000
+++ b/libpurple/version.h.in	Sat Dec 22 11:36:01 2007 +0000
@@ -49,33 +49,6 @@
  */
 const char *purple_version_check(guint required_major, guint required_minor, guint required_micro);
 
-/**
- * Returns the major version of the running libpurple.  Contrast with
- * #PURPLE_MAJOR_VERSION, which expands at compile time to the major version of
- * libpurple being compiled against.
- *
- * @since 2.4.0
- */
-guint purple_version_get_major(void);
-
-/**
- * Returns the minor version of the running libpurple.  Contrast with
- * #PURPLE_MINOR_VERSION, which expands at compile time to the minor version of
- * libpurple being compiled against.
- *
- * @since 2.4.0
- */
-guint purple_version_get_minor(void);
-/**
- *
- * Returns the micro version of the running libpurple.  Contrast with
- * #PURPLE_MICRO_VERSION, which expands at compile time to the micro version of
- * libpurple being compiled against.
- *
- * @since 2.4.0
- */
-guint purple_version_get_micro(void);
-
 #ifdef __cplusplus
 }
 #endif