[packagekit] packagekit: Branch 'master'

[Richard Hughes]

 backends/pisi/helpers/pisiBackend.py |   12 ++++++------
 backends/pisi/pk-backend-pisi.c      |    4 +++-
 backends/yum/helpers/yumBackend.py   |    8 ++++----
 backends/yum/pk-backend-yum.c        |    5 ++++-
 libpackagekit/pk-enum.c              |    5 ++++-
 libpackagekit/pk-enum.h              |    5 ++++-
 python/packagekit/backend.py         |    5 ++++-
 7 files changed, 29 insertions(+), 15 deletions(-)

New commits:
commit e2d6fa44c69b0b89c212bb7224dc6c920b774017
Author: Richard Hughes <richard at hughsie.com>
Date:   Sat Nov 3 08:41:04 2007 +0000

    split out the desktop types

diff --git a/backends/pisi/helpers/pisiBackend.py b/backends/pisi/helpers/pisiBackend.py
index aeefc69..a9341de 100644
--- a/backends/pisi/helpers/pisiBackend.py
+++ b/backends/pisi/helpers/pisiBackend.py
@@ -54,13 +54,13 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
             "applications.util" : GROUP_ACCESSORIES,
             "applications.virtualization" : GROUP_VIRTUALIZATION,
             "desktop.fonts" : GROUP_FONTS,
-            "desktop.freedesktop" : GROUP_DESKTOPS,
+            "desktop.freedesktop" : GROUP_DESKTOP_OTHER,
             "desktop.freedesktop.inputmethods" : GROUP_LOCALIZATION,
-            "desktop.freedesktop.xorg" : GROUP_DESKTOPS,
-            "desktop.freedesktop.xorg.lib" : GROUP_DESKTOPS,
-            "desktop.gnome" : GROUP_DESKTOPS,
-            "desktop.kde" : GROUP_DESKTOPS,
-            "desktop.kde.base" : GROUP_DESKTOPS,
+            "desktop.freedesktop.xorg" : GROUP_DESKTOP_OTHER,
+            "desktop.freedesktop.xorg.lib" : GROUP_DESKTOP_OTHER,
+            "desktop.gnome" : GROUP_DESKTOP_GNOME,
+            "desktop.kde" : GROUP_DESKTOP_KDE,
+            "desktop.kde.base" : GROUP_DESKTOP_KDE,
             "desktop.kde.i18n" : GROUP_LOCALIZATION,
             "kernel" : GROUP_SYSTEM,
             "kernel.drivers" : GROUP_SYSTEM,
diff --git a/backends/pisi/pk-backend-pisi.c b/backends/pisi/pk-backend-pisi.c
index 779b694..5b45817 100644
--- a/backends/pisi/pk-backend-pisi.c
+++ b/backends/pisi/pk-backend-pisi.c
@@ -42,7 +42,9 @@ backend_get_groups (PkBackend *backend, PkEnumList *elist)
 				         PK_GROUP_ENUM_PROGRAMMING,
 				         PK_GROUP_ENUM_MULTIMEDIA,
 				         PK_GROUP_ENUM_SYSTEM,
-				         PK_GROUP_ENUM_DESKTOPS,
+				         PK_GROUP_ENUM_DESKTOP_GNOME,
+				         PK_GROUP_ENUM_DESKTOP_KDE,
+				         PK_GROUP_ENUM_DESKTOP_OTHER,
 				         PK_GROUP_ENUM_PUBLISHING,
 				         PK_GROUP_ENUM_SERVERS,
 				         PK_GROUP_ENUM_FONTS,
diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 6470588..5f9cb04 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -44,10 +44,10 @@ yumbase = None
 progress = PackagekitProgress()  # Progress object to store the progress
 
 groupMap = {
-'desktops;gnome-desktop'                      : GROUP_DESKTOPS,
-'desktops;window-managers'                    : GROUP_DESKTOPS,
-'desktops;kde-desktop'                        : GROUP_DESKTOPS,
-'desktops;xfce-desktop'                       : GROUP_DESKTOPS,
+'desktops;gnome-desktop'                      : GROUP_DESKTOP_GNOME,
+'desktops;window-managers'                    : GROUP_DESKTOP_OTHER,
+'desktops;kde-desktop'                        : GROUP_DESKTOP_KDE,
+'desktops;xfce-desktop'                       : GROUP_DESKTOP_XFCE,
 'apps;authoring-and-publishing'               : GROUP_PUBLISHING,
 'apps;office'                                 : GROUP_OFFICE,
 'apps;sound-and-video'                        : GROUP_MULTIMEDIA,
diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index c5c85ba..af6f8f5 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -31,7 +31,10 @@ backend_get_groups (PkBackend *backend, PkEnumList *elist)
 	g_return_if_fail (backend != NULL);
 	pk_enum_list_append_multiple (elist,
 				      PK_GROUP_ENUM_ADMIN_TOOLS,
-				      PK_GROUP_ENUM_DESKTOPS,
+				      PK_GROUP_ENUM_DESKTOP_GNOME,
+				      PK_GROUP_ENUM_DESKTOP_KDE,
+				      PK_GROUP_ENUM_DESKTOP_XFCE,
+				      PK_GROUP_ENUM_DESKTOP_OTHER,
 				      PK_GROUP_ENUM_EDUCATION,
 				      PK_GROUP_ENUM_FONTS,
 				      PK_GROUP_ENUM_GAMES,
diff --git a/libpackagekit/pk-enum.c b/libpackagekit/pk-enum.c
index 295bb59..e543350 100644
--- a/libpackagekit/pk-enum.c
+++ b/libpackagekit/pk-enum.c
@@ -138,7 +138,10 @@ static PkEnumMatch enum_group[] = {
 	{PK_GROUP_ENUM_PROGRAMMING,		"programming"},
 	{PK_GROUP_ENUM_MULTIMEDIA,		"multimedia"},
 	{PK_GROUP_ENUM_SYSTEM,			"system"},
-	{PK_GROUP_ENUM_DESKTOPS,		"desktops"},
+	{PK_GROUP_ENUM_DESKTOP_GNOME,		"desktop-gnome"},
+	{PK_GROUP_ENUM_DESKTOP_KDE,		"desktop-kde"},
+	{PK_GROUP_ENUM_DESKTOP_XFCE,		"desktop-xfce"},
+	{PK_GROUP_ENUM_DESKTOP_OTHER,		"desktop-other"},
 	{PK_GROUP_ENUM_PUBLISHING,		"publishing"},
 	{PK_GROUP_ENUM_SERVERS,			"servers"},
 	{PK_GROUP_ENUM_FONTS,			"fonts"},
diff --git a/libpackagekit/pk-enum.h b/libpackagekit/pk-enum.h
index f0fec67..c6efd17 100644
--- a/libpackagekit/pk-enum.h
+++ b/libpackagekit/pk-enum.h
@@ -134,7 +134,10 @@ typedef enum {
 	PK_GROUP_ENUM_PROGRAMMING,
 	PK_GROUP_ENUM_MULTIMEDIA,
 	PK_GROUP_ENUM_SYSTEM,
-	PK_GROUP_ENUM_DESKTOPS,
+	PK_GROUP_ENUM_DESKTOP_GNOME,
+	PK_GROUP_ENUM_DESKTOP_KDE,
+	PK_GROUP_ENUM_DESKTOP_XFCE,
+	PK_GROUP_ENUM_DESKTOP_OTHER,
 	PK_GROUP_ENUM_PUBLISHING,
 	PK_GROUP_ENUM_SERVERS,
 	PK_GROUP_ENUM_FONTS,
diff --git a/python/packagekit/backend.py b/python/packagekit/backend.py
index 025411f..f1fdc87 100644
--- a/python/packagekit/backend.py
+++ b/python/packagekit/backend.py
@@ -90,7 +90,10 @@ GROUP_OTHER             = "other"
 GROUP_PROGRAMMING       = "programming"
 GROUP_MULTIMEDIA        = "multimedia"
 GROUP_SYSTEM            = "system"
-GROUP_DESKTOPS          = "desktops"
+GROUP_DESKTOP_GNOME     = "desktop-gnome"
+GROUP_DESKTOP_KDE       = "desktop-kde"
+GROUP_DESKTOP_XFCE      = "desktop-xfce"
+GROUP_DESKTOP_OTHER     = "desktop-other"
 GROUP_PUBLISHING        = "publishing"
 GROUP_SERVERS           = "servers"
 GROUP_FONTS             = "fonts"