changeset 21916:bff738a70098

merge of '512fef4a6375dc53f2f672f545da13d2d4505990' and '5805ba59e2ff05c66fa7992ec9eae705d94adb7f'

--- a/libpurple/version.c	Fri Dec 21 19:31:16 2007 +0000
+++ b/libpurple/version.c	Fri Dec 21 19:33:15 2007 +0000
@@ -42,3 +42,21 @@
 		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;
+}

--- a/libpurple/version.h.in	Fri Dec 21 19:31:16 2007 +0000
+++ b/libpurple/version.h.in	Fri Dec 21 19:33:15 2007 +0000
@@ -49,6 +49,33 @@
  */
 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