[gnome-packagekit] Provide some #ifdef compatibility so that git master GPK can build with >= 0.4.4 PK
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-packagekit] Provide some #ifdef compatibility so that git master GPK can build with >= 0.4.4 PK
- Date: Thu, 14 May 2009 10:24:28 -0400 (EDT)
commit 4b3916ff2fce06cd66ca38a5cf33c2ce53fb062f
Author: Richard Hughes <richard hughsie com>
Date: Thu May 14 15:22:12 2009 +0100
Provide some #ifdef compatibility so that git master GPK can build with >= 0.4.4 PK
---
configure.ac | 2 +-
src/gpk-enum.h | 26 ++++++++++++++++++++++++++
src/gpk-helper-media-change.h | 2 ++
3 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index b120124..a5f84f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ AM_GLIB_GNU_GETTEXT
dnl ---------------------------------------------------------------------------
dnl - Library dependencies
dnl ---------------------------------------------------------------------------
-PACKAGEKIT_REQUIRED=0.4.4
+PACKAGEKIT_REQUIRED=0.4.4 # when changing, nuke some compatability entries in gpk-enum.h
GLIB_REQUIRED=2.14.0
GTK_REQUIRED=2.15.0
DBUS_REQUIRED=1.1.2
diff --git a/src/gpk-enum.h b/src/gpk-enum.h
index 2e7de7d..d38f929 100644
--- a/src/gpk-enum.h
+++ b/src/gpk-enum.h
@@ -68,6 +68,32 @@ typedef enum {
GPK_INFO_ENUM_UNKNOWN
} GpkInfoStatusEnum;
+/* for very old versions of PackageKit */
+#ifndef PK_CHECK_VERSION
+#define PK_CHECK_VERSION(major, minor, micro) 0
+#endif
+
+/* constants defined in 0.4.5 */
+#if (!PK_CHECK_VERSION(0,4,5))
+#define PK_INFO_ENUM_FINISHED (PK_INFO_ENUM_COLLECTION_AVAILABLE + 1)
+#endif
+
+/* constants defined in 0.4.7 */
+#if (!PK_CHECK_VERSION(0,4,7))
+typedef guint PkMediaTypeEnum;
+#define PK_MEDIA_TYPE_ENUM_CD (0)
+#define PK_MEDIA_TYPE_ENUM_DVD (1)
+#define PK_MEDIA_TYPE_ENUM_DISC (2)
+#define PK_MEDIA_TYPE_ENUM_UNKNOWN (3)
+#define PK_EXIT_ENUM_MEDIA_CHANGE_REQUIRED (PK_EXIT_ENUM_KILLED + 1)
+#define PK_ERROR_ENUM_MEDIA_CHANGE_REQUIRED (PK_ERROR_ENUM_NO_SPACE_ON_DEVICE + 1)
+#endif
+
+/* constants defined in 0.4.8 */
+#if (!PK_CHECK_VERSION(0,4,8))
+#define PK_ERROR_ENUM_NOT_AUTHORIZED (PK_ERROR_ENUM_MEDIA_CHANGE_REQUIRED + 1)
+#endif
+
void gpk_enum_test (gpointer data);
const gchar *gpk_role_enum_to_localised_past (PkRoleEnum role)
G_GNUC_CONST;
diff --git a/src/gpk-helper-media-change.h b/src/gpk-helper-media-change.h
index 75b0388..c5fd40f 100644
--- a/src/gpk-helper-media-change.h
+++ b/src/gpk-helper-media-change.h
@@ -26,6 +26,8 @@
#include <gtk/gtk.h>
#include <packagekit-glib/packagekit.h>
+#include "gpk-enum.h"
+
G_BEGIN_DECLS
#define GPK_TYPE_HELPER_MEDIA_CHANGE (gpk_helper_media_change_get_type ())
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]