diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-11-18 12:03:06 +0000 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-11-18 12:03:06 +0000 |
| commit | ef4655ab70c30f1b6889b1e0a2c634c10d82f1b4 (patch) | |
| tree | cce01484c579ad3dbab314c54b831f3662cdc9dd | |
| parent | 0bdad8a144f21ecaceeb1394c2e2a61a994b53c9 (diff) | |
| parent | 3ea42eb34e8cf787c98bb783d39c6f237381ffe2 (diff) | |
| download | ayatana-indicator-sound-ef4655ab70c30f1b6889b1e0a2c634c10d82f1b4.tar.gz ayatana-indicator-sound-ef4655ab70c30f1b6889b1e0a2c634c10d82f1b4.tar.bz2 ayatana-indicator-sound-ef4655ab70c30f1b6889b1e0a2c634c10d82f1b4.zip | |
merge the updates to accommodate vala 0.10 to vala 0.12 api changes
| -rw-r--r-- | src/familiar-players-db.vala | 7 | ||||
| -rw-r--r-- | src/fetch-file.vala | 2 | ||||
| -rw-r--r-- | src/metadata-menu-item.vala | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/familiar-players-db.vala b/src/familiar-players-db.vala index af7d07f..47ddc70 100644 --- a/src/familiar-players-db.vala +++ b/src/familiar-players-db.vala @@ -167,9 +167,14 @@ public class FamiliarPlayersDB : GLib.Object desktop_keyfile.load_from_file (desktop_path, KeyFileFlags.NONE); } catch(GLib.FileError error){ - warning("Error loading keyfile"); + warning("Error loading keyfile - FileError"); return null; } + catch(GLib.KeyFileError error){ + warning("Error loading keyfile - KeyFileError"); + return null; + } + try{ return desktop_keyfile.get_string (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_ICON); diff --git a/src/fetch-file.vala b/src/fetch-file.vala index 1811cc1..e6fc11d 100644 --- a/src/fetch-file.vala +++ b/src/fetch-file.vala @@ -64,7 +64,7 @@ public class FetchFile : Object ssize_t bufsize = 1; do { try { - bufsize = yield this.stream.read_async (buffer, size, GLib.Priority.DEFAULT, null); + bufsize = yield this.stream.read_async (buffer, GLib.Priority.DEFAULT, null); if (bufsize < 1) { break;} if (bufsize != size) diff --git a/src/metadata-menu-item.vala b/src/metadata-menu-item.vala index 3f71653..c9ab4dd 100644 --- a/src/metadata-menu-item.vala +++ b/src/metadata-menu-item.vala @@ -133,7 +133,7 @@ public class MetadataMenuitem : PlayerItem { try{ PixbufLoader loader = new PixbufLoader (); - loader.write (update.data, update.len); + loader.write (update.data); loader.close (); Pixbuf icon = loader.get_pixbuf (); string path = this.album_art_cache_dir.concat("/downloaded-coverart-XXXXXX"); |