diff options
| author | Rico Tzschichholz <ricotz@t-online.de> | 2013-02-17 23:41:05 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2013-02-17 23:41:05 +0100 |
| commit | 659074016b19eb33ad719879fe7048e616e713ba (patch) | |
| tree | 09535571e386e91f2de34d2b37cd4d8788c3d111 /libzeitgeist | |
| parent | b92e129b432edfb2c0243988be5b7174f94f901c (diff) | |
| download | zeitgeist-659074016b19eb33ad719879fe7048e616e713ba.tar.gz | |
Fix vala deprecations and warnings in lib/src
Diffstat (limited to 'libzeitgeist')
| -rw-r--r-- | libzeitgeist/data-source-registry.vala | 2 | ||||
| -rw-r--r-- | libzeitgeist/index.vala | 2 | ||||
| -rw-r--r-- | libzeitgeist/log.vala | 31 |
3 files changed, 14 insertions, 21 deletions
diff --git a/libzeitgeist/data-source-registry.vala b/libzeitgeist/data-source-registry.vala index f3831655..15582783 100644 --- a/libzeitgeist/data-source-registry.vala +++ b/libzeitgeist/data-source-registry.vala @@ -59,7 +59,7 @@ namespace Zeitgeist public DataSourceRegistry () { - Bus.get_proxy<RemoteRegistry> (BusType.SESSION, + Bus.get_proxy.begin<RemoteRegistry> (BusType.SESSION, Utils.ENGINE_DBUS_NAME, "/org/gnome/zeitgeist/data_source_registry", 0, null, (obj, res) => diff --git a/libzeitgeist/index.vala b/libzeitgeist/index.vala index 6ab3d716..31667f55 100644 --- a/libzeitgeist/index.vala +++ b/libzeitgeist/index.vala @@ -47,7 +47,7 @@ public class Index : QueuedProxyWrapper */ public Index () { - Bus.get_proxy<RemoteSimpleIndexer> (BusType.SESSION, + Bus.get_proxy.begin<RemoteSimpleIndexer> (BusType.SESSION, Utils.ENGINE_DBUS_NAME, "/org/gnome/zeitgeist/index/activity", 0, null, (obj, res) => { diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala index a0db8712..d8aa7b02 100644 --- a/libzeitgeist/log.vala +++ b/libzeitgeist/log.vala @@ -65,7 +65,7 @@ public class Log : QueuedProxyWrapper public Log () { monitors = new HashTable<Monitor, int>(direct_hash, direct_equal); - Bus.get_proxy<RemoteLog> (BusType.SESSION, Utils.ENGINE_DBUS_NAME, + Bus.get_proxy.begin<RemoteLog> (BusType.SESSION, Utils.ENGINE_DBUS_NAME, Utils.ENGINE_DBUS_PATH, 0, null, (obj, res) => { try @@ -103,7 +103,7 @@ public class Log : QueuedProxyWrapper // Reinstate all active monitors foreach (unowned Monitor monitor in monitors.get_keys ()) { - reinstall_monitor (monitor); + reinstall_monitor.begin (monitor); } // Update our cached version property @@ -379,7 +379,7 @@ public class Log : QueuedProxyWrapper monitors.insert(monitor, 0); if (is_connected) - reinstall_monitor (monitor); + reinstall_monitor.begin (monitor); } private async void reinstall_monitor (Monitor monitor) @@ -387,29 +387,22 @@ public class Log : QueuedProxyWrapper { if (monitors.lookup (monitor) == 0) { + DBusConnection conn = ((DBusProxy) proxy).get_connection (); + try { - DBusConnection conn = ((DBusProxy) proxy).get_connection (); - - try - { - uint registration_id = conn.register_object<RemoteMonitor> ( - monitor.get_path (), monitor); - monitors.insert (monitor, registration_id); - } - catch (GLib.IOError err) - { - warning ("Error installing monitor: %s", err.message); - return; - } + uint registration_id = conn.register_object<RemoteMonitor> ( + monitor.get_path (), monitor); + monitors.insert (monitor, registration_id); } - catch (IOError err) + catch (GLib.IOError err) { - critical ("Unable to connect to DBus session bus: %s", err.message); + warning ("Error installing monitor: %s", err.message); + return; } } - proxy.install_monitor ( + proxy.install_monitor.begin ( monitor.get_path (), monitor.time_range.to_variant (), Events.to_variant (monitor.get_templates ())); |