[gnome-boxes] Fix CPUArchCompatibity typo
- From: Christophe Fergeau <teuf src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] Fix CPUArchCompatibity typo
- Date: Mon, 4 Mar 2013 17:06:48 +0000 (UTC)
commit 5b563dd4c2c58a058fec450133507bae4692b77e
Author: Christophe Fergeau <cfergeau redhat com>
Date: Mon Mar 4 14:16:00 2013 +0100
Fix CPUArchCompatibity typo
https://bugzilla.gnome.org/show_bug.cgi?id=695123
src/installer-media.vala | 2 +-
src/os-database.vala | 2 +-
src/unattended-installer.vala | 4 +-
src/util-app.vala | 44 ++++++++++++++++++++--------------------
4 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/src/installer-media.vala b/src/installer-media.vala
index 1966cb4..21ff340 100644
--- a/src/installer-media.vala
+++ b/src/installer-media.vala
@@ -94,7 +94,7 @@ private class Boxes.InstallerMedia : GLib.Object {
var compatibility = compare_cpu_architectures (architecture, os_media.architecture);
- return compatibility != CPUArchCompatibity.INCOMPATIBLE;
+ return compatibility != CPUArchCompatibility.INCOMPATIBLE;
}
protected void add_cd_config (Domain domain,
diff --git a/src/os-database.vala b/src/os-database.vala
index 38f5090..d97ff80 100644
--- a/src/os-database.vala
+++ b/src/os-database.vala
@@ -168,7 +168,7 @@ private class Boxes.OSDatabase : GLib.Object {
foreach (var entity in list.get_elements ()) {
var resources = entity as Resources;
var compatibility = compare_cpu_architectures (arch, resources.architecture);
- if (compatibility == CPUArchCompatibity.IDENTICAL || compatibility ==
CPUArchCompatibity.COMPATIBLE)
+ if (compatibility == CPUArchCompatibility.IDENTICAL || compatibility ==
CPUArchCompatibility.COMPATIBLE)
new_list.add (resources);
}
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index a430b9c..986b5ab 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -742,9 +742,9 @@ private class Boxes.UnattendedInstaller: InstallerMedia {
var compatibility = compare_cpu_architectures (os_media.architecture, driver.get_architecture
());
var location = driver.get_location ();
- if (compatibility == CPUArchCompatibity.IDENTICAL)
+ if (compatibility == CPUArchCompatibility.IDENTICAL)
drivers.replace (location, driver);
- else if (compatibility == CPUArchCompatibity.COMPATIBLE && drivers.lookup (location) == null)
+ else if (compatibility == CPUArchCompatibility.COMPATIBLE && drivers.lookup (location) == null)
drivers.insert (location, driver);
// We don't entertain compatibility when word-size is different because 32-bit drivers
// are not guaranteed to work on 64-bit architectures in all OSs.
diff --git a/src/util-app.vala b/src/util-app.vala
index 83594d0..0dc2d2d 100644
--- a/src/util-app.vala
+++ b/src/util-app.vala
@@ -398,7 +398,7 @@ namespace Boxes {
// Warning: architecture compability is not computative. e.g "i386" is compatible with "i686" but "i686"
is
// incompatible with "i386".
- public enum CPUArchCompatibity {
+ public enum CPUArchCompatibility {
INCOMPATIBLE = -1, // First architecture is incompatible to second one
IDENTICAL = 0, // First architecture is identical to second one
COMPATIBLE = 1, // First architecture is compatible with second one
@@ -406,68 +406,68 @@ namespace Boxes {
// with second one but has different word-size
}
- public CPUArchCompatibity compare_cpu_architectures (string arch1, string arch2) {
+ public CPUArchCompatibility compare_cpu_architectures (string arch1, string arch2) {
switch (arch2) {
case "i386":
switch (arch1) {
case "i386":
- return CPUArchCompatibity.IDENTICAL;
+ return CPUArchCompatibility.IDENTICAL;
case "i486":
case "i586":
case "i686":
- return CPUArchCompatibity.COMPATIBLE;
+ return CPUArchCompatibility.COMPATIBLE;
case "x86_64":
- return CPUArchCompatibity.COMPATIBLE_DIFF_WORDSIZE;
+ return CPUArchCompatibility.COMPATIBLE_DIFF_WORDSIZE;
default:
- return CPUArchCompatibity.INCOMPATIBLE;
+ return CPUArchCompatibility.INCOMPATIBLE;
}
case "i486":
switch (arch1) {
case "i486":
- return CPUArchCompatibity.IDENTICAL;
+ return CPUArchCompatibility.IDENTICAL;
case "i586":
case "i686":
- return CPUArchCompatibity.COMPATIBLE;
+ return CPUArchCompatibility.COMPATIBLE;
case "x86_64":
- return CPUArchCompatibity.COMPATIBLE_DIFF_WORDSIZE;
+ return CPUArchCompatibility.COMPATIBLE_DIFF_WORDSIZE;
default:
- return CPUArchCompatibity.INCOMPATIBLE;
+ return CPUArchCompatibility.INCOMPATIBLE;
}
case "i586":
switch (arch1) {
case "i586":
- return CPUArchCompatibity.IDENTICAL;
+ return CPUArchCompatibility.IDENTICAL;
case "i686":
- return CPUArchCompatibity.COMPATIBLE;
+ return CPUArchCompatibility.COMPATIBLE;
case "x86_64":
- return CPUArchCompatibity.COMPATIBLE_DIFF_WORDSIZE;
+ return CPUArchCompatibility.COMPATIBLE_DIFF_WORDSIZE;
default:
- return CPUArchCompatibity.INCOMPATIBLE;
+ return CPUArchCompatibility.INCOMPATIBLE;
}
case "i686":
switch (arch1) {
case "i686":
- return CPUArchCompatibity.IDENTICAL;
+ return CPUArchCompatibility.IDENTICAL;
case "x86_64":
- return CPUArchCompatibity.COMPATIBLE_DIFF_WORDSIZE;
+ return CPUArchCompatibility.COMPATIBLE_DIFF_WORDSIZE;
default:
- return CPUArchCompatibity.INCOMPATIBLE;
+ return CPUArchCompatibility.INCOMPATIBLE;
}
case "x86_64":
switch (arch1) {
case "x86_64":
- return CPUArchCompatibity.IDENTICAL;
+ return CPUArchCompatibility.IDENTICAL;
default:
- return CPUArchCompatibity.INCOMPATIBLE;
+ return CPUArchCompatibility.INCOMPATIBLE;
}
case Osinfo.ARCHITECTURE_ALL:
- return CPUArchCompatibity.COMPATIBLE;
+ return CPUArchCompatibility.COMPATIBLE;
default:
switch (arch1) {
case Osinfo.ARCHITECTURE_ALL:
- return CPUArchCompatibity.IDENTICAL;
+ return CPUArchCompatibility.IDENTICAL;
default:
- return CPUArchCompatibity.INCOMPATIBLE;
+ return CPUArchCompatibility.INCOMPATIBLE;
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]