aboutsummaryrefslogtreecommitdiff
path: root/src/familiar-players-db.vala
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-07-15 13:27:06 +0100
committerConor Curran <conor.curran@canonical.com>2010-07-15 13:27:06 +0100
commit0358622a18d0dbf2d1b413a708e248db974f97a8 (patch)
tree480a4f12b9434a404bbcf8afc8a72b32ae6f856e /src/familiar-players-db.vala
parentd8253fc0cfe667316e2e5f033bcbfba4c3044297 (diff)
parent6bab9d75b22aa21ed27e4961e6dbf4bbcdd2e94c (diff)
downloadayatana-indicator-sound-0358622a18d0dbf2d1b413a708e248db974f97a8.tar.gz
ayatana-indicator-sound-0358622a18d0dbf2d1b413a708e248db974f97a8.tar.bz2
ayatana-indicator-sound-0358622a18d0dbf2d1b413a708e248db974f97a8.zip
merged scrub bar work
Diffstat (limited to 'src/familiar-players-db.vala')
-rw-r--r--src/familiar-players-db.vala18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/familiar-players-db.vala b/src/familiar-players-db.vala
index b83caa3..2bc0a3c 100644
--- a/src/familiar-players-db.vala
+++ b/src/familiar-players-db.vala
@@ -51,18 +51,20 @@ public class FamiliarPlayersDB : GLib.Object
}
private bool create_key_file(){
+ bool result = false;
if (test(this.file_name, GLib.FileTest.EXISTS)) {
this.key_file = new KeyFile();
try{
- if (this.key_file.load_from_file(this.file_name, KeyFileFlags.NONE) == true) {
- return true;
- }
+ result = this.key_file.load_from_file(this.file_name, KeyFileFlags.NONE);
}
- catch(FileError e){
- warning("FamiliarPlayersDB - error trying to load KeyFile");
+ catch(GLib.KeyFileError e){
+ warning("FamiliarPlayersDB::create_key_file() - KeyFileError");
}
+ catch(GLib.FileError e){
+ warning("FamiliarPlayersDB::create_key_file() - FileError");
+ }
}
- return false;
+ return result;
}
private bool check_for_keys(){
@@ -87,7 +89,7 @@ public class FamiliarPlayersDB : GLib.Object
}
return true;
}
- catch(FileError error){
+ catch(GLib.KeyFileError error){
warning("Error loading the Desktop string list");
return false;
}
@@ -108,7 +110,7 @@ public class FamiliarPlayersDB : GLib.Object
try{
data = keyfile.to_data(out data_length);
}
- catch(Error e){
+ catch(GLib.KeyFileError e){
warning("Problems dumping keyfile to a string");
return false;
}