[rygel] core,ui: Drop usage of '+=' for connecting signals
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] core,ui: Drop usage of '+=' for connecting signals
- Date: Sat, 19 Jun 2010 03:06:36 +0000 (UTC)
commit a6734b939ba17de899b91da337750bd32367898e
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Sat Jun 19 05:04:52 2010 +0300
core,ui: Drop usage of '+=' for connecting signals
Drop usage of deprecated '+=' syntax for connecting signals.
src/plugins/external/rygel-external-container.vala | 2 +-
.../external/rygel-external-plugin-factory.vala | 2 +-
.../rygel-media-export-metadata-extractor.vala | 8 +-
src/rygel/rygel-connection-manager.vala | 49 +++++-----
src/rygel/rygel-content-directory.vala | 110 ++++++++++----------
src/rygel/rygel-http-response.vala | 2 +-
src/rygel/rygel-http-server.vala | 8 +-
src/rygel/rygel-l16-transcoder-bin.vala | 2 +-
src/rygel/rygel-live-response.vala | 2 +-
src/rygel/rygel-main.vala | 8 +-
src/rygel/rygel-media-container.vala | 2 +-
src/rygel/rygel-media-receiver-registrar.vala | 14 ++--
src/rygel/rygel-mp2ts-transcoder-bin.vala | 2 +-
src/rygel/rygel-mp3-transcoder-bin.vala | 2 +-
src/rygel/rygel-wma-transcoder-bin.vala | 2 +-
src/rygel/rygel-wmv-transcoder-bin.vala | 2 +-
src/ui/rygel-general-pref-section.vala | 4 +-
src/ui/rygel-media-export-pref-section.vala | 6 +-
src/ui/rygel-plugin-pref-section.vala | 4 +-
19 files changed, 120 insertions(+), 111 deletions(-)
---
diff --git a/src/plugins/external/rygel-external-container.vala b/src/plugins/external/rygel-external-container.vala
index 4a77c42..4a27fd4 100644
--- a/src/plugins/external/rygel-external-container.vala
+++ b/src/plugins/external/rygel-external-container.vala
@@ -65,7 +65,7 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
this.update_container ();
- this.actual_container.updated += this.on_updated;
+ this.actual_container.updated.connect (this.on_updated);
} catch (GLib.Error err) {
critical ("Failed to fetch information about container '%s': %s",
actual_container.get_path (),
diff --git a/src/plugins/external/rygel-external-plugin-factory.vala b/src/plugins/external/rygel-external-plugin-factory.vala
index f1864d9..b9740d0 100644
--- a/src/plugins/external/rygel-external-plugin-factory.vala
+++ b/src/plugins/external/rygel-external-plugin-factory.vala
@@ -87,7 +87,7 @@ public class Rygel.ExternalPluginFactory {
}
}
- this.dbus_obj.name_owner_changed += this.name_owner_changed;
+ this.dbus_obj.name_owner_changed.connect (this.name_owner_changed);
}
private void name_owner_changed (DBusObject dbus_obj,
diff --git a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
index fe382b5..87c670a 100644
--- a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
+++ b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
@@ -95,13 +95,13 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
var bus = this.playbin.get_bus ();
bus.add_signal_watch ();
- bus.message["tag"] += this.tag_cb;
+ bus.message["tag"].connect (this.tag_cb);
if (factory.get_element_type ().name () == "GstPlayBin2") {
- bus.message["element"] += this.element_message_cb;
+ bus.message["element"].connect (this.element_message_cb);
} else {
- bus.message["state-changed"] += this.state_changed_cb;
+ bus.message["state-changed"].connect (this.state_changed_cb);
}
- bus.message["error"] += this.error_cb;
+ bus.message["error"].connect (this.error_cb);
}
}
diff --git a/src/rygel/rygel-connection-manager.vala b/src/rygel/rygel-connection-manager.vala
index c6d2cee..6ebbeec 100644
--- a/src/rygel/rygel-connection-manager.vala
+++ b/src/rygel/rygel-connection-manager.vala
@@ -43,42 +43,43 @@ public class Rygel.ConnectionManager : Service {
this.source_protocol_info = "";
this.connection_ids = "0";
- this.query_variable["SourceProtocolInfo"] +=
- this.query_source_protocol_info_cb;
- this.query_variable["SinkProtocolInfo"] +=
- this.query_sink_protocol_info_cb;
- this.query_variable["CurrentConnectionIDs"] +=
- this.query_current_connection_ids_cb;
-
- this.action_invoked["GetProtocolInfo"] += this.get_protocol_info_cb;
- this.action_invoked["GetCurrentConnectionIDs"] +=
- this.get_current_connection_ids_cb;
- this.action_invoked["GetCurrentConnectionInfo"] +=
- this.get_current_connection_info_cb;
+ this.query_variable["SourceProtocolInfo"].connect (
+ this.query_source_protocol_info_cb);
+ this.query_variable["SinkProtocolInfo"].connect (
+ this.query_sink_protocol_info_cb);
+ this.query_variable["CurrentConnectionIDs"].connect (
+ this.query_current_connection_ids_cb);
+
+ this.action_invoked["GetProtocolInfo"].connect (
+ this.get_protocol_info_cb);
+ this.action_invoked["GetCurrentConnectionIDs"].connect (
+ this.get_current_connection_ids_cb);
+ this.action_invoked["GetCurrentConnectionInfo"].connect (
+ this.get_current_connection_info_cb);
}
- private void query_source_protocol_info_cb (ConnectionManager cm,
- string var,
- ref Value val) {
+ private void query_source_protocol_info_cb (Service cm,
+ string var,
+ ref Value val) {
val.init (typeof (string));
val.set_string (source_protocol_info);
}
- private void query_sink_protocol_info_cb (ConnectionManager cm,
- string var,
- ref Value val) {
+ private void query_sink_protocol_info_cb (Service cm,
+ string var,
+ ref Value val) {
val.init (typeof (string));
val.set_string (sink_protocol_info);
}
- private void query_current_connection_ids_cb (ConnectionManager cm,
- string var,
- ref Value val) {
+ private void query_current_connection_ids_cb (Service cm,
+ string var,
+ ref Value val) {
val.init (typeof (string));
val.set_string (connection_ids);
}
- private void get_protocol_info_cb (ConnectionManager cm,
+ private void get_protocol_info_cb (Service cm,
owned ServiceAction action) {
action.set ("Source", typeof (string), source_protocol_info,
"Sink", typeof (string), sink_protocol_info);
@@ -86,14 +87,14 @@ public class Rygel.ConnectionManager : Service {
action.return ();
}
- private void get_current_connection_ids_cb (ConnectionManager cm,
+ private void get_current_connection_ids_cb (Service cm,
owned ServiceAction action) {
action.set ("ConnectionIDs", typeof (string), connection_ids);
action.return ();
}
- private void get_current_connection_info_cb (ConnectionManager cm,
+ private void get_current_connection_info_cb (Service cm,
owned ServiceAction action) {
int connection_id;
diff --git a/src/rygel/rygel-content-directory.vala b/src/rygel/rygel-content-directory.vala
index 4fc0215..ba56f97 100644
--- a/src/rygel/rygel-content-directory.vala
+++ b/src/rygel/rygel-content-directory.vala
@@ -91,7 +91,7 @@ public class Rygel.ContentDirectory: Service {
this.updated_containers = new ArrayList<MediaContainer> ();
this.active_imports = new ArrayList<ImportResource> ();
- this.root_container.container_updated += on_container_updated;
+ this.root_container.container_updated.connect (on_container_updated);
this.feature_list =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
@@ -102,39 +102,41 @@ public class Rygel.ContentDirectory: Service {
"</Features>";
this.sort_caps = "";
- this.action_invoked["Browse"] += this.browse_cb;
- this.action_invoked["Search"] += this.search_cb;
- this.action_invoked["CreateObject"] += this.create_object_cb;
- this.action_invoked["ImportResource"] += this.import_resource_cb;
- this.action_invoked["GetTransferProgress"] +=
- this.get_transfer_progress_cb;
- this.action_invoked["StopTransferResource"] +=
- this.stop_transfer_resource_cb;
+ this.action_invoked["Browse"].connect (this.browse_cb);
+ this.action_invoked["Search"].connect (this.search_cb);
+ this.action_invoked["CreateObject"].connect (this.create_object_cb);
+ this.action_invoked["ImportResource"].connect (this.import_resource_cb);
+ this.action_invoked["GetTransferProgress"].connect (
+ this.get_transfer_progress_cb);
+ this.action_invoked["StopTransferResource"].connect (
+ this.stop_transfer_resource_cb);
- this.query_variable["TransferIDs"] += this.query_transfer_ids;
+ this.query_variable["TransferIDs"].connect (this.query_transfer_ids);
/* Connect SystemUpdateID related signals */
- this.action_invoked["GetSystemUpdateID"] +=
- this.get_system_update_id_cb;
- this.query_variable["SystemUpdateID"] += this.query_system_update_id;
- this.query_variable["ContainerUpdateIDs"] +=
- this.query_container_update_ids;
+ this.action_invoked["GetSystemUpdateID"].connect (
+ this.get_system_update_id_cb);
+ this.query_variable["SystemUpdateID"].connect (
+ this.query_system_update_id);
+ this.query_variable["ContainerUpdateIDs"].connect (
+ this.query_container_update_ids);
/* Connect SearchCapabilities related signals */
- this.action_invoked["GetSearchCapabilities"] +=
- this.get_search_capabilities_cb;
- this.query_variable["SearchCapabilities"] +=
- this.query_search_capabilities;
+ this.action_invoked["GetSearchCapabilities"].connect (
+ this.get_search_capabilities_cb);
+ this.query_variable["SearchCapabilities"].connect (
+ this.query_search_capabilities);
/* Connect SortCapabilities related signals */
- this.action_invoked["GetSortCapabilities"] +=
- this.get_sort_capabilities_cb;
- this.query_variable["SortCapabilities"] +=
- this.query_sort_capabilities;
+ this.action_invoked["GetSortCapabilities"].connect (
+ this.get_sort_capabilities_cb);
+ this.query_variable["SortCapabilities"].connect (
+ this.query_sort_capabilities);
/* Connect FeatureList related signals */
- this.action_invoked["GetFeatureList"] += this.get_feature_list_cb;
- this.query_variable["FeatureList"] += this.query_feature_list;
+ this.action_invoked["GetFeatureList"].connect (
+ this.get_feature_list_cb);
+ this.query_variable["FeatureList"].connect (this.query_feature_list);
this.http_server.run.begin ();
}
@@ -145,7 +147,7 @@ public class Rygel.ContentDirectory: Service {
}
/* Browse action implementation */
- private void browse_cb (ContentDirectory content_dir,
+ private void browse_cb (Service content_dir,
owned ServiceAction action) {
Browse browse = new Browse (this, action);
@@ -153,7 +155,7 @@ public class Rygel.ContentDirectory: Service {
}
/* Search action implementation */
- private void search_cb (ContentDirectory content_dir,
+ private void search_cb (Service content_dir,
owned ServiceAction action) {
var search = new Search (this, action);
@@ -161,7 +163,7 @@ public class Rygel.ContentDirectory: Service {
}
/* CreateObject action implementation */
- private void create_object_cb (ContentDirectory content_dir,
+ private void create_object_cb (Service content_dir,
owned ServiceAction action) {
var creator = new ItemCreator (this, action);
@@ -169,11 +171,11 @@ public class Rygel.ContentDirectory: Service {
}
/* ImportResource action implementation */
- private void import_resource_cb (ContentDirectory content_dir,
+ private void import_resource_cb (Service content_dir,
owned ServiceAction action) {
var import = new ImportResource (this, action);
- import.completed += this.on_import_completed;
+ import.completed.connect (this.on_import_completed);
this.active_imports.add (import);
import.run.begin ();
@@ -184,7 +186,7 @@ public class Rygel.ContentDirectory: Service {
}
/* Query TransferIDs */
- private void query_transfer_ids (ContentDirectory content_dir,
+ private void query_transfer_ids (Service content_dir,
string variable,
ref GLib.Value value) {
value.init (typeof (string));
@@ -192,7 +194,7 @@ public class Rygel.ContentDirectory: Service {
}
/* GetTransferProgress action implementation */
- private void get_transfer_progress_cb (ContentDirectory content_dir,
+ private void get_transfer_progress_cb (Service content_dir,
owned ServiceAction action) {
var import = find_import_for_action (action);
if (import != null) {
@@ -213,7 +215,7 @@ public class Rygel.ContentDirectory: Service {
}
/* StopTransferResource action implementation */
- private void stop_transfer_resource_cb (ContentDirectory content_dir,
+ private void stop_transfer_resource_cb (Service content_dir,
owned ServiceAction action) {
var import = find_import_for_action (action);
if (import != null) {
@@ -226,7 +228,7 @@ public class Rygel.ContentDirectory: Service {
}
/* GetSystemUpdateID action implementation */
- private void get_system_update_id_cb (ContentDirectory content_dir,
+ private void get_system_update_id_cb (Service content_dir,
owned ServiceAction action) {
/* Set action return arguments */
action.set ("Id", typeof (uint32), this.system_update_id);
@@ -235,18 +237,18 @@ public class Rygel.ContentDirectory: Service {
}
/* Query GetSystemUpdateID */
- private void query_system_update_id (ContentDirectory content_dir,
- string variable,
- ref GLib.Value value) {
+ private void query_system_update_id (Service content_dir,
+ string variable,
+ ref GLib.Value value) {
/* Set action return arguments */
value.init (typeof (uint32));
value.set_uint (this.system_update_id);
}
/* Query ContainerUpdateIDs */
- private void query_container_update_ids (ContentDirectory content_dir,
- string variable,
- ref GLib.Value value) {
+ private void query_container_update_ids (Service content_dir,
+ string variable,
+ ref GLib.Value value) {
var update_ids = this.create_container_update_ids ();
/* Set action return arguments */
@@ -255,7 +257,7 @@ public class Rygel.ContentDirectory: Service {
}
/* action GetSearchCapabilities implementation */
- private void get_search_capabilities_cb (ContentDirectory content_dir,
+ private void get_search_capabilities_cb (Service content_dir,
owned ServiceAction action) {
/* Set action return arguments */
action.set ("SearchCaps", typeof (string), SEARCH_CAPS);
@@ -264,16 +266,16 @@ public class Rygel.ContentDirectory: Service {
}
/* Query SearchCapabilities */
- private void query_search_capabilities (ContentDirectory content_dir,
- string variable,
- ref GLib.Value value) {
+ private void query_search_capabilities (Service content_dir,
+ string variable,
+ ref GLib.Value value) {
/* Set action return arguments */
value.init (typeof (string));
value.set_string (SEARCH_CAPS);
}
/* action GetSortCapabilities implementation */
- private void get_sort_capabilities_cb (ContentDirectory content_dir,
+ private void get_sort_capabilities_cb (Service content_dir,
owned ServiceAction action) {
/* Set action return arguments */
action.set ("SortCaps", typeof (string), this.sort_caps);
@@ -282,16 +284,16 @@ public class Rygel.ContentDirectory: Service {
}
/* Query SortCapabilities */
- private void query_sort_capabilities (ContentDirectory content_dir,
- string variable,
- ref GLib.Value value) {
+ private void query_sort_capabilities (Service content_dir,
+ string variable,
+ ref GLib.Value value) {
/* Set action return arguments */
value.init (typeof (string));
value.set_string (this.sort_caps);
}
/* action GetFeatureList implementation */
- private void get_feature_list_cb (ContentDirectory content_dir,
+ private void get_feature_list_cb (Service content_dir,
owned ServiceAction action) {
/* Set action return arguments */
action.set ("FeatureList", typeof (string), this.feature_list);
@@ -300,9 +302,9 @@ public class Rygel.ContentDirectory: Service {
}
/* Query FeatureList */
- private void query_feature_list (ContentDirectory content_dir,
- string variable,
- ref GLib.Value value) {
+ private void query_feature_list (Service content_dir,
+ string variable,
+ ref GLib.Value value) {
/* Set action return arguments */
value.init (typeof (string));
value.set_string (this.feature_list);
@@ -379,7 +381,9 @@ public class Rygel.ContentDirectory: Service {
return ids;
}
- private void on_import_completed (ImportResource import) {
+ private void on_import_completed (StateMachine machine) {
+ var import = machine as ImportResource;
+
this.notify ("TransferIDs",
typeof (string),
this.create_transfer_ids ());
diff --git a/src/rygel/rygel-http-response.vala b/src/rygel/rygel-http-response.vala
index e57fca1..6fbb6b9 100644
--- a/src/rygel/rygel-http-response.vala
+++ b/src/rygel/rygel-http-response.vala
@@ -48,7 +48,7 @@ internal abstract class Rygel.HTTPResponse : GLib.Object, Rygel.StateMachine {
this.msg.response_body.set_accumulate (false);
if (this.cancellable != null) {
- this.cancellable.cancelled += this.on_cancelled;
+ this.cancellable.cancelled.connect (this.on_cancelled);
}
}
diff --git a/src/rygel/rygel-http-server.vala b/src/rygel/rygel-http-server.vala
index 1b8941f..363bc3b 100644
--- a/src/rygel/rygel-http-server.vala
+++ b/src/rygel/rygel-http-server.vala
@@ -54,7 +54,7 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
context.server.request_started.connect (this.on_request_started);
if (this.cancellable != null) {
- this.cancellable.cancelled += this.on_cancelled;
+ this.cancellable.cancelled.connect (this.on_cancelled);
}
}
@@ -172,7 +172,9 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
return protocol_info;
}
- private void on_request_completed (HTTPRequest request) {
+ private void on_request_completed (StateMachine machine) {
+ var request = machine as HTTPRequest;
+
this.requests.remove (request);
debug (_("HTTP %s request for URI '%s' handled."),
@@ -227,7 +229,7 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
}
private void queue_request (HTTPRequest request) {
- request.completed += this.on_request_completed;
+ request.completed.connect (this.on_request_completed);
this.requests.add (request);
request.run.begin ();
}
diff --git a/src/rygel/rygel-l16-transcoder-bin.vala b/src/rygel/rygel-l16-transcoder-bin.vala
index 327222d..2d54a68 100644
--- a/src/rygel/rygel-l16-transcoder-bin.vala
+++ b/src/rygel/rygel-l16-transcoder-bin.vala
@@ -51,7 +51,7 @@ internal class Rygel.L16TranscoderBin : Gst.Bin {
var ghost = new GhostPad (null, src_pad);
this.add_pad (ghost);
- decodebin.pad_added += this.decodebin_pad_added;
+ decodebin.pad_added.connect (this.decodebin_pad_added);
}
private void decodebin_pad_added (Element decodebin, Pad new_pad) {
diff --git a/src/rygel/rygel-live-response.vala b/src/rygel/rygel-live-response.vala
index 316feb0..4c0181d 100644
--- a/src/rygel/rygel-live-response.vala
+++ b/src/rygel/rygel-live-response.vala
@@ -106,7 +106,7 @@ internal class Rygel.LiveResponse : Rygel.HTTPResponse {
if (src.numpads == 0) {
// Seems source uses dynamic pads, link when pad available
- src.pad_added += this.src_pad_added;
+ src.pad_added.connect (this.src_pad_added);
} else {
// static pads? easy!
if (!src.link (sink)) {
diff --git a/src/rygel/rygel-main.vala b/src/rygel/rygel-main.vala
index 140f61c..1f397a7 100644
--- a/src/rygel/rygel-main.vala
+++ b/src/rygel/rygel-main.vala
@@ -54,7 +54,7 @@ public class Rygel.Main : Object {
this.exit_code = 0;
- this.plugin_loader.plugin_available += this.on_plugin_loaded;
+ this.plugin_loader.plugin_available.connect (this.on_plugin_loaded);
Utils.on_application_exit (this.application_exit_cb);
}
@@ -184,7 +184,7 @@ public class Rygel.Main : Object {
this.root_devices.add (device);
- plugin.notify["available"] += this.on_plugin_notify;
+ plugin.notify["available"].connect (this.on_plugin_notify);
} catch (GLib.Error error) {
warning (_("Failed to create RootDevice for %s. Reason: %s"),
plugin.name,
@@ -192,8 +192,10 @@ public class Rygel.Main : Object {
}
}
- private void on_plugin_notify (Plugin plugin,
+ private void on_plugin_notify (Object obj,
ParamSpec spec) {
+ var plugin = obj as Plugin;
+
foreach (var device in this.root_devices) {
if (device.resource_factory == plugin) {
device.available = plugin.available;
diff --git a/src/rygel/rygel-media-container.vala b/src/rygel/rygel-media-container.vala
index 56e5a7e..2a69726 100644
--- a/src/rygel/rygel-media-container.vala
+++ b/src/rygel/rygel-media-container.vala
@@ -51,7 +51,7 @@ public abstract class Rygel.MediaContainer : MediaObject {
this.update_id = 0;
this.upnp_class = "object.container.storageFolder";
- this.container_updated += on_container_updated;
+ this.container_updated.connect (on_container_updated);
}
public MediaContainer.root (string title,
diff --git a/src/rygel/rygel-media-receiver-registrar.vala b/src/rygel/rygel-media-receiver-registrar.vala
index 3772c21..3c7dbe2 100644
--- a/src/rygel/rygel-media-receiver-registrar.vala
+++ b/src/rygel/rygel-media-receiver-registrar.vala
@@ -34,21 +34,21 @@ public class Rygel.MediaReceiverRegistrar: Service {
"xml/X_MS_MediaReceiverRegistrar1.xml";
public override void constructed () {
- this.action_invoked["IsAuthorized"] += this.is_authorized_cb;
- this.action_invoked["IsValidated"] += this.is_authorized_cb;
- this.action_invoked["RegisterDevice"] += this.register_device_cb;
+ this.action_invoked["IsAuthorized"].connect (this.is_authorized_cb);
+ this.action_invoked["IsValidated"].connect (this.is_authorized_cb);
+ this.action_invoked["RegisterDevice"].connect (this.register_device_cb);
}
/* IsAuthorized and IsValided action implementations (fake) */
- private void is_authorized_cb (MediaReceiverRegistrar registrar,
- owned ServiceAction action) {
+ private void is_authorized_cb (Service registrar,
+ owned ServiceAction action) {
action.set ("Result", typeof (int), 1);
action.return ();
}
- private void register_device_cb (MediaReceiverRegistrar registrar,
- owned ServiceAction action) {
+ private void register_device_cb (Service registrar,
+ owned ServiceAction action) {
action.set ("RegistrationRespMsg",
typeof (string),
"WhatisSupposedToBeHere");
diff --git a/src/rygel/rygel-mp2ts-transcoder-bin.vala b/src/rygel/rygel-mp2ts-transcoder-bin.vala
index 963e8a5..f6548e4 100644
--- a/src/rygel/rygel-mp2ts-transcoder-bin.vala
+++ b/src/rygel/rygel-mp2ts-transcoder-bin.vala
@@ -62,7 +62,7 @@ internal class Rygel.MP2TSTranscoderBin : Gst.Bin {
var ghost = new GhostPad (null, src_pad);
this.add_pad (ghost);
- decodebin.pad_added += this.decodebin_pad_added;
+ decodebin.pad_added.connect (this.decodebin_pad_added);
Signal.connect_object (decodebin,
"autoplug-continue",
(Callback) this.autoplug_continue,
diff --git a/src/rygel/rygel-mp3-transcoder-bin.vala b/src/rygel/rygel-mp3-transcoder-bin.vala
index 6420e5a..f3d5401 100644
--- a/src/rygel/rygel-mp3-transcoder-bin.vala
+++ b/src/rygel/rygel-mp3-transcoder-bin.vala
@@ -56,7 +56,7 @@ internal class Rygel.MP3TranscoderBin : Gst.Bin {
var ghost = new GhostPad (null, src_pad);
this.add_pad (ghost);
- decodebin.pad_added += this.decodebin_pad_added;
+ decodebin.pad_added.connect (this.decodebin_pad_added);
}
private void decodebin_pad_added (Element decodebin, Pad new_pad) {
diff --git a/src/rygel/rygel-wma-transcoder-bin.vala b/src/rygel/rygel-wma-transcoder-bin.vala
index e2ad192..467eb22 100644
--- a/src/rygel/rygel-wma-transcoder-bin.vala
+++ b/src/rygel/rygel-wma-transcoder-bin.vala
@@ -45,7 +45,7 @@ internal class Rygel.WMATranscoderBin : Gst.Bin {
var ghost = new GhostPad (null, src_pad);
this.add_pad (ghost);
- decodebin.pad_added += this.decodebin_pad_added;
+ decodebin.pad_added.connect (this.decodebin_pad_added);
}
private void decodebin_pad_added (Element decodebin, Pad new_pad) {
diff --git a/src/rygel/rygel-wmv-transcoder-bin.vala b/src/rygel/rygel-wmv-transcoder-bin.vala
index 5ea083f..75cab01 100644
--- a/src/rygel/rygel-wmv-transcoder-bin.vala
+++ b/src/rygel/rygel-wmv-transcoder-bin.vala
@@ -60,7 +60,7 @@ internal class Rygel.WMVTranscoderBin : Gst.Bin {
var ghost = new GhostPad (null, src_pad);
this.add_pad (ghost);
- decodebin.pad_added += this.decodebin_pad_added;
+ decodebin.pad_added.connect (this.decodebin_pad_added);
Signal.connect_object (decodebin,
"autoplug-continue",
(Callback) this.autoplug_continue,
diff --git a/src/ui/rygel-general-pref-section.vala b/src/ui/rygel-general-pref-section.vala
index 03343ab..0c7742e 100644
--- a/src/ui/rygel-general-pref-section.vala
+++ b/src/ui/rygel-general-pref-section.vala
@@ -93,7 +93,7 @@ public class Rygel.GeneralPrefSection : PreferencesSection {
this.lpcm_check.active = this.config.get_lpcm_transcoder ();
} catch (GLib.Error err) {}
- this.trans_check.toggled += this.on_trans_check_toggled;
+ this.trans_check.toggled.connect (this.on_trans_check_toggled);
this.context_manager.context_available.connect (
this.on_context_available);
@@ -115,7 +115,7 @@ public class Rygel.GeneralPrefSection : PreferencesSection {
this.config.set_lpcm_transcoder (this.lpcm_check.active);
}
- private void on_trans_check_toggled (CheckButton trans_check) {
+ private void on_trans_check_toggled (ToggleButton trans_check) {
this.mp3_check.sensitive =
this.mp2ts_check.sensitive =
this.lpcm_check.sensitive = trans_check.active;
diff --git a/src/ui/rygel-media-export-pref-section.vala b/src/ui/rygel-media-export-pref-section.vala
index eac5f96..2358f4c 100644
--- a/src/ui/rygel-media-export-pref-section.vala
+++ b/src/ui/rygel-media-export-pref-section.vala
@@ -71,15 +71,15 @@ public class Rygel.MediaExportPrefSection : Rygel.PluginPrefSection {
this.dialog.show_hidden = false;
var button = (Button) builder.get_object (ADD_BUTTON);
- button.clicked += this.on_add_button_clicked;
+ button.clicked.connect (this.on_add_button_clicked);
this.widgets.add (button);
button = (Button) builder.get_object (REMOVE_BUTTON);
- button.clicked += this.on_remove_button_clicked;
+ button.clicked.connect (this.on_remove_button_clicked);
this.widgets.add (button);
button = (Button) builder.get_object (CLEAR_BUTTON);
- button.clicked += this.on_clear_button_clicked;
+ button.clicked.connect (this.on_clear_button_clicked);
this.widgets.add (button);
var label = (Label) builder.get_object (URIS_LABEL);
diff --git a/src/ui/rygel-plugin-pref-section.vala b/src/ui/rygel-plugin-pref-section.vala
index c4f48be..328da97 100644
--- a/src/ui/rygel-plugin-pref-section.vala
+++ b/src/ui/rygel-plugin-pref-section.vala
@@ -69,7 +69,7 @@ public class Rygel.PluginPrefSection : PreferencesSection {
title = title.replace ("@HOSTNAME@", "%h");
this.title_entry.set_text (title);
- this.enabled_check.toggled += this.on_enabled_check_toggled;
+ this.enabled_check.toggled.connect (this.on_enabled_check_toggled);
}
public override void save () {
@@ -91,7 +91,7 @@ public class Rygel.PluginPrefSection : PreferencesSection {
}
}
- private void on_enabled_check_toggled (CheckButton enabled_check) {
+ private void on_enabled_check_toggled (ToggleButton enabled_check) {
this.reset_widgets_sensitivity ();
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
