[gnome-boxes] Remove unused/unneeded UnattendedInstaller properties
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] Remove unused/unneeded UnattendedInstaller properties
- Date: Tue, 3 Jul 2012 16:58:18 +0000 (UTC)
commit 1114071bf7a08f2568a80ecc5d3764c18f3ebd94
Author: Christophe Fergeau <cfergeau redhat com>
Date: Thu May 24 14:23:07 2012 +0200
Remove unused/unneeded UnattendedInstaller properties
UnattendedInstaller::unattended_src_path is unused.
UnattendedInstaller::unattended_dest_name is used by the
FedoraInstaller class. Since the value of this property is set
from a hardcoded string provided by the FedoraInstaller class, there
is no need to go through this indirection.
https://bugzilla.gnome.org/show_bug.cgi?id=677038
src/fedora-installer.vala | 2 +-
src/unattended-installer.vala | 24 +++++++++++-------------
2 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/src/fedora-installer.vala b/src/fedora-installer.vala
index 609a7c2..b43c51c 100644
--- a/src/fedora-installer.vala
+++ b/src/fedora-installer.vala
@@ -44,7 +44,7 @@ private class Boxes.FedoraInstaller: UnattendedInstaller {
os.set_kernel (kernel_path);
os.set_ramdisk (initrd_path);
- os.set_cmdline ("ks=hd:sda:/" + unattended_dest_name);
+ os.set_cmdline ("ks=hd:sda:/ks.cfg");
}
public override void check_needed_info () throws UnattendedInstallerError.SETUP_INCOMPLETE {
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index 08cea19..415e1ce 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -37,8 +37,6 @@ private abstract class Boxes.UnattendedInstaller: InstallerMedia {
public string disk_path;
protected GLib.List<UnattendedFile> unattended_files;
- protected string unattended_src_path { get { return unattended_files.data.src_path; } }
- protected string unattended_dest_name { get { return unattended_files.data.dest_name; } }
private bool created_disk;
@@ -308,27 +306,27 @@ private abstract class Boxes.UnattendedInstaller: InstallerMedia {
return;
var username = Environment.get_user_name ();
- var avatar_file = new UnattendedAvatarFile (this, "/var/lib/AccountsService/icons/" + username, avatar_format);
+ string avatar_path = "/var/lib/AccountsService/icons/" + username;
try {
var path = yield accounts.FindUserByName (Environment.get_user_name ());
Fdo.AccountsUser user = yield Bus.get_proxy (BusType.SYSTEM, "org.freedesktop.Accounts", path);
- avatar_file.src_path = user.IconFile;
+ avatar_path = user.IconFile;
} catch (GLib.IOError error) {
warning ("Failed to retrieve information about user '%s': %s", username, error.message);
}
- var file = File.new_for_path (avatar_file.src_path);
+ var file = File.new_for_path (avatar_path);
if (file.query_exists ()) {
- avatar.file = avatar_file.src_path;
- unattended_files.append (avatar_file);
+ avatar.file = avatar_path;
+ unattended_files.append (new UnattendedAvatarFile (this, avatar_path, avatar_format));
}
}
}
private interface Boxes.UnattendedFile : GLib.Object {
- public abstract string src_path { get; set; }
- public abstract string dest_name { get; set; }
+ protected abstract string src_path { get; set; }
+ protected abstract string dest_name { get; set; }
protected abstract UnattendedInstaller installer { get; set; }
@@ -352,8 +350,8 @@ private interface Boxes.UnattendedFile : GLib.Object {
}
private class Boxes.UnattendedTextFile : GLib.Object, Boxes.UnattendedFile {
- public string src_path { get; set; }
- public string dest_name { get; set; }
+ protected string src_path { get; set; }
+ protected string dest_name { get; set; }
protected UnattendedInstaller installer { get; set; }
@@ -393,8 +391,8 @@ private class Boxes.UnattendedTextFile : GLib.Object, Boxes.UnattendedFile {
}
private class Boxes.UnattendedAvatarFile : GLib.Object, Boxes.UnattendedFile {
- public string src_path { get; set; }
- public string dest_name { get; set; }
+ protected string src_path { get; set; }
+ protected string dest_name { get; set; }
protected UnattendedInstaller installer { get; set; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]