GNOME.org
 

[gnome-packagekit/glib2-merge-candidate: 4/11] Remove a lot of compatibility enums now the PackageKit version has been raised

commit 00ce642bf2785b74cfe562c3775009d8cce83077
Author: Richard Hughes <richard hughsie com>
Date:   Tue Oct 6 12:06:49 2009 +0100

    Remove a lot of compatibility enums now the PackageKit version has been raised

 src/gpk-enum.c |   66 ++++++++++++++++++------------------
 src/gpk-enum.h |   99 +++-----------------------------------------------------
 2 files changed, 38 insertions(+), 127 deletions(-)
---
diff --git a/src/gpk-enum.c b/src/gpk-enum.c
index e110e17..8ca2813 100644
--- a/src/gpk-enum.c
+++ b/src/gpk-enum.c
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <packagekit-glib/packagekit.h>
+#include <packagekit-glib2/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"
@@ -902,131 +902,131 @@ gpk_status_enum_to_localised_text (PkStatusEnum status)
 	const gchar *text = NULL;
 	switch (status) {
 	case PK_STATUS_ENUM_UNKNOWN:
-		/* TRANSLATORS: This is when the status is not known */
+		/* TRANSLATORS: This is when the transaction status is not known */
 		text = _("Unknown state");
 		break;
 	case PK_STATUS_ENUM_SETUP:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, the daemon is in the process of starting */
 		text = _("Starting");
 		break;
 	case PK_STATUS_ENUM_WAIT:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, the transaction is waiting for another to complete */
 		text = _("Waiting in queue");
 		break;
 	case PK_STATUS_ENUM_RUNNING:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, just started */
 		text = _("Running");
 		break;
 	case PK_STATUS_ENUM_QUERY:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, is querying data */
 		text = _("Querying");
 		break;
 	case PK_STATUS_ENUM_INFO:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, getting data from a server */
 		text = _("Getting information");
 		break;
 	case PK_STATUS_ENUM_REMOVE:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, removing packages */
 		text = _("Removing packages");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, downloading package files */
 		text = _("Downloading packages");
 		break;
 	case PK_STATUS_ENUM_INSTALL:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, installing packages */
 		text = _("Installing packages");
 		break;
 	case PK_STATUS_ENUM_REFRESH_CACHE:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, refreshing internal lists */
 		text = _("Refreshing software list");
 		break;
 	case PK_STATUS_ENUM_UPDATE:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, installing updates */
 		text = _("Installing updates");
 		break;
 	case PK_STATUS_ENUM_CLEANUP:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, removing old packages, and cleaning config files */
 		text = _("Cleaning up packages");
 		break;
 	case PK_STATUS_ENUM_OBSOLETE:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, obsoleting old packages */
 		text = _("Obsoleting packages");
 		break;
 	case PK_STATUS_ENUM_DEP_RESOLVE:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, checking the transaction before we do it */
 		text = _("Resolving dependencies");
 		break;
 	case PK_STATUS_ENUM_SIG_CHECK:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, checking if we have all the security keys for the operation */
 		text = _("Checking signatures");
 		break;
 	case PK_STATUS_ENUM_ROLLBACK:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, when we return to a previous system state */
 		text = _("Rolling back");
 		break;
 	case PK_STATUS_ENUM_TEST_COMMIT:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, when we're doing a test transaction */
 		text = _("Testing changes");
 		break;
 	case PK_STATUS_ENUM_COMMIT:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, when we're writing to the system package database */
 		text = _("Committing changes");
 		break;
 	case PK_STATUS_ENUM_REQUEST:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, requesting data from a server */
 		text = _("Requesting data");
 		break;
 	case PK_STATUS_ENUM_FINISHED:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, all done! */
 		text = _("Finished");
 		break;
 	case PK_STATUS_ENUM_CANCEL:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, in the process of cancelling */
 		text = _("Cancelling");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_REPOSITORY:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, downloading metadata */
 		text = _("Downloading repository information");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_PACKAGELIST:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, downloading metadata */
 		text = _("Downloading list of packages");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_FILELIST:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, downloading metadata */
 		text = _("Downloading file lists");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_CHANGELOG:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, downloading metadata */
 		text = _("Downloading lists of changes");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_GROUP:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, downloading metadata */
 		text = _("Downloading groups");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_UPDATEINFO:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, downloading metadata */
 		text = _("Downloading update information");
 		break;
 	case PK_STATUS_ENUM_REPACKAGING:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, repackaging delta files */
 		text = _("Repackaging files");
 		break;
 	case PK_STATUS_ENUM_LOADING_CACHE:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, loading databases */
 		text = _("Loading cache");
 		break;
 	case PK_STATUS_ENUM_SCAN_APPLICATIONS:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, scanning for running processes */
 		text = _("Scanning installed applications");
 		break;
 	case PK_STATUS_ENUM_GENERATE_PACKAGE_LIST:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, generating a list of packages installed on the system */
 		text = _("Generating package lists");
 		break;
 	case PK_STATUS_ENUM_WAITING_FOR_LOCK:
-		/* TRANSLATORS: The transaction state */
+		/* TRANSLATORS: transaction state, when we're waiting for the native tools to exit */
 		text = _("Waiting for package manager lock");
 		break;
 	case PK_STATUS_ENUM_WAITING_FOR_AUTH:
diff --git a/src/gpk-enum.h b/src/gpk-enum.h
index a4f612c..0b19666 100644
--- a/src/gpk-enum.h
+++ b/src/gpk-enum.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Copyright (C) 2007-2008 Richard Hughes <richard hughsie com>
+ * Copyright (C) 2007-2009 Richard Hughes <richard hughsie com>
  *
  * Licensed under the GNU General Public License Version 2
  *
@@ -23,7 +23,7 @@
 #define __GPK_ENUM_H
 
 #include <glib-object.h>
-#include <packagekit-glib/packagekit.h>
+#include <packagekit-glib2/packagekit.h>
 
 G_BEGIN_DECLS
 
@@ -55,99 +55,10 @@ 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
-
-/* constants defined in 0.4.9 */
-#if (!PK_CHECK_VERSION(0,4,9))
-#define PK_ERROR_ENUM_UPDATE_NOT_FOUND			(PK_ERROR_ENUM_NOT_AUTHORIZED + 1)
-#define PK_ERROR_ENUM_CANNOT_INSTALL_REPO_UNSIGNED	(PK_ERROR_ENUM_UPDATE_NOT_FOUND + 1)
-#define PK_ERROR_ENUM_CANNOT_UPDATE_REPO_UNSIGNED	(PK_ERROR_ENUM_CANNOT_INSTALL_REPO_UNSIGNED + 1)
-#define PK_STATUS_ENUM_WAITING_FOR_AUTH			(PK_STATUS_ENUM_WAITING_FOR_LOCK + 1)
-#undef PK_STATUS_ENUM_UNKNOWN
-#define PK_STATUS_ENUM_UNKNOWN				(PK_STATUS_ENUM_WAITING_FOR_AUTH + 1)
-#endif
-
-/* constants defined in 0.5.0 */
-#if (!PK_CHECK_VERSION(0,5,0))
-#define PK_EXIT_ENUM_NEED_UNTRUSTED			(PK_EXIT_ENUM_MEDIA_CHANGE_REQUIRED + 1)
-#define PK_ERROR_ENUM_CANNOT_GET_FILELIST		(PK_ERROR_ENUM_CANNOT_UPDATE_REPO_UNSIGNED + 1)
-#define PK_ERROR_ENUM_CANNOT_GET_REQUIRES		(PK_ERROR_ENUM_CANNOT_GET_FILELIST + 1)
-#define PK_ERROR_ENUM_CANNOT_DISABLE_REPOSITORY		(PK_ERROR_ENUM_CANNOT_GET_REQUIRES + 1)
-#endif
-
-/* functions defined in 0.5.0 */
-#if (!PK_CHECK_VERSION(0,5,0))
-#define pk_error_code_is_need_untrusted			gpk_error_code_is_need_untrusted
-#define pk_client_set_only_trusted(c,t)
-#endif
-
-/* constants defined in 0.5.1 */
-#if (!PK_CHECK_VERSION(0,5,1))
-#define PK_RESTART_ENUM_SECURITY_SESSION		(PK_RESTART_ENUM_SYSTEM + 1)
-#define PK_RESTART_ENUM_SECURITY_SYSTEM			(PK_RESTART_ENUM_SECURITY_SESSION + 1)
-#define PK_STATUS_ENUM_SCAN_PROCESS_LIST		(PK_STATUS_ENUM_WAITING_FOR_AUTH + 1)
-#define PK_STATUS_ENUM_CHECK_EXECUTABLE_FILES		(PK_STATUS_ENUM_SCAN_PROCESS_LIST + 1)
-#define PK_STATUS_ENUM_CHECK_LIBRARIES			(PK_STATUS_ENUM_CHECK_EXECUTABLE_FILES + 1)
-#undef PK_STATUS_ENUM_UNKNOWN
-#define PK_STATUS_ENUM_UNKNOWN				(PK_STATUS_ENUM_CHECK_LIBRARIES + 1)
-#endif
-
-/* constants defined in 0.5.2 */
-#if (!PK_CHECK_VERSION(0,5,2))
-#define PK_ERROR_ENUM_RESTRICTED_DOWNLOAD		(PK_ERROR_ENUM_CANNOT_DISABLE_REPOSITORY + 1)
-#define PK_ERROR_ENUM_PACKAGE_FAILED_TO_CONFIGURE	(PK_ERROR_ENUM_RESTRICTED_DOWNLOAD + 1)
-#define PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD		(PK_ERROR_ENUM_PACKAGE_FAILED_TO_CONFIGURE + 1)
-#define PK_ERROR_ENUM_PACKAGE_FAILED_TO_INSTALL		(PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD + 1)
-#define PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE		(PK_ERROR_ENUM_PACKAGE_FAILED_TO_INSTALL + 1)
-#define PK_MESSAGE_ENUM_AUTOREMOVE_IGNORED		(PK_MESSAGE_ENUM_PACKAGE_ALREADY_INSTALLED + 1)
-#define PK_MESSAGE_ENUM_REPO_METADATA_DOWNLOAD_FAILED	(PK_MESSAGE_ENUM_AUTOREMOVE_IGNORED + 1)
-#define PK_PROVIDES_ENUM_POSTSCRIPT_DRIVER		(PK_PROVIDES_ENUM_HARDWARE_DRIVER + 1)
-#define PK_ROLE_ENUM_SIMULATE_INSTALL_FILES		(PK_ROLE_ENUM_GET_OLD_TRANSACTIONS + 1)
-#define PK_ROLE_ENUM_SIMULATE_INSTALL_PACKAGES		(PK_ROLE_ENUM_SIMULATE_INSTALL_FILES + 1)
-#define PK_ROLE_ENUM_SIMULATE_REMOVE_PACKAGES		(PK_ROLE_ENUM_SIMULATE_INSTALL_PACKAGES + 1)
-#define PK_ROLE_ENUM_SIMULATE_UPDATE_PACKAGES		(PK_ROLE_ENUM_SIMULATE_REMOVE_PACKAGES + 1)
-#undef PK_ROLE_ENUM_UNKNOWN
-#define PK_ROLE_ENUM_UNKNOWN				(PK_ROLE_ENUM_SIMULATE_UPDATE_PACKAGES + 1)
-#undef PK_INFO_ENUM_UNKNOWN
-#define PK_INFO_ENUM_REINSTALLING			(PK_INFO_ENUM_FINISHED + 1)
-#define PK_INFO_ENUM_DOWNGRADING			(PK_INFO_ENUM_REINSTALLING + 1)
-#define PK_INFO_ENUM_UNKNOWN				(PK_INFO_ENUM_DOWNGRADING + 1)
-#endif
-
 /* constants defined in 0.5.3 */
-#if (!PK_CHECK_VERSION(0,5,3))
-#define PK_INFO_ENUM_PREPARING				(PK_INFO_ENUM_DOWNGRADING + 1)
-#define PK_INFO_ENUM_DECOMPRESSING			(PK_INFO_ENUM_PREPARING + 1)
-#undef PK_INFO_ENUM_UNKNOWN
-#define PK_INFO_ENUM_UNKNOWN				(PK_INFO_ENUM_DECOMPRESSING + 1)
-#define PK_STATUS_ENUM_COPY_FILES			(PK_STATUS_ENUM_CHECK_LIBRARIES + 1)
-#undef PK_STATUS_ENUM_UNKNOWN
-#define PK_STATUS_ENUM_UNKNOWN				(PK_STATUS_ENUM_COPY_FILES + 1)
-#endif
+//#if (!PK_CHECK_VERSION(0,5,3))
+//#define PK_INFO_ENUM_UNKNOWN				(PK_INFO_ENUM_DOWNGRADING + 1)
+//#endif
 
 void		 gpk_enum_test				(gpointer	 data);
 const gchar	*gpk_role_enum_to_localised_past	(PkRoleEnum	 role)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]