Import upstream version 0.8.3.0

1 files changed, 849 insertions, 340 deletions

diff --git a/src/music-player-bridge.c b/src/music-player-bridge.c
index 5c3be87..d3d865d 100644
--- a/src/music-player-bridge.c
+++ b/src/music-player-bridge.c
@@ -1,4 +1,4 @@
-/* music-player-bridge.c generated by valac 0.12.1, the Vala compiler
+/* music-player-bridge.c generated by valac 0.14.2, the Vala compiler
  * generated from music-player-bridge.vala, do not modify */
 
 /*
@@ -80,6 +80,8 @@ typedef struct _Mpris2WatcherClass Mpris2WatcherClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define PLAYER_CONTROLLER_TYPE_STATE (player_controller_state_get_type ())
+typedef struct _Block1Data Block1Data;
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
 #define TYPE_PLAYER_ITEM (player_item_get_type ())
@@ -102,7 +104,6 @@ typedef struct _PlayerItemClass PlayerItemClass;
 typedef struct _Mpris2Controller Mpris2Controller;
 typedef struct _Mpris2ControllerClass Mpris2ControllerClass;
 #define _g_key_file_free0(var) ((var == NULL) ? NULL : (var = (g_key_file_free (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 struct _MusicPlayerBridge {
 	GObject parent_instance;
@@ -117,6 +118,7 @@ struct _MusicPlayerBridgePrivate {
 	SettingsManager* settings_manager;
 	DbusmenuMenuitem* root_menu;
 	GeeHashMap* registered_clients;
+	GeeHashMap* file_monitors;
 	Mpris2Watcher* watcher;
 };
 
@@ -128,6 +130,12 @@ typedef enum  {
 	PLAYER_CONTROLLER_STATE_DISCONNECTED
 } PlayerControllerstate;
 
+struct _Block1Data {
+	int _ref_count_;
+	MusicPlayerBridge * self;
+	GFileMonitor* monitor;
+};
+
 struct _PlayerController {
 	GObject parent_instance;
 	PlayerControllerPrivate * priv;
@@ -169,6 +177,13 @@ static gint music_player_bridge_calculate_menu_position (MusicPlayerBridge* self
 GType player_controller_state_get_type (void) G_GNUC_CONST;
 PlayerController* player_controller_new (DbusmenuMenuitem* root, GAppInfo* app, const gchar* dbus_name, const gchar* icon_name, gint offset, gboolean* use_playlists, PlayerControllerstate initial_state);
 PlayerController* player_controller_construct (GType object_type, DbusmenuMenuitem* root, GAppInfo* app, const gchar* dbus_name, const gchar* icon_name, gint offset, gboolean* use_playlists, PlayerControllerstate initial_state);
+static void music_player_bridge_establish_file_monitoring (MusicPlayerBridge* self, GAppInfo* info, const gchar* mpris_key);
+static Block1Data* block1_data_ref (Block1Data* _data1_);
+static void block1_data_unref (Block1Data* _data1_);
+static void __lambda2_ (Block1Data* _data1_, GFile* desktop_file, GFile* other_file, GFileMonitorEvent event_type);
+static void music_player_bridge_relevant_desktop_file_changed (MusicPlayerBridge* self, GFile* desktop_file, GFile* other_file, GFileMonitorEvent event_type, GFileMonitor* monitor);
+static void ___lambda2__g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self);
+void settings_manager_remove_interested (SettingsManager* self, const gchar* app_desktop_name);
 #define PLAYER_CONTROLLER_WIDGET_QUANTITY 4
 void music_player_bridge_client_has_become_available (MusicPlayerBridge* self, const gchar* desktop, const gchar* dbus_name, gboolean use_playlists);
 gchar** settings_manager_fetch_blacklist (SettingsManager* self, int* result_length1);
@@ -213,109 +228,175 @@ MusicPlayerBridge* music_player_bridge_new (void) {
 
 
 static void music_player_bridge_on_blacklist_update (MusicPlayerBridge* self, gchar** blacklist, int blacklist_length1) {
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	Mpris2Watcher* _tmp15_;
 	g_return_if_fail (self != NULL);
-	g_debug ("music-player-bridge.vala:45: some blacklist update");
+	g_debug ("music-player-bridge.vala:47: some blacklist update");
+	_tmp0_ = blacklist;
+	_tmp0__length1 = blacklist_length1;
 	{
-		gchar** s_collection;
-		int s_collection_length1;
-		int s_it;
-		s_collection = blacklist;
-		s_collection_length1 = blacklist_length1;
-		for (s_it = 0; s_it < blacklist_length1; s_it = s_it + 1) {
-			gchar* _tmp0_;
-			gchar* s;
-			_tmp0_ = g_strdup (s_collection[s_it]);
-			s = _tmp0_;
+		gchar** s_collection = NULL;
+		gint s_collection_length1 = 0;
+		gint _s_collection_size_ = 0;
+		gint s_it = 0;
+		s_collection = _tmp0_;
+		s_collection_length1 = _tmp0__length1;
+		for (s_it = 0; s_it < _tmp0__length1; s_it = s_it + 1) {
+			gchar* _tmp1_;
+			gchar* s = NULL;
+			_tmp1_ = g_strdup (s_collection[s_it]);
+			s = _tmp1_;
 			{
-				gchar* _tmp1_;
-				gchar* _tmp2_ = NULL;
+				const gchar* _tmp2_;
+				gchar* _tmp3_;
+				gchar* _tmp4_ = NULL;
 				gchar* key;
-				gboolean _tmp3_;
-				_tmp1_ = g_strdup (s);
-				_tmp2_ = music_player_bridge_determine_key (_tmp1_);
-				key = _tmp2_;
-				_tmp3_ = gee_abstract_map_has_key ((GeeAbstractMap*) self->priv->registered_clients, key);
-				if (_tmp3_) {
-					gpointer _tmp4_ = NULL;
-					PlayerController* _tmp5_;
-					g_debug ("music-player-bridge.vala:50: Apparently %s is now blacklisted - remove" \
-" thy self", key);
-					_tmp4_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->registered_clients, key);
-					_tmp5_ = (PlayerController*) _tmp4_;
-					player_controller_remove_from_menu (_tmp5_);
-					_g_object_unref0 (_tmp5_);
-					gee_abstract_map_unset ((GeeAbstractMap*) self->priv->registered_clients, key, NULL);
+				GeeHashMap* _tmp5_;
+				const gchar* _tmp6_;
+				gboolean _tmp7_ = FALSE;
+				_tmp2_ = s;
+				_tmp3_ = g_strdup (_tmp2_);
+				_tmp4_ = music_player_bridge_determine_key (_tmp3_);
+				key = _tmp4_;
+				_tmp5_ = self->priv->registered_clients;
+				_tmp6_ = key;
+				_tmp7_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp5_, _tmp6_);
+				if (_tmp7_) {
+					const gchar* _tmp8_;
+					GeeHashMap* _tmp9_;
+					const gchar* _tmp10_;
+					gpointer _tmp11_ = NULL;
+					PlayerController* _tmp12_;
+					GeeHashMap* _tmp13_;
+					const gchar* _tmp14_;
+					_tmp8_ = key;
+					g_debug ("music-player-bridge.vala:52: Apparently %s is now blacklisted - remove" \
+" thy self", _tmp8_);
+					_tmp9_ = self->priv->registered_clients;
+					_tmp10_ = key;
+					_tmp11_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp9_, _tmp10_);
+					_tmp12_ = (PlayerController*) _tmp11_;
+					player_controller_remove_from_menu (_tmp12_);
+					_g_object_unref0 (_tmp12_);
+					_tmp13_ = self->priv->registered_clients;
+					_tmp14_ = key;
+					gee_abstract_map_unset ((GeeAbstractMap*) _tmp13_, _tmp14_, NULL);
 				}
 				_g_free0 (key);
 				_g_free0 (s);
 			}
 		}
 	}
-	mpris2_watcher_check_for_active_clients (self->priv->watcher, NULL, NULL);
+	_tmp15_ = self->priv->watcher;
+	mpris2_watcher_check_for_active_clients (_tmp15_, NULL, NULL);
 }
 
 
 static void music_player_bridge_try_to_add_inactive_familiar_clients (MusicPlayerBridge* self) {
 	g_return_if_fail (self != NULL);
 	{
-		GeeArrayList* _tmp0_ = NULL;
+		SettingsManager* _tmp0_;
+		GeeArrayList* _tmp1_ = NULL;
 		GeeArrayList* _desktop_list;
-		gint _tmp1_;
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _desktop_size;
 		gint _desktop_index;
-		_tmp0_ = settings_manager_fetch_interested (self->priv->settings_manager);
-		_desktop_list = _tmp0_;
-		_tmp1_ = gee_collection_get_size ((GeeCollection*) _desktop_list);
-		_desktop_size = _tmp1_;
+		_tmp0_ = self->priv->settings_manager;
+		_tmp1_ = settings_manager_fetch_interested (_tmp0_);
+		_desktop_list = _tmp1_;
+		_tmp2_ = _desktop_list;
+		_tmp3_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp2_);
+		_tmp4_ = _tmp3_;
+		_desktop_size = _tmp4_;
 		_desktop_index = -1;
 		while (TRUE) {
-			gpointer _tmp2_ = NULL;
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
+			GeeArrayList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_ = NULL;
 			gchar* desktop;
-			gchar* _tmp3_ = NULL;
-			gchar* _tmp4_;
-			GAppInfo* _tmp5_ = NULL;
-			GAppInfo* _tmp6_;
+			const gchar* _tmp11_;
+			const gchar* _tmp12_;
+			gchar* _tmp13_ = NULL;
+			gchar* _tmp14_;
+			GAppInfo* _tmp15_ = NULL;
+			GAppInfo* _tmp16_;
 			GAppInfo* app_info;
-			gchar* _tmp7_;
-			gchar* _tmp8_ = NULL;
+			GAppInfo* _tmp17_;
+			const gchar* _tmp19_;
+			gchar* _tmp20_;
+			gchar* _tmp21_ = NULL;
 			gchar* mpris_key;
-			gchar* _tmp9_ = NULL;
-			gchar* _tmp10_;
-			gint _tmp11_;
-			PlayerController* _tmp12_ = NULL;
-			PlayerController* _tmp13_;
+			DbusmenuMenuitem* _tmp22_;
+			GAppInfo* _tmp23_;
+			const gchar* _tmp24_;
+			gchar* _tmp25_ = NULL;
+			gchar* _tmp26_;
+			gint _tmp27_ = 0;
+			PlayerController* _tmp28_;
+			PlayerController* _tmp29_;
 			PlayerController* ctrl;
-			_desktop_index = _desktop_index + 1;
-			if (!(_desktop_index < _desktop_size)) {
+			GeeHashMap* _tmp30_;
+			const gchar* _tmp31_;
+			PlayerController* _tmp32_;
+			GAppInfo* _tmp33_;
+			const gchar* _tmp34_;
+			_tmp5_ = _desktop_index;
+			_desktop_index = _tmp5_ + 1;
+			_tmp6_ = _desktop_index;
+			_tmp7_ = _desktop_size;
+			if (!(_tmp6_ < _tmp7_)) {
 				break;
 			}
-			_tmp2_ = gee_abstract_list_get ((GeeAbstractList*) _desktop_list, _desktop_index);
-			desktop = (gchar*) _tmp2_;
-			g_debug ("music-player-bridge.vala:62: interested client found : %s", desktop);
-			_tmp3_ = g_strconcat (desktop, ".desktop", NULL);
-			_tmp4_ = _tmp3_;
-			_tmp5_ = music_player_bridge_create_app_info (_tmp4_);
-			_tmp6_ = _tmp5_;
-			_g_free0 (_tmp4_);
-			app_info = _tmp6_;
-			if (app_info == NULL) {
-				g_warning ("music-player-bridge.vala:65: Could not create app_info for path %s \n" \
-" Getting out of here ", desktop);
+			_tmp8_ = _desktop_list;
+			_tmp9_ = _desktop_index;
+			_tmp10_ = gee_abstract_list_get ((GeeAbstractList*) _tmp8_, _tmp9_);
+			desktop = (gchar*) _tmp10_;
+			_tmp11_ = desktop;
+			g_debug ("music-player-bridge.vala:64: interested client found : %s", _tmp11_);
+			_tmp12_ = desktop;
+			_tmp13_ = g_strconcat (_tmp12_, ".desktop", NULL);
+			_tmp14_ = _tmp13_;
+			_tmp15_ = music_player_bridge_create_app_info (_tmp14_);
+			_tmp16_ = _tmp15_;
+			_g_free0 (_tmp14_);
+			app_info = _tmp16_;
+			_tmp17_ = app_info;
+			if (_tmp17_ == NULL) {
+				const gchar* _tmp18_;
+				_tmp18_ = desktop;
+				g_warning ("music-player-bridge.vala:67: Could not create app_info for path %s \n" \
+" Getting out of here ", _tmp18_);
 				_g_object_unref0 (app_info);
 				_g_free0 (desktop);
 				continue;
 			}
-			_tmp7_ = g_strdup (desktop);
-			_tmp8_ = music_player_bridge_determine_key (_tmp7_);
-			mpris_key = _tmp8_;
-			_tmp9_ = music_player_bridge_fetch_icon_name (desktop);
-			_tmp10_ = _tmp9_;
-			_tmp11_ = music_player_bridge_calculate_menu_position (self);
-			_tmp12_ = player_controller_new (self->priv->root_menu, app_info, NULL, _tmp10_, _tmp11_, NULL, PLAYER_CONTROLLER_STATE_OFFLINE);
-			_tmp13_ = _tmp12_;
-			_g_free0 (_tmp10_);
-			ctrl = _tmp13_;
-			gee_abstract_map_set ((GeeAbstractMap*) self->priv->registered_clients, mpris_key, ctrl);
+			_tmp19_ = desktop;
+			_tmp20_ = g_strdup (_tmp19_);
+			_tmp21_ = music_player_bridge_determine_key (_tmp20_);
+			mpris_key = _tmp21_;
+			_tmp22_ = self->priv->root_menu;
+			_tmp23_ = app_info;
+			_tmp24_ = desktop;
+			_tmp25_ = music_player_bridge_fetch_icon_name (_tmp24_);
+			_tmp26_ = _tmp25_;
+			_tmp27_ = music_player_bridge_calculate_menu_position (self);
+			_tmp28_ = player_controller_new (_tmp22_, _tmp23_, NULL, _tmp26_, _tmp27_, NULL, PLAYER_CONTROLLER_STATE_OFFLINE);
+			_tmp29_ = _tmp28_;
+			_g_free0 (_tmp26_);
+			ctrl = _tmp29_;
+			_tmp30_ = self->priv->registered_clients;
+			_tmp31_ = mpris_key;
+			_tmp32_ = ctrl;
+			gee_abstract_map_set ((GeeAbstractMap*) _tmp30_, _tmp31_, _tmp32_);
+			_tmp33_ = app_info;
+			_tmp34_ = mpris_key;
+			music_player_bridge_establish_file_monitoring (self, _tmp33_, _tmp34_);
 			_g_object_unref0 (ctrl);
 			_g_free0 (mpris_key);
 			_g_object_unref0 (app_info);
@@ -326,18 +407,247 @@ static void music_player_bridge_try_to_add_inactive_familiar_clients (MusicPlaye
 }
 
 
+static Block1Data* block1_data_ref (Block1Data* _data1_) {
+	g_atomic_int_inc (&_data1_->_ref_count_);
+	return _data1_;
+}
+
+
+static void block1_data_unref (Block1Data* _data1_) {
+	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
+		_g_object_unref0 (_data1_->self);
+		_g_object_unref0 (_data1_->monitor);
+		g_slice_free (Block1Data, _data1_);
+	}
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+	return self ? g_object_ref (self) : NULL;
+}
+
+
+static void __lambda2_ (Block1Data* _data1_, GFile* desktop_file, GFile* other_file, GFileMonitorEvent event_type) {
+	MusicPlayerBridge * self;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFileMonitorEvent _tmp2_;
+	GFileMonitor* _tmp3_;
+	self = _data1_->self;
+	g_return_if_fail (desktop_file != NULL);
+	_tmp0_ = desktop_file;
+	_tmp1_ = other_file;
+	_tmp2_ = event_type;
+	_tmp3_ = _data1_->monitor;
+	music_player_bridge_relevant_desktop_file_changed (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_);
+}
+
+
+static void ___lambda2__g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
+	__lambda2_ (self, file, other_file, event_type);
+}
+
+
+static void music_player_bridge_establish_file_monitoring (MusicPlayerBridge* self, GAppInfo* info, const gchar* mpris_key) {
+	Block1Data* _data1_;
+	GAppInfo* _tmp0_;
+	GDesktopAppInfo* _tmp1_;
+	GDesktopAppInfo* desktop_info;
+	GDesktopAppInfo* _tmp2_;
+	const gchar* _tmp3_ = NULL;
+	gchar* _tmp4_;
+	gchar* file_path;
+	const gchar* _tmp5_;
+	GFile* _tmp6_ = NULL;
+	GFile* f;
+	GeeHashMap* _tmp13_;
+	const gchar* _tmp14_;
+	const gchar* _tmp15_;
+	GFileMonitor* _tmp16_;
+	GError * _inner_error_ = NULL;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (info != NULL);
+	g_return_if_fail (mpris_key != NULL);
+	_data1_ = g_slice_new0 (Block1Data);
+	_data1_->_ref_count_ = 1;
+	_data1_->self = g_object_ref (self);
+	_tmp0_ = info;
+	_tmp1_ = _g_object_ref0 (G_IS_DESKTOP_APP_INFO (_tmp0_) ? ((GDesktopAppInfo*) _tmp0_) : NULL);
+	desktop_info = _tmp1_;
+	_tmp2_ = desktop_info;
+	_tmp3_ = g_desktop_app_info_get_filename (_tmp2_);
+	_tmp4_ = g_strdup (_tmp3_);
+	file_path = _tmp4_;
+	_tmp5_ = file_path;
+	_tmp6_ = g_file_new_for_path (_tmp5_);
+	f = _tmp6_;
+	{
+		GFile* _tmp7_;
+		GFileMonitor* _tmp8_ = NULL;
+		GFileMonitor* _tmp9_;
+		GFileMonitor* _tmp10_;
+		_tmp7_ = f;
+		_tmp8_ = g_file_monitor (_tmp7_, G_FILE_MONITOR_SEND_MOVED, NULL, &_inner_error_);
+		_tmp9_ = _tmp8_;
+		if (_inner_error_ != NULL) {
+			goto __catch0_g_error;
+		}
+		_tmp10_ = _g_object_ref0 (_tmp9_);
+		_g_object_unref0 (_data1_->monitor);
+		_data1_->monitor = _tmp10_;
+	}
+	goto __finally0;
+	__catch0_g_error:
+	{
+		GError* e = NULL;
+		GAppInfo* _tmp11_;
+		const gchar* _tmp12_ = NULL;
+		e = _inner_error_;
+		_inner_error_ = NULL;
+		_tmp11_ = info;
+		_tmp12_ = g_app_info_get_name (_tmp11_);
+		g_warning ("music-player-bridge.vala:93: Unable to create a file monitor for %s", _tmp12_);
+		_g_error_free0 (e);
+		_g_object_unref0 (f);
+		_g_free0 (file_path);
+		_g_object_unref0 (desktop_info);
+		block1_data_unref (_data1_);
+		_data1_ = NULL;
+		return;
+	}
+	__finally0:
+	if (_inner_error_ != NULL) {
+		_g_object_unref0 (f);
+		_g_free0 (file_path);
+		_g_object_unref0 (desktop_info);
+		block1_data_unref (_data1_);
+		_data1_ = NULL;
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+		g_clear_error (&_inner_error_);
+		return;
+	}
+	_tmp13_ = self->priv->file_monitors;
+	_tmp14_ = file_path;
+	_tmp15_ = mpris_key;
+	gee_abstract_map_set ((GeeAbstractMap*) _tmp13_, _tmp14_, _tmp15_);
+	_tmp16_ = _data1_->monitor;
+	g_signal_connect_data (_tmp16_, "changed", (GCallback) ___lambda2__g_file_monitor_changed, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+	_g_object_unref0 (f);
+	_g_free0 (file_path);
+	_g_object_unref0 (desktop_info);
+	block1_data_unref (_data1_);
+	_data1_ = NULL;
+}
+
+
+static void music_player_bridge_relevant_desktop_file_changed (MusicPlayerBridge* self, GFile* desktop_file, GFile* other_file, GFileMonitorEvent event_type, GFileMonitor* monitor) {
+	GFileMonitorEvent _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_ = NULL;
+	gchar* path;
+	const gchar* _tmp3_;
+	GeeHashMap* _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_ = FALSE;
+	GeeHashMap* _tmp8_;
+	GeeHashMap* _tmp9_;
+	const gchar* _tmp10_;
+	gpointer _tmp11_ = NULL;
+	gchar* _tmp12_;
+	gpointer _tmp13_ = NULL;
+	PlayerController* _tmp14_;
+	SettingsManager* _tmp15_;
+	GeeHashMap* _tmp16_;
+	const gchar* _tmp17_;
+	gpointer _tmp18_ = NULL;
+	gchar* _tmp19_;
+	GeeHashMap* _tmp20_;
+	GeeHashMap* _tmp21_;
+	const gchar* _tmp22_;
+	gpointer _tmp23_ = NULL;
+	gchar* _tmp24_;
+	GFileMonitor* _tmp25_;
+	GFileMonitor* _tmp26_;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (desktop_file != NULL);
+	g_return_if_fail (monitor != NULL);
+	_tmp0_ = event_type;
+	if (_tmp0_ != G_FILE_MONITOR_EVENT_DELETED) {
+		return;
+	}
+	_tmp1_ = desktop_file;
+	_tmp2_ = g_file_get_path (_tmp1_);
+	path = _tmp2_;
+	_tmp3_ = path;
+	if (_tmp3_ == NULL) {
+		g_warning ("music-player-bridge.vala:113: relevant_desktop_file_changed is returni" \
+"ng a file with no path !");
+		_g_free0 (path);
+		return;
+	}
+	_tmp4_ = self->priv->file_monitors;
+	_tmp5_ = path;
+	_tmp6_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp4_, _tmp5_);
+	if (!_tmp6_) {
+		const gchar* _tmp7_;
+		_tmp7_ = path;
+		g_warning ("music-player-bridge.vala:117: relevant_desktop_file_changed is returni" \
+"ng a file which we know nothing about - %s", _tmp7_);
+		_g_free0 (path);
+		return;
+	}
+	_tmp8_ = self->priv->registered_clients;
+	_tmp9_ = self->priv->file_monitors;
+	_tmp10_ = path;
+	_tmp11_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp9_, _tmp10_);
+	_tmp12_ = (gchar*) _tmp11_;
+	_tmp13_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp8_, _tmp12_);
+	_tmp14_ = (PlayerController*) _tmp13_;
+	player_controller_remove_from_menu (_tmp14_);
+	_g_object_unref0 (_tmp14_);
+	_g_free0 (_tmp12_);
+	_tmp15_ = self->priv->settings_manager;
+	_tmp16_ = self->priv->file_monitors;
+	_tmp17_ = path;
+	_tmp18_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp16_, _tmp17_);
+	_tmp19_ = (gchar*) _tmp18_;
+	settings_manager_remove_interested (_tmp15_, _tmp19_);
+	_g_free0 (_tmp19_);
+	_tmp20_ = self->priv->registered_clients;
+	_tmp21_ = self->priv->file_monitors;
+	_tmp22_ = path;
+	_tmp23_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp21_, _tmp22_);
+	_tmp24_ = (gchar*) _tmp23_;
+	gee_abstract_map_unset ((GeeAbstractMap*) _tmp20_, _tmp24_, NULL);
+	_g_free0 (_tmp24_);
+	_tmp25_ = monitor;
+	g_file_monitor_cancel (_tmp25_);
+	_tmp26_ = monitor;
+	g_object_unref ((GObject*) _tmp26_);
+	_g_free0 (path);
+}
+
+
 static gint music_player_bridge_calculate_menu_position (MusicPlayerBridge* self) {
 	gint result = 0;
-	gint _tmp0_;
+	GeeHashMap* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	g_return_val_if_fail (self != NULL, 0);
-	_tmp0_ = gee_map_get_size ((GeeMap*) self->priv->registered_clients);
-	if (_tmp0_ == 0) {
+	_tmp0_ = self->priv->registered_clients;
+	_tmp1_ = gee_abstract_map_get_size ((GeeMap*) _tmp0_);
+	_tmp2_ = _tmp1_;
+	if (_tmp2_ == 0) {
 		result = MUSIC_PLAYER_BRIDGE_DEVICE_ITEMS_COUNT;
 		return result;
 	} else {
-		gint _tmp1_;
-		_tmp1_ = gee_map_get_size ((GeeMap*) self->priv->registered_clients);
-		result = MUSIC_PLAYER_BRIDGE_DEVICE_ITEMS_COUNT + (_tmp1_ * PLAYER_CONTROLLER_WIDGET_QUANTITY);
+		GeeHashMap* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
+		_tmp3_ = self->priv->registered_clients;
+		_tmp4_ = gee_abstract_map_get_size ((GeeMap*) _tmp3_);
+		_tmp5_ = _tmp4_;
+		result = MUSIC_PLAYER_BRIDGE_DEVICE_ITEMS_COUNT + (_tmp5_ * PLAYER_CONTROLLER_WIDGET_QUANTITY);
 		return result;
 	}
 }
@@ -385,111 +695,188 @@ static gchar* bool_to_string (gboolean self) {
 
 void music_player_bridge_client_has_become_available (MusicPlayerBridge* self, const gchar* desktop, const gchar* dbus_name, gboolean use_playlists) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-	gboolean _tmp4_;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_;
-	GAppInfo* _tmp7_ = NULL;
-	GAppInfo* _tmp8_;
+	const gchar* _tmp1_;
+	gboolean _tmp3_;
+	const gchar* _tmp5_;
+	SettingsManager* _tmp6_;
+	gint _tmp7_ = 0;
+	gchar** _tmp8_ = NULL;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
+	gboolean _tmp10_;
+	const gchar* _tmp12_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_ = NULL;
+	gchar* _tmp15_;
+	GAppInfo* _tmp16_ = NULL;
+	GAppInfo* _tmp17_;
 	GAppInfo* app_info;
-	gchar* _tmp9_;
-	gchar* _tmp10_ = NULL;
+	GAppInfo* _tmp18_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_ = NULL;
 	gchar* mpris_key;
-	gboolean _tmp11_;
+	GeeHashMap* _tmp23_;
+	const gchar* _tmp24_;
+	gboolean _tmp25_ = FALSE;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (desktop != NULL);
 	g_return_if_fail (dbus_name != NULL);
-	if (desktop == NULL) {
+	_tmp1_ = desktop;
+	if (_tmp1_ == NULL) {
 		_tmp0_ = TRUE;
 	} else {
-		_tmp0_ = g_strcmp0 (desktop, "") == 0;
+		const gchar* _tmp2_;
+		_tmp2_ = desktop;
+		_tmp0_ = g_strcmp0 (_tmp2_, "") == 0;
 	}
-	if (_tmp0_) {
-		g_warning ("music-player-bridge.vala:96: Client %s attempting to register without " \
-"desktop entry being set on the mpris root", dbus_name);
+	_tmp3_ = _tmp0_;
+	if (_tmp3_) {
+		const gchar* _tmp4_;
+		_tmp4_ = dbus_name;
+		g_warning ("music-player-bridge.vala:143: Client %s attempting to register without" \
+" desktop entry being set on the mpris root", _tmp4_);
 		return;
 	}
-	_tmp2_ = settings_manager_fetch_blacklist (self->priv->settings_manager, &_tmp1_);
-	_tmp3_ = _tmp2_;
-	_tmp3__length1 = _tmp1_;
-	_tmp4_ = _vala_string_array_contains (_tmp3_, _tmp1_, desktop);
-	_tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL);
-	if (_tmp4_) {
-		g_debug ("music-player-bridge.vala:101: Client %s attempting to register but I'm" \
-" afraid it is blacklisted", desktop);
+	_tmp5_ = desktop;
+	_tmp6_ = self->priv->settings_manager;
+	_tmp8_ = settings_manager_fetch_blacklist (_tmp6_, &_tmp7_);
+	_tmp9_ = _tmp8_;
+	_tmp9__length1 = _tmp7_;
+	_tmp10_ = _vala_string_array_contains (_tmp9_, _tmp7_, _tmp5_);
+	_tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) g_free), NULL);
+	if (_tmp10_) {
+		const gchar* _tmp11_;
+		_tmp11_ = desktop;
+		g_debug ("music-player-bridge.vala:148: Client %s attempting to register but I'm" \
+" afraid it is blacklisted", _tmp11_);
 		return;
 	}
-	g_debug ("music-player-bridge.vala:106: client_has_become_available %s", desktop);
-	_tmp5_ = g_strconcat (desktop, ".desktop", NULL);
-	_tmp6_ = _tmp5_;
-	_tmp7_ = music_player_bridge_create_app_info (_tmp6_);
-	_tmp8_ = _tmp7_;
-	_g_free0 (_tmp6_);
-	app_info = _tmp8_;
-	if (app_info == NULL) {
-		g_warning ("music-player-bridge.vala:109: Could not create app_info for path %s \n" \
-" Getting out of here ", desktop);
+	_tmp12_ = desktop;
+	g_debug ("music-player-bridge.vala:153: client_has_become_available %s", _tmp12_);
+	_tmp13_ = desktop;
+	_tmp14_ = g_strconcat (_tmp13_, ".desktop", NULL);
+	_tmp15_ = _tmp14_;
+	_tmp16_ = music_player_bridge_create_app_info (_tmp15_);
+	_tmp17_ = _tmp16_;
+	_g_free0 (_tmp15_);
+	app_info = _tmp17_;
+	_tmp18_ = app_info;
+	if (_tmp18_ == NULL) {
+		const gchar* _tmp19_;
+		_tmp19_ = desktop;
+		g_warning ("music-player-bridge.vala:156: Could not create app_info for path %s \n" \
+" Getting out of here ", _tmp19_);
 		_g_object_unref0 (app_info);
 		return;
 	}
-	_tmp9_ = g_strdup (desktop);
-	_tmp10_ = music_player_bridge_determine_key (_tmp9_);
-	mpris_key = _tmp10_;
-	_tmp11_ = gee_abstract_map_has_key ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-	if (_tmp11_ == FALSE) {
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_;
-		gint _tmp14_;
-		PlayerController* _tmp15_ = NULL;
-		PlayerController* _tmp16_;
+	_tmp20_ = desktop;
+	_tmp21_ = g_strdup (_tmp20_);
+	_tmp22_ = music_player_bridge_determine_key (_tmp21_);
+	mpris_key = _tmp22_;
+	_tmp23_ = self->priv->registered_clients;
+	_tmp24_ = mpris_key;
+	_tmp25_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp23_, _tmp24_);
+	if (_tmp25_ == FALSE) {
+		const gchar* _tmp26_;
+		DbusmenuMenuitem* _tmp27_;
+		GAppInfo* _tmp28_;
+		const gchar* _tmp29_;
+		const gchar* _tmp30_;
+		gchar* _tmp31_ = NULL;
+		gchar* _tmp32_;
+		gint _tmp33_ = 0;
+		gboolean _tmp34_;
+		PlayerController* _tmp35_;
+		PlayerController* _tmp36_;
 		PlayerController* ctrl;
-		g_debug ("music-player-bridge.vala:117: New client has registered that we have n" \
-"ot seen before: %s", dbus_name);
-		_tmp12_ = music_player_bridge_fetch_icon_name (desktop);
-		_tmp13_ = _tmp12_;
-		_tmp14_ = music_player_bridge_calculate_menu_position (self);
-		_tmp15_ = player_controller_new (self->priv->root_menu, app_info, dbus_name, _tmp13_, _tmp14_, &use_playlists, PLAYER_CONTROLLER_STATE_READY);
-		_tmp16_ = _tmp15_;
-		_g_free0 (_tmp13_);
-		ctrl = _tmp16_;
-		gee_abstract_map_set ((GeeAbstractMap*) self->priv->registered_clients, mpris_key, ctrl);
-		g_debug ("music-player-bridge.vala:126: Have not seen this %s before, new contro" \
-"ller created.", desktop);
-		settings_manager_add_interested (self->priv->settings_manager, desktop);
-		g_debug ("music-player-bridge.vala:128: application added to the interested list");
+		GeeHashMap* _tmp37_;
+		const gchar* _tmp38_;
+		PlayerController* _tmp39_;
+		const gchar* _tmp40_;
+		SettingsManager* _tmp41_;
+		const gchar* _tmp42_;
+		GAppInfo* _tmp43_;
+		const gchar* _tmp44_;
+		_tmp26_ = dbus_name;
+		g_debug ("music-player-bridge.vala:164: New client has registered that we have n" \
+"ot seen before: %s", _tmp26_);
+		_tmp27_ = self->priv->root_menu;
+		_tmp28_ = app_info;
+		_tmp29_ = dbus_name;
+		_tmp30_ = desktop;
+		_tmp31_ = music_player_bridge_fetch_icon_name (_tmp30_);
+		_tmp32_ = _tmp31_;
+		_tmp33_ = music_player_bridge_calculate_menu_position (self);
+		_tmp34_ = use_playlists;
+		_tmp35_ = player_controller_new (_tmp27_, _tmp28_, _tmp29_, _tmp32_, _tmp33_, &_tmp34_, PLAYER_CONTROLLER_STATE_READY);
+		_tmp36_ = _tmp35_;
+		_g_free0 (_tmp32_);
+		ctrl = _tmp36_;
+		_tmp37_ = self->priv->registered_clients;
+		_tmp38_ = mpris_key;
+		_tmp39_ = ctrl;
+		gee_abstract_map_set ((GeeAbstractMap*) _tmp37_, _tmp38_, _tmp39_);
+		_tmp40_ = desktop;
+		g_debug ("music-player-bridge.vala:173: Have not seen this %s before, new contro" \
+"ller created.", _tmp40_);
+		_tmp41_ = self->priv->settings_manager;
+		_tmp42_ = desktop;
+		settings_manager_add_interested (_tmp41_, _tmp42_);
+		_tmp43_ = app_info;
+		_tmp44_ = mpris_key;
+		music_player_bridge_establish_file_monitoring (self, _tmp43_, _tmp44_);
+		g_debug ("music-player-bridge.vala:176: application added to the interested list");
 		_g_object_unref0 (ctrl);
 	} else {
-		gpointer _tmp17_ = NULL;
-		PlayerController* _tmp18_;
-		gboolean* _tmp19_;
-		gpointer _tmp20_ = NULL;
-		PlayerController* _tmp21_;
-		gpointer _tmp22_ = NULL;
-		PlayerController* _tmp23_;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_;
-		_tmp17_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-		_tmp18_ = (PlayerController*) _tmp17_;
-		_tmp19_ = __bool_dup0 (&use_playlists);
-		_g_free0 (_tmp18_->use_playlists);
-		_tmp18_->use_playlists = _tmp19_;
-		_g_object_unref0 (_tmp18_);
-		_tmp20_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-		_tmp21_ = (PlayerController*) _tmp20_;
-		player_controller_update_state (_tmp21_, PLAYER_CONTROLLER_STATE_READY);
-		_g_object_unref0 (_tmp21_);
-		_tmp22_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-		_tmp23_ = (PlayerController*) _tmp22_;
-		player_controller_activate (_tmp23_, dbus_name);
-		_g_object_unref0 (_tmp23_);
-		_tmp24_ = bool_to_string (use_playlists);
-		_tmp25_ = _tmp24_;
-		g_debug ("music-player-bridge.vala:134: Application has already registered - awa" \
-"ken the hibernation: %s with playlists %s \n", dbus_name, _tmp25_);
-		_g_free0 (_tmp25_);
+		GeeHashMap* _tmp45_;
+		const gchar* _tmp46_;
+		gpointer _tmp47_ = NULL;
+		PlayerController* _tmp48_;
+		gboolean _tmp49_;
+		gboolean* _tmp50_;
+		GeeHashMap* _tmp51_;
+		const gchar* _tmp52_;
+		gpointer _tmp53_ = NULL;
+		PlayerController* _tmp54_;
+		GeeHashMap* _tmp55_;
+		const gchar* _tmp56_;
+		gpointer _tmp57_ = NULL;
+		PlayerController* _tmp58_;
+		const gchar* _tmp59_;
+		const gchar* _tmp60_;
+		gboolean _tmp61_;
+		gchar* _tmp62_ = NULL;
+		gchar* _tmp63_;
+		_tmp45_ = self->priv->registered_clients;
+		_tmp46_ = mpris_key;
+		_tmp47_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp45_, _tmp46_);
+		_tmp48_ = (PlayerController*) _tmp47_;
+		_tmp49_ = use_playlists;
+		_tmp50_ = __bool_dup0 (&_tmp49_);
+		_g_free0 (_tmp48_->use_playlists);
+		_tmp48_->use_playlists = _tmp50_;
+		_g_object_unref0 (_tmp48_);
+		_tmp51_ = self->priv->registered_clients;
+		_tmp52_ = mpris_key;
+		_tmp53_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp51_, _tmp52_);
+		_tmp54_ = (PlayerController*) _tmp53_;
+		player_controller_update_state (_tmp54_, PLAYER_CONTROLLER_STATE_READY);
+		_g_object_unref0 (_tmp54_);
+		_tmp55_ = self->priv->registered_clients;
+		_tmp56_ = mpris_key;
+		_tmp57_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp55_, _tmp56_);
+		_tmp58_ = (PlayerController*) _tmp57_;
+		_tmp59_ = dbus_name;
+		player_controller_activate (_tmp58_, _tmp59_);
+		_g_object_unref0 (_tmp58_);
+		_tmp60_ = dbus_name;
+		_tmp61_ = use_playlists;
+		_tmp62_ = bool_to_string (_tmp61_);
+		_tmp63_ = _tmp62_;
+		g_debug ("music-player-bridge.vala:182: Application has already registered - awa" \
+"ken the hibernation: %s with playlists %s \n", _tmp60_, _tmp63_);
+		_g_free0 (_tmp63_);
 	}
 	_g_free0 (mpris_key);
 	_g_object_unref0 (app_info);
@@ -497,45 +884,62 @@ void music_player_bridge_client_has_become_available (MusicPlayerBridge* self, c
 
 
 void music_player_bridge_client_has_vanished (MusicPlayerBridge* self, const gchar* mpris_root_interface) {
+	const gchar* _tmp0_;
+	DbusmenuMenuitem* _tmp1_;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (mpris_root_interface != NULL);
-	g_debug ("music-player-bridge.vala:140: MusicPlayerBridge -> client with dbus in" \
-"terface %s has vanished", mpris_root_interface);
-	if (self->priv->root_menu != NULL) {
-		gchar* _tmp0_;
-		gchar* _tmp1_ = NULL;
+	_tmp0_ = mpris_root_interface;
+	g_debug ("music-player-bridge.vala:188: MusicPlayerBridge -> client with dbus in" \
+"terface %s has vanished", _tmp0_);
+	_tmp1_ = self->priv->root_menu;
+	if (_tmp1_ != NULL) {
+		const gchar* _tmp2_;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_ = NULL;
 		gchar* mpris_key;
-		gboolean _tmp2_ = FALSE;
-		g_debug ("music-player-bridge.vala:143: attempt to remove %s", mpris_root_interface);
-		_tmp0_ = g_strdup (mpris_root_interface);
-		_tmp1_ = music_player_bridge_determine_key (_tmp0_);
-		mpris_key = _tmp1_;
-		if (mpris_key != NULL) {
-			gboolean _tmp3_;
-			_tmp3_ = gee_abstract_map_has_key ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-			_tmp2_ = _tmp3_;
+		gboolean _tmp6_ = FALSE;
+		const gchar* _tmp7_;
+		gboolean _tmp11_;
+		_tmp2_ = mpris_root_interface;
+		g_debug ("music-player-bridge.vala:191: attempt to remove %s", _tmp2_);
+		_tmp3_ = mpris_root_interface;
+		_tmp4_ = g_strdup (_tmp3_);
+		_tmp5_ = music_player_bridge_determine_key (_tmp4_);
+		mpris_key = _tmp5_;
+		_tmp7_ = mpris_key;
+		if (_tmp7_ != NULL) {
+			GeeHashMap* _tmp8_;
+			const gchar* _tmp9_;
+			gboolean _tmp10_ = FALSE;
+			_tmp8_ = self->priv->registered_clients;
+			_tmp9_ = mpris_key;
+			_tmp10_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp8_, _tmp9_);
+			_tmp6_ = _tmp10_;
 		} else {
-			_tmp2_ = FALSE;
+			_tmp6_ = FALSE;
 		}
-		if (_tmp2_) {
-			gpointer _tmp4_ = NULL;
-			PlayerController* _tmp5_;
-			_tmp4_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-			_tmp5_ = (PlayerController*) _tmp4_;
-			player_controller_hibernate (_tmp5_);
-			_g_object_unref0 (_tmp5_);
-			g_debug ("music-player-bridge.vala:147: Successively offlined client %s", mpris_key);
+		_tmp11_ = _tmp6_;
+		if (_tmp11_) {
+			GeeHashMap* _tmp12_;
+			const gchar* _tmp13_;
+			gpointer _tmp14_ = NULL;
+			PlayerController* _tmp15_;
+			const gchar* _tmp16_;
+			_tmp12_ = self->priv->registered_clients;
+			_tmp13_ = mpris_key;
+			_tmp14_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp12_, _tmp13_);
+			_tmp15_ = (PlayerController*) _tmp14_;
+			player_controller_hibernate (_tmp15_);
+			_g_object_unref0 (_tmp15_);
+			_tmp16_ = mpris_key;
+			g_debug ("music-player-bridge.vala:195: Successively offlined client %s", _tmp16_);
 		}
 		_g_free0 (mpris_key);
 	}
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
-	return self ? g_object_ref (self) : NULL;
-}
-
-
 static void _music_player_bridge_client_has_become_available_mpris2_watcher_client_appeared (Mpris2Watcher* _sender, const gchar* desktop_file_name, const gchar* dbus_name, gboolean use_playlists, gpointer self) {
 	music_player_bridge_client_has_become_available (self, desktop_file_name, dbus_name, use_playlists);
 }
@@ -548,103 +952,147 @@ static void _music_player_bridge_client_has_vanished_mpris2_watcher_client_disap
 
 void music_player_bridge_set_root_menu_item (MusicPlayerBridge* self, DbusmenuMenuitem* menu) {
 	DbusmenuMenuitem* _tmp0_;
-	Mpris2Watcher* _tmp1_ = NULL;
+	DbusmenuMenuitem* _tmp1_;
+	Mpris2Watcher* _tmp2_;
+	Mpris2Watcher* _tmp3_;
+	Mpris2Watcher* _tmp4_;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (menu != NULL);
-	_tmp0_ = _g_object_ref0 (menu);
+	_tmp0_ = menu;
+	_tmp1_ = _g_object_ref0 (_tmp0_);
 	_g_object_unref0 (self->priv->root_menu);
-	self->priv->root_menu = _tmp0_;
+	self->priv->root_menu = _tmp1_;
 	music_player_bridge_try_to_add_inactive_familiar_clients (self);
-	_tmp1_ = mpris2_watcher_new ();
+	_tmp2_ = mpris2_watcher_new ();
 	_g_object_unref0 (self->priv->watcher);
-	self->priv->watcher = _tmp1_;
-	g_signal_connect_object (self->priv->watcher, "client-appeared", (GCallback) _music_player_bridge_client_has_become_available_mpris2_watcher_client_appeared, self, 0);
-	g_signal_connect_object (self->priv->watcher, "client-disappeared", (GCallback) _music_player_bridge_client_has_vanished_mpris2_watcher_client_disappeared, self, 0);
+	self->priv->watcher = _tmp2_;
+	_tmp3_ = self->priv->watcher;
+	g_signal_connect_object (_tmp3_, "client-appeared", (GCallback) _music_player_bridge_client_has_become_available_mpris2_watcher_client_appeared, self, 0);
+	_tmp4_ = self->priv->watcher;
+	g_signal_connect_object (_tmp4_, "client-disappeared", (GCallback) _music_player_bridge_client_has_vanished_mpris2_watcher_client_disappeared, self, 0);
 }
 
 
 void music_player_bridge_enable_player_specific_items_for_client (MusicPlayerBridge* self, const gchar* object_path, const gchar* desktop_id) {
-	gchar* _tmp0_;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_ = NULL;
 	gchar* mpris_key;
-	gboolean _tmp2_;
-	gpointer _tmp3_ = NULL;
-	PlayerController* _tmp4_;
+	GeeHashMap* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_ = FALSE;
+	GeeHashMap* _tmp7_;
+	const gchar* _tmp8_;
+	gpointer _tmp9_ = NULL;
+	PlayerController* _tmp10_;
+	const gchar* _tmp11_;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (object_path != NULL);
 	g_return_if_fail (desktop_id != NULL);
-	_tmp0_ = g_strdup (desktop_id);
-	_tmp1_ = music_player_bridge_determine_key (_tmp0_);
-	mpris_key = _tmp1_;
-	_tmp2_ = gee_abstract_map_has_key ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-	if (_tmp2_ == FALSE) {
-		g_warning ("music-player-bridge.vala:166: we don't have a client with desktop id %" \
-"s registered", desktop_id);
+	_tmp0_ = desktop_id;
+	_tmp1_ = g_strdup (_tmp0_);
+	_tmp2_ = music_player_bridge_determine_key (_tmp1_);
+	mpris_key = _tmp2_;
+	_tmp3_ = self->priv->registered_clients;
+	_tmp4_ = mpris_key;
+	_tmp5_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp3_, _tmp4_);
+	if (_tmp5_ == FALSE) {
+		const gchar* _tmp6_;
+		_tmp6_ = desktop_id;
+		g_warning ("music-player-bridge.vala:214: we don't have a client with desktop id %" \
+"s registered", _tmp6_);
 		_g_free0 (mpris_key);
 		return;
 	}
-	_tmp3_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-	_tmp4_ = (PlayerController*) _tmp3_;
-	player_controller_enable_player_specific_items (_tmp4_, object_path);
-	_g_object_unref0 (_tmp4_);
+	_tmp7_ = self->priv->registered_clients;
+	_tmp8_ = mpris_key;
+	_tmp9_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp7_, _tmp8_);
+	_tmp10_ = (PlayerController*) _tmp9_;
+	_tmp11_ = object_path;
+	player_controller_enable_player_specific_items (_tmp10_, _tmp11_);
+	_g_object_unref0 (_tmp10_);
 	_g_free0 (mpris_key);
 }
 
 
 void music_player_bridge_enable_track_specific_items_for_client (MusicPlayerBridge* self, const gchar* object_path, const gchar* desktop_id) {
-	gchar* _tmp0_;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_ = NULL;
 	gchar* mpris_key;
-	gboolean _tmp2_;
-	gpointer _tmp3_ = NULL;
-	PlayerController* _tmp4_;
+	GeeHashMap* _tmp3_;
+	const gchar* _tmp4_;
+	gboolean _tmp5_ = FALSE;
+	GeeHashMap* _tmp7_;
+	const gchar* _tmp8_;
+	gpointer _tmp9_ = NULL;
+	PlayerController* _tmp10_;
+	const gchar* _tmp11_;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (object_path != NULL);
 	g_return_if_fail (desktop_id != NULL);
-	_tmp0_ = g_strdup (desktop_id);
-	_tmp1_ = music_player_bridge_determine_key (_tmp0_);
-	mpris_key = _tmp1_;
-	_tmp2_ = gee_abstract_map_has_key ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-	if (_tmp2_ == FALSE) {
-		g_warning ("music-player-bridge.vala:177: we don't have a client with desktop id %" \
-"s registered", desktop_id);
+	_tmp0_ = desktop_id;
+	_tmp1_ = g_strdup (_tmp0_);
+	_tmp2_ = music_player_bridge_determine_key (_tmp1_);
+	mpris_key = _tmp2_;
+	_tmp3_ = self->priv->registered_clients;
+	_tmp4_ = mpris_key;
+	_tmp5_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp3_, _tmp4_);
+	if (_tmp5_ == FALSE) {
+		const gchar* _tmp6_;
+		_tmp6_ = desktop_id;
+		g_warning ("music-player-bridge.vala:225: we don't have a client with desktop id %" \
+"s registered", _tmp6_);
 		_g_free0 (mpris_key);
 		return;
 	}
-	_tmp3_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->registered_clients, mpris_key);
-	_tmp4_ = (PlayerController*) _tmp3_;
-	player_controller_enable_track_specific_items (_tmp4_, object_path);
-	_g_object_unref0 (_tmp4_);
+	_tmp7_ = self->priv->registered_clients;
+	_tmp8_ = mpris_key;
+	_tmp9_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp7_, _tmp8_);
+	_tmp10_ = (PlayerController*) _tmp9_;
+	_tmp11_ = object_path;
+	player_controller_enable_track_specific_items (_tmp10_, _tmp11_);
+	_g_object_unref0 (_tmp10_);
 	_g_free0 (mpris_key);
 }
 
 
 static GAppInfo* music_player_bridge_create_app_info (const gchar* desktop) {
 	GAppInfo* result = NULL;
-	GDesktopAppInfo* _tmp0_ = NULL;
+	const gchar* _tmp0_;
+	GDesktopAppInfo* _tmp1_;
 	GDesktopAppInfo* info;
-	gboolean _tmp1_ = FALSE;
-	GDesktopAppInfo* _tmp2_;
-	GAppInfo* _tmp3_;
+	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp3_;
+	gboolean _tmp5_;
+	GDesktopAppInfo* _tmp7_;
+	GAppInfo* _tmp8_;
 	GAppInfo* app_info;
 	g_return_val_if_fail (desktop != NULL, NULL);
-	_tmp0_ = g_desktop_app_info_new (desktop);
-	info = _tmp0_;
-	if (desktop == NULL) {
-		_tmp1_ = TRUE;
+	_tmp0_ = desktop;
+	_tmp1_ = g_desktop_app_info_new (_tmp0_);
+	info = _tmp1_;
+	_tmp3_ = desktop;
+	if (_tmp3_ == NULL) {
+		_tmp2_ = TRUE;
 	} else {
-		_tmp1_ = info == NULL;
+		GDesktopAppInfo* _tmp4_;
+		_tmp4_ = info;
+		_tmp2_ = _tmp4_ == NULL;
 	}
-	if (_tmp1_) {
-		g_warning ("music-player-bridge.vala:187: Could not create a desktopappinfo instan" \
-"ce from app: %s", desktop);
+	_tmp5_ = _tmp2_;
+	if (_tmp5_) {
+		const gchar* _tmp6_;
+		_tmp6_ = desktop;
+		g_warning ("music-player-bridge.vala:235: Could not create a desktopappinfo instan" \
+"ce from app: %s", _tmp6_);
 		result = NULL;
 		_g_object_unref0 (info);
 		return result;
 	}
-	_tmp2_ = info;
-	_tmp3_ = _g_object_ref0 (G_IS_APP_INFO (_tmp2_) ? ((GAppInfo*) _tmp2_) : NULL);
-	app_info = _tmp3_;
+	_tmp7_ = info;
+	_tmp8_ = _g_object_ref0 (G_IS_APP_INFO (_tmp7_) ? ((GAppInfo*) _tmp7_) : NULL);
+	app_info = _tmp8_;
 	result = app_info;
 	_g_object_unref0 (info);
 	return result;
@@ -653,68 +1101,74 @@ static GAppInfo* music_player_bridge_create_app_info (const gchar* desktop) {
 
 static gchar* music_player_bridge_fetch_icon_name (const gchar* desktop) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_;
-	GDesktopAppInfo* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_;
 	GDesktopAppInfo* _tmp3_;
+	GDesktopAppInfo* _tmp4_;
 	GDesktopAppInfo* info;
-	GKeyFile* _tmp4_ = NULL;
+	GKeyFile* _tmp5_;
 	GKeyFile* desktop_keyfile;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_;
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (desktop != NULL, NULL);
-	_tmp0_ = g_strconcat (desktop, ".desktop", NULL);
-	_tmp1_ = _tmp0_;
-	_tmp2_ = g_desktop_app_info_new (_tmp1_);
-	_tmp3_ = _tmp2_;
-	_g_free0 (_tmp1_);
-	info = _tmp3_;
-	_tmp4_ = g_key_file_new ();
-	desktop_keyfile = _tmp4_;
-	_tmp5_ = g_desktop_app_info_get_filename (info);
-	g_key_file_load_from_file (desktop_keyfile, _tmp5_, G_KEY_FILE_NONE, &_inner_error_);
-	if (_inner_error_ != NULL) {
-		if (_inner_error_->domain == G_FILE_ERROR) {
-			goto __catch0_g_file_error;
-		}
-		if (_inner_error_->domain == G_KEY_FILE_ERROR) {
-			goto __catch0_g_key_file_error;
+	_tmp0_ = desktop;
+	_tmp1_ = g_strconcat (_tmp0_, ".desktop", NULL);
+	_tmp2_ = _tmp1_;
+	_tmp3_ = g_desktop_app_info_new (_tmp2_);
+	_tmp4_ = _tmp3_;
+	_g_free0 (_tmp2_);
+	info = _tmp4_;
+	_tmp5_ = g_key_file_new ();
+	desktop_keyfile = _tmp5_;
+	{
+		GKeyFile* _tmp6_;
+		GDesktopAppInfo* _tmp7_;
+		const gchar* _tmp8_ = NULL;
+		_tmp6_ = desktop_keyfile;
+		_tmp7_ = info;
+		_tmp8_ = g_desktop_app_info_get_filename (_tmp7_);
+		g_key_file_load_from_file (_tmp6_, _tmp8_, G_KEY_FILE_NONE, &_inner_error_);
+		if (_inner_error_ != NULL) {
+			if (_inner_error_->domain == G_FILE_ERROR) {
+				goto __catch1_g_file_error;
+			}
+			if (_inner_error_->domain == G_KEY_FILE_ERROR) {
+				goto __catch1_g_key_file_error;
+			}
+			_g_key_file_free0 (desktop_keyfile);
+			_g_object_unref0 (info);
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+			g_clear_error (&_inner_error_);
+			return NULL;
 		}
-		_g_key_file_free0 (desktop_keyfile);
-		_g_object_unref0 (info);
-		g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return NULL;
 	}
-	goto __finally0;
-	__catch0_g_file_error:
+	goto __finally1;
+	__catch1_g_file_error:
 	{
-		GError * _error_;
+		GError* _error_ = NULL;
 		_error_ = _inner_error_;
 		_inner_error_ = NULL;
-		g_warning ("music-player-bridge.vala:203: Error loading keyfile - FileError");
+		g_warning ("music-player-bridge.vala:251: Error loading keyfile - FileError");
 		result = NULL;
 		_g_error_free0 (_error_);
 		_g_key_file_free0 (desktop_keyfile);
 		_g_object_unref0 (info);
 		return result;
 	}
-	goto __finally0;
-	__catch0_g_key_file_error:
+	goto __finally1;
+	__catch1_g_key_file_error:
 	{
-		GError * _error_;
+		GError* _error_ = NULL;
 		_error_ = _inner_error_;
 		_inner_error_ = NULL;
-		g_warning ("music-player-bridge.vala:207: Error loading keyfile - KeyFileError");
+		g_warning ("music-player-bridge.vala:255: Error loading keyfile - KeyFileError");
 		result = NULL;
 		_g_error_free0 (_error_);
 		_g_key_file_free0 (desktop_keyfile);
 		_g_object_unref0 (info);
 		return result;
 	}
-	__finally0:
+	__finally1:
 	if (_inner_error_ != NULL) {
 		_g_key_file_free0 (desktop_keyfile);
 		_g_object_unref0 (info);
@@ -722,29 +1176,35 @@ static gchar* music_player_bridge_fetch_icon_name (const gchar* desktop) {
 		g_clear_error (&_inner_error_);
 		return NULL;
 	}
-	_tmp6_ = g_key_file_get_string (desktop_keyfile, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, &_inner_error_);
-	_tmp7_ = _tmp6_;
-	if (_inner_error_ != NULL) {
-		if (_inner_error_->domain == G_KEY_FILE_ERROR) {
-			goto __catch1_g_key_file_error;
+	{
+		GKeyFile* _tmp9_;
+		gchar* _tmp10_ = NULL;
+		gchar* _tmp11_;
+		_tmp9_ = desktop_keyfile;
+		_tmp10_ = g_key_file_get_string (_tmp9_, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, &_inner_error_);
+		_tmp11_ = _tmp10_;
+		if (_inner_error_ != NULL) {
+			if (_inner_error_->domain == G_KEY_FILE_ERROR) {
+				goto __catch2_g_key_file_error;
+			}
+			_g_key_file_free0 (desktop_keyfile);
+			_g_object_unref0 (info);
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+			g_clear_error (&_inner_error_);
+			return NULL;
 		}
+		result = _tmp11_;
 		_g_key_file_free0 (desktop_keyfile);
 		_g_object_unref0 (info);
-		g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return NULL;
+		return result;
 	}
-	result = _tmp7_;
-	_g_key_file_free0 (desktop_keyfile);
-	_g_object_unref0 (info);
-	return result;
-	goto __finally1;
-	__catch1_g_key_file_error:
+	goto __finally2;
+	__catch2_g_key_file_error:
 	{
-		GError * _error_;
+		GError* _error_ = NULL;
 		_error_ = _inner_error_;
 		_inner_error_ = NULL;
-		g_warning ("music-player-bridge.vala:216: Error trying to fetch the icon name from" \
+		g_warning ("music-player-bridge.vala:264: Error trying to fetch the icon name from" \
 " the keyfile");
 		result = NULL;
 		_g_error_free0 (_error_);
@@ -752,7 +1212,7 @@ static gchar* music_player_bridge_fetch_icon_name (const gchar* desktop) {
 		_g_object_unref0 (info);
 		return result;
 	}
-	__finally1:
+	__finally2:
 	_g_key_file_free0 (desktop_keyfile);
 	_g_object_unref0 (info);
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -763,52 +1223,94 @@ static gchar* music_player_bridge_fetch_icon_name (const gchar* desktop) {
 
 static gchar* music_player_bridge_determine_key (gchar* desktop_or_interface) {
 	gchar* result = NULL;
-	gchar* _tmp0_;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	gchar* _result_;
-	gchar** _tmp1_;
-	gchar** _tmp2_ = NULL;
+	const gchar* _tmp2_;
+	gchar** _tmp3_;
+	gchar** _tmp4_ = NULL;
 	gchar** tokens;
 	gint tokens_length1;
 	gint _tokens_size_;
-	gboolean _tmp3_ = FALSE;
-	gchar** _tmp5_;
-	gchar** _tmp6_ = NULL;
+	gboolean _tmp5_ = FALSE;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
+	gboolean _tmp8_;
+	const gchar* _tmp13_;
+	gchar** _tmp14_;
+	gchar** _tmp15_ = NULL;
 	gchar** temp;
 	gint temp_length1;
 	gint _temp_size_;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp16_ = FALSE;
+	gchar** _tmp17_;
+	gint _tmp17__length1;
+	gboolean _tmp19_;
 	g_return_val_if_fail (desktop_or_interface != NULL, NULL);
-	_tmp0_ = g_strdup (desktop_or_interface);
-	_result_ = _tmp0_;
-	_tmp2_ = _tmp1_ = g_strsplit (desktop_or_interface, ".", 0);
-	tokens = _tmp2_;
-	tokens_length1 = _vala_array_length (_tmp1_);
-	_tokens_size_ = _vala_array_length (_tmp1_);
-	if (tokens != NULL) {
-		_tmp3_ = tokens_length1 > 1;
+	_tmp0_ = desktop_or_interface;
+	_tmp1_ = g_strdup (_tmp0_);
+	_result_ = _tmp1_;
+	_tmp2_ = desktop_or_interface;
+	_tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ".", 0);
+	tokens = _tmp4_;
+	tokens_length1 = _vala_array_length (_tmp3_);
+	_tokens_size_ = tokens_length1;
+	_tmp6_ = tokens;
+	_tmp6__length1 = tokens_length1;
+	if (_tmp6_ != NULL) {
+		gchar** _tmp7_;
+		gint _tmp7__length1;
+		_tmp7_ = tokens;
+		_tmp7__length1 = tokens_length1;
+		_tmp5_ = _tmp7__length1 > 1;
 	} else {
-		_tmp3_ = FALSE;
+		_tmp5_ = FALSE;
 	}
-	if (_tmp3_) {
-		gchar* _tmp4_;
-		_tmp4_ = g_strdup (tokens[tokens_length1 - 1]);
+	_tmp8_ = _tmp5_;
+	if (_tmp8_) {
+		gchar** _tmp9_;
+		gint _tmp9__length1;
+		gchar** _tmp10_;
+		gint _tmp10__length1;
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
+		_tmp9_ = tokens;
+		_tmp9__length1 = tokens_length1;
+		_tmp10_ = tokens;
+		_tmp10__length1 = tokens_length1;
+		_tmp11_ = _tmp9_[_tmp10__length1 - 1];
+		_tmp12_ = g_strdup (_tmp11_);
 		_g_free0 (_result_);
-		_result_ = _tmp4_;
-	}
-	_tmp6_ = _tmp5_ = g_strsplit (_result_, "-", 0);
-	temp = _tmp6_;
-	temp_length1 = _vala_array_length (_tmp5_);
-	_temp_size_ = _vala_array_length (_tmp5_);
-	if (temp != NULL) {
-		_tmp7_ = temp_length1 > 1;
+		_result_ = _tmp12_;
+	}
+	_tmp13_ = _result_;
+	_tmp15_ = _tmp14_ = g_strsplit (_tmp13_, "-", 0);
+	temp = _tmp15_;
+	temp_length1 = _vala_array_length (_tmp14_);
+	_temp_size_ = temp_length1;
+	_tmp17_ = temp;
+	_tmp17__length1 = temp_length1;
+	if (_tmp17_ != NULL) {
+		gchar** _tmp18_;
+		gint _tmp18__length1;
+		_tmp18_ = temp;
+		_tmp18__length1 = temp_length1;
+		_tmp16_ = _tmp18__length1 > 1;
 	} else {
-		_tmp7_ = FALSE;
+		_tmp16_ = FALSE;
 	}
-	if (_tmp7_) {
-		gchar* _tmp8_;
-		_tmp8_ = g_strdup (temp[0]);
+	_tmp19_ = _tmp16_;
+	if (_tmp19_) {
+		gchar** _tmp20_;
+		gint _tmp20__length1;
+		const gchar* _tmp21_;
+		gchar* _tmp22_;
+		_tmp20_ = temp;
+		_tmp20__length1 = temp_length1;
+		_tmp21_ = _tmp20_[0];
+		_tmp22_ = g_strdup (_tmp21_);
 		_g_free0 (_result_);
-		_result_ = _tmp8_;
+		_result_ = _tmp22_;
 	}
 	result = _result_;
 	temp = (_vala_array_free (temp, temp_length1, (GDestroyNotify) g_free), NULL);
@@ -827,18 +1329,24 @@ static GObject * music_player_bridge_constructor (GType type, guint n_construct_
 	GObject * obj;
 	GObjectClass * parent_class;
 	MusicPlayerBridge * self;
-	GeeHashMap* _tmp0_ = NULL;
-	SettingsManager* _tmp1_ = NULL;
+	GeeHashMap* _tmp0_;
+	GeeHashMap* _tmp1_;
+	SettingsManager* _tmp2_;
+	SettingsManager* _tmp3_;
 	parent_class = G_OBJECT_CLASS (music_player_bridge_parent_class);
 	obj = parent_class->constructor (type, n_construct_properties, construct_properties);
 	self = MUSIC_PLAYER_BRIDGE (obj);
 	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_PLAYER_CONTROLLER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 	_g_object_unref0 (self->priv->registered_clients);
 	self->priv->registered_clients = _tmp0_;
-	_tmp1_ = settings_manager_new ();
+	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_g_object_unref0 (self->priv->file_monitors);
+	self->priv->file_monitors = _tmp1_;
+	_tmp2_ = settings_manager_new ();
 	_g_object_unref0 (self->priv->settings_manager);
-	self->priv->settings_manager = _tmp1_;
-	g_signal_connect_object (self->priv->settings_manager, "blacklist-updates", (GCallback) _music_player_bridge_on_blacklist_update_settings_manager_blacklist_updates, self, 0);
+	self->priv->settings_manager = _tmp2_;
+	_tmp3_ = self->priv->settings_manager;
+	g_signal_connect_object (_tmp3_, "blacklist-updates", (GCallback) _music_player_bridge_on_blacklist_update_settings_manager_blacklist_updates, self, 0);
 	return obj;
 }
 
@@ -862,6 +1370,7 @@ static void music_player_bridge_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->settings_manager);
 	_g_object_unref0 (self->priv->root_menu);
 	_g_object_unref0 (self->priv->registered_clients);
+	_g_object_unref0 (self->priv->file_monitors);
 	_g_object_unref0 (self->priv->watcher);
 	G_OBJECT_CLASS (music_player_bridge_parent_class)->finalize (obj);
 }