diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/computer.h | 6 | ||||
| -rw-r--r-- | includes/distro_flavors.h (renamed from includes/ubuntu_flavors.h) | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/includes/computer.h b/includes/computer.h index d01e1f2f..25da8e27 100644 --- a/includes/computer.h +++ b/includes/computer.h @@ -90,7 +90,7 @@ struct _Computer { gchar *date_time; }; -#include "ubuntu_flavors.h" +#include "distro_flavors.h" struct _OperatingSystem { gchar *kernel; @@ -112,9 +112,7 @@ struct _OperatingSystem { gchar *entropy_avail; - /* perhaps this could union with a flavors/spins - * pointer for other distro families */ - const UbuntuFlavor* ubuntu_flavor; + const DistroFlavor* distro_flavor; }; struct _MemoryInfo { diff --git a/includes/ubuntu_flavors.h b/includes/distro_flavors.h index ea21ddb9..60c38531 100644 --- a/includes/ubuntu_flavors.h +++ b/includes/distro_flavors.h @@ -17,14 +17,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __UBUNTU_FLAVORS_H__ -#define __UBUNTU_FLAVORS_H__ +#ifndef __DISTRO_FLAVORS_H__ +#define __DISTRO_FLAVORS_H__ -typedef struct UbuntuFlavor { - const char *package; +typedef struct { const char *name; const char *icon; const char *url; +} DistroFlavor; + +typedef struct UbuntuFlavor { + const DistroFlavor base; + const char *package; } UbuntuFlavor; /* items are const; free with g_slist_free() */ |