private const string SERVICE_PREFIX = "org.gnome.UPnP.MediaServer2.";
private const string GRILO_UPNP_PREFIX = SERVICE_PREFIX + "grl_upnp";
- DBusObject dbus_obj;
- PluginLoader loader;
- IconFactory icon_factory;
+ FreeDesktop.DBusObject dbus_obj;
+ PluginLoader loader;
+ IconFactory icon_factory;
public PluginFactory (PluginLoader loader) throws IOError, DBusError {
this.icon_factory = new IconFactory ();
this.dbus_obj.name_owner_changed.connect (this.name_owner_changed);
}
- private void name_owner_changed (DBusObject dbus_obj,
- string name,
- string old_owner,
- string new_owner) {
+ private void name_owner_changed (FreeDesktop.DBusObject dbus_obj,
+ string name,
+ string old_owner,
+ string new_owner) {
var plugin = this.loader.get_plugin_by_name (name);
if (plugin != null) {
};
var timeout = Timeout.add_seconds (FILE_CHANGE_DEFAULT_GRACE_PERIOD,
- callback);
+ (owned) callback);
this.extraction_grace_timers[file] = timeout;
}
}
Database.RowCallback callback = (statement) => {
var child_id = statement.column_text (DetailColumn.ID);
var parent_id = statement.column_text (DetailColumn.PARENT);
+
if (parent == null || parent_id != parent.id) {
parent = new NullContainer ();
parent.id = parent_id;
throw new MediaCacheError.UNSUPPORTED_SEARCH (message);
}
- if (&collate != null) {
- if (use_collation) {
- collate = "COLLATE CASEFOLD";
- } else {
- collate = "";
- }
+ if (use_collation) {
+ collate = "COLLATE CASEFOLD";
+ } else {
+ collate = "";
}
+
return column;
}
RelationalExpression virtual_expression = null;
QueryContainer query_container;
+ container = null;
+
if (!(expression is LogicalExpression)) {
return false;
}
throws VideoItemError {
var title_node = XMLUtils.get_element (item, "title");
var group = XMLUtils.get_element (item, "group");
+ playlist_url = null;
if (title_node == null) {
throw new VideoItemError.XML_PARSE_ERROR ("No 'title' element");
private const string SERVICE_PREFIX = "org.mpris.MediaPlayer2.";
private const string MEDIA_PLAYER_PATH = "/org/mpris/MediaPlayer2";
- DBusObject dbus_obj;
- PluginLoader loader;
+ FreeDesktop.DBusObject dbus_obj;
+ PluginLoader loader;
public PluginFactory (PluginLoader loader) throws IOError {
this.dbus_obj = Bus.get_proxy_sync
this.dbus_obj.name_owner_changed.connect (this.name_owner_changed);
}
- private void name_owner_changed (DBusObject dbus_obj,
- string name,
- string old_owner,
- string new_owner) {
+ private void name_owner_changed (FreeDesktop.DBusObject dbus_obj,
+ string name,
+ string old_owner,
+ string new_owner) {
var plugin = this.loader.get_plugin_by_name (name);
if (plugin != null) {
return tokens[1];
} else {
+ parent_id = null;
+
return null;
}
}
return;
}
- ModuleInitFunc module_init = (ModuleInitFunc) function;
+ unowned ModuleInitFunc module_init = (ModuleInitFunc) function;
assert (module_init != null);
// We don't want our modules to ever unload
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-using FreeDesktop;
-
/**
* Manages the user configuration for Rygel.
*/
var dest = File.new_for_path (dest_path);
if (enable) {
+ // TODO: Use null in watch_name once vala situation in jhbuild
+ // is cleared and vala dependency is bumped.
+ BusNameAppearedCallback a = null;
+ BusNameVanishedCallback b = null;
+
// Creating the proxy starts the service
- DBusObject dbus = Bus.get_proxy_sync
- (BusType.SESSION,
- DBUS_SERVICE,
- DBUS_OBJECT,
- DBusProxyFlags.DO_NOT_LOAD_PROPERTIES);
- dbus.start_service_by_name (DBusInterface.SERVICE_NAME, 0);
+ Bus.watch_name (BusType.SESSION,
+ DBusInterface.SERVICE_NAME,
+ BusNameWatcherFlags.AUTO_START,
+ a,
+ b);
// Then symlink the desktop file to user's autostart dir
var source_path = Path.build_filename (BuildConfig.DESKTOP_DIR,