gnome-packagekit r88 - trunk/src

[rhughes svn gnome org]

Author: rhughes
Date: Sun Jan 27 13:45:27 2008
New Revision: 88
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=88&view=rev

Log:
from git

Modified:
   trunk/src/pk-common-gui.c
   trunk/src/pk-watch.c

Modified: trunk/src/pk-common-gui.c
==============================================================================
--- trunk/src/pk-common-gui.c	(original)
+++ trunk/src/pk-common-gui.c	Sun Jan 27 13:45:27 2008
@@ -72,6 +72,7 @@
 	{PK_STATUS_ENUM_COMMIT,			"pk-setup"}, /* TODO: need better icon */
 	{PK_STATUS_ENUM_REQUEST,		"pk-package-search"},
 	{PK_STATUS_ENUM_FINISHED,		"pk-package-cleanup"}, /* TODO: need better icon */
+	{PK_STATUS_ENUM_CANCEL,			"pk-package-cleanup"}, /* TODO: need better icon */
 	{0, NULL},
 };
 
@@ -698,6 +699,9 @@
 	case PK_STATUS_ENUM_FINISHED:
 		text = _("Finished");
 		break;
+	case PK_STATUS_ENUM_CANCEL:
+		text = _("Cancelling");
+		break;
 	default:
 		text = _("Status unknown");
 		pk_warning ("status unrecognised: %s", pk_status_enum_to_text (status));

Modified: trunk/src/pk-watch.c
==============================================================================
--- trunk/src/pk-watch.c	(original)
+++ trunk/src/pk-watch.c	Sun Jan 27 13:45:27 2008
@@ -196,6 +196,7 @@
 	/* get the most important icon */
 	value = pk_enum_list_contains_priority (elist,
 						PK_STATUS_ENUM_REFRESH_CACHE,
+						PK_STATUS_ENUM_CANCEL,
 						PK_STATUS_ENUM_INSTALL,
 						PK_STATUS_ENUM_REMOVE,
 						PK_STATUS_ENUM_CLEANUP,