diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2012-04-27 17:18:39 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2012-10-02 13:35:17 -0400 |
| commit | e08986bf2e923896800681011a705c005ffbca75 (patch) | |
| tree | 0bba2117e313f3ec8b4cc9503c673f6009f9a8ce /farstream | |
| parent | 3901964fa0696305a548191cf568eca05a4aec15 (diff) | |
| download | farstream-e08986bf2e923896800681011a705c005ffbca75.tar.gz | |
elementaddednotifier: Add signal id when setting default properties too
Diffstat (limited to 'farstream')
| -rw-r--r-- | farstream/fs-element-added-notifier.c | 10 | ||||
| -rw-r--r-- | farstream/fs-element-added-notifier.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/farstream/fs-element-added-notifier.c b/farstream/fs-element-added-notifier.c index 0cf84c72..13ddf25d 100644 --- a/farstream/fs-element-added-notifier.c +++ b/farstream/fs-element-added-notifier.c @@ -481,8 +481,11 @@ _element_added_callback (GstBin *parent, GstElement *element, * fs_element_added_notifier_set_properties_from_keyfile() . * * This is binding friendly (since GKeyFile doesn't have a boxed type). + * + * Returns: The id of the signal connection, this can be used to disconnect + * this property setter using g_signal_handler_disconnect(). */ -void +gulong fs_element_added_notifier_set_default_properties ( FsElementAddedNotifier *notifier, GstElement *element) @@ -490,7 +493,8 @@ fs_element_added_notifier_set_default_properties ( GKeyFile *keyfile = fs_utils_get_default_element_properties (element); if (!keyfile) - return; + return 0; - fs_element_added_notifier_set_properties_from_keyfile(notifier, keyfile); + return fs_element_added_notifier_set_properties_from_keyfile (notifier, + keyfile); } diff --git a/farstream/fs-element-added-notifier.h b/farstream/fs-element-added-notifier.h index a8ef3155..89dc7ac1 100644 --- a/farstream/fs-element-added-notifier.h +++ b/farstream/fs-element-added-notifier.h @@ -96,7 +96,7 @@ gboolean fs_element_added_notifier_set_properties_from_file ( const gchar *filename, GError **error); -void fs_element_added_notifier_set_default_properties ( +gulong fs_element_added_notifier_set_default_properties ( FsElementAddedNotifier *notifier, GstElement *element); |