aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac4
-rw-r--r--data/com.canonical.indicators.sound.gschema.xml2
-rw-r--r--debian/changelog9
-rwxr-xr-xltmain.sh4
-rw-r--r--src/fetch-file.c2
-rw-r--r--src/freedesktop-interfaces.c12
-rw-r--r--src/indicator-sound.c15
-rw-r--r--src/metadata-menu-item.c2
-rw-r--r--src/mpris2-controller.c78
-rw-r--r--src/mpris2-controller.vala13
-rw-r--r--src/mpris2-interfaces.c12
-rw-r--r--src/mpris2-watcher.c4
-rw-r--r--src/music-player-bridge.c3
-rw-r--r--src/music-player-bridge.h2
-rw-r--r--src/player-controller.c6
-rw-r--r--src/player-controller.vala4
-rw-r--r--src/player-item.c2
-rw-r--r--src/playlists-menu-item.c2
-rw-r--r--src/settings-manager.c14
-rw-r--r--src/settings-manager.vala3
-rw-r--r--src/sound-service-dbus.c23
-rw-r--r--src/title-menu-item.c2
-rw-r--r--src/transport-menu-item.c2
24 files changed, 138 insertions, 102 deletions
diff --git a/configure b/configure
index f02f427..69e72a9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for indicator-sound 0.6.5.1.
+# Generated by GNU Autoconf 2.67 for indicator-sound 0.6.6.1.
#
# Report bugs to <conor.curran@canonical.com>.
#
@@ -761,8 +761,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-sound'
PACKAGE_TARNAME='indicator-sound'
-PACKAGE_VERSION='0.6.5.1'
-PACKAGE_STRING='indicator-sound 0.6.5.1'
+PACKAGE_VERSION='0.6.6.1'
+PACKAGE_STRING='indicator-sound 0.6.6.1'
PACKAGE_BUGREPORT='conor.curran@canonical.com'
PACKAGE_URL=''
@@ -1564,7 +1564,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures indicator-sound 0.6.5.1 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.6.6.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1634,7 +1634,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-sound 0.6.5.1:";;
+ short | recursive ) echo "Configuration of indicator-sound 0.6.6.1:";;
esac
cat <<\_ACEOF
@@ -1767,7 +1767,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-sound configure 0.6.5.1
+indicator-sound configure 0.6.6.1
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2136,7 +2136,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by indicator-sound $as_me 0.6.5.1, which was
+It was created by indicator-sound $as_me 0.6.6.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2956,7 +2956,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-sound
- VERSION=0.6.5.1
+ VERSION=0.6.6.1
cat >>confdefs.h <<_ACEOF
@@ -14349,7 +14349,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by indicator-sound $as_me 0.6.5.1, which was
+This file was extended by indicator-sound $as_me 0.6.6.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14415,7 +14415,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-indicator-sound config.status 0.6.5.1
+indicator-sound config.status 0.6.6.1
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ac460cb..b628136 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT(indicator-sound, 0.6.5.1, conor.curran@canonical.com)
+AC_INIT(indicator-sound, 0.6.6.1, conor.curran@canonical.com)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-sound, 0.6.5.1)
+AM_INIT_AUTOMAKE(indicator-sound, 0.6.6.1)
AM_MAINTAINER_MODE
diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicators.sound.gschema.xml
index 1e08269..dc63bcb 100644
--- a/data/com.canonical.indicators.sound.gschema.xml
+++ b/data/com.canonical.indicators.sound.gschema.xml
@@ -11,7 +11,7 @@
</key>
<key name="interested-media-players" type="as">
<summary>A list of applications which at some point have registered with the sound menu</summary>
- <default>[ 'banshee-1' ]</default>
+ <default>[ 'banshee' ]</default>
<description>
Each media player which abides by the MPRIS2 spec will automatically appear in the menu.
This array should contain the desktop file names (minus .desktop suffix) of applications which
diff --git a/debian/changelog b/debian/changelog
index e8c022a..2208384 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-sound (0.6.6.1-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Fix crash with SIGABRT (LP: #738051) (LP: #744304)
+ - ensure that if the service crashes the indicator will not show
+ multiple sliders
+
+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 04 Apr 2011 10:02:19 -0400
+
indicator-sound (0.6.5.1-0ubuntu1) natty; urgency=low
* New upstream release.
diff --git a/ltmain.sh b/ltmain.sh
index 6765090..fa4b1e1 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu2
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu2"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
TIMESTAMP=""
package_revision=1.3017
diff --git a/src/fetch-file.c b/src/fetch-file.c
index 7fb8e14..91af817 100644
--- a/src/fetch-file.c
+++ b/src/fetch-file.c
@@ -1,4 +1,4 @@
-/* fetch-file.c generated by valac 0.11.7, the Vala compiler
+/* fetch-file.c generated by valac 0.12.0, the Vala compiler
* generated from fetch-file.vala, do not modify */
/*
diff --git a/src/freedesktop-interfaces.c b/src/freedesktop-interfaces.c
index b7c8474..c8f4c39 100644
--- a/src/freedesktop-interfaces.c
+++ b/src/freedesktop-interfaces.c
@@ -1,4 +1,4 @@
-/* freedesktop-interfaces.c generated by valac 0.11.7, the Vala compiler
+/* freedesktop-interfaces.c generated by valac 0.12.0, the Vala compiler
* generated from freedesktop-interfaces.vala, do not modify */
/*
@@ -224,7 +224,7 @@ GType free_desktop_object_get_type (void) {
}
-G_DEFINE_TYPE_EXTENDED (FreeDesktopObjectProxy, free_desktop_object_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_FREE_DESKTOP_OBJECT, free_desktop_object_proxy_free_desktop_object_interface_init) );
+G_DEFINE_TYPE_EXTENDED (FreeDesktopObjectProxy, free_desktop_object_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_FREE_DESKTOP_OBJECT, free_desktop_object_proxy_free_desktop_object_interface_init) )
static void free_desktop_object_proxy_class_init (FreeDesktopObjectProxyClass* klass) {
G_DBUS_PROXY_CLASS (klass)->g_signal = free_desktop_object_proxy_g_signal;
}
@@ -257,7 +257,7 @@ static void _dbus_handle_free_desktop_object_name_owner_changed (FreeDesktopObje
static void free_desktop_object_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) {
if (strcmp (signal_name, "NameOwnerChanged") == 0) {
- _dbus_handle_free_desktop_object_name_owner_changed (proxy, parameters);
+ _dbus_handle_free_desktop_object_name_owner_changed ((FreeDesktopObject*) proxy, parameters);
}
}
@@ -485,7 +485,7 @@ GType free_desktop_introspectable_get_type (void) {
}
-G_DEFINE_TYPE_EXTENDED (FreeDesktopIntrospectableProxy, free_desktop_introspectable_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_FREE_DESKTOP_INTROSPECTABLE, free_desktop_introspectable_proxy_free_desktop_introspectable_interface_init) );
+G_DEFINE_TYPE_EXTENDED (FreeDesktopIntrospectableProxy, free_desktop_introspectable_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_FREE_DESKTOP_INTROSPECTABLE, free_desktop_introspectable_proxy_free_desktop_introspectable_interface_init) )
static void free_desktop_introspectable_proxy_class_init (FreeDesktopIntrospectableProxyClass* klass) {
G_DBUS_PROXY_CLASS (klass)->g_signal = free_desktop_introspectable_proxy_g_signal;
}
@@ -662,7 +662,7 @@ GType free_desktop_properties_get_type (void) {
}
-G_DEFINE_TYPE_EXTENDED (FreeDesktopPropertiesProxy, free_desktop_properties_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_FREE_DESKTOP_PROPERTIES, free_desktop_properties_proxy_free_desktop_properties_interface_init) );
+G_DEFINE_TYPE_EXTENDED (FreeDesktopPropertiesProxy, free_desktop_properties_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_FREE_DESKTOP_PROPERTIES, free_desktop_properties_proxy_free_desktop_properties_interface_init) )
static void free_desktop_properties_proxy_class_init (FreeDesktopPropertiesProxyClass* klass) {
G_DBUS_PROXY_CLASS (klass)->g_signal = free_desktop_properties_proxy_g_signal;
}
@@ -727,7 +727,7 @@ static void _dbus_handle_free_desktop_properties_properties_changed (FreeDesktop
static void free_desktop_properties_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) {
if (strcmp (signal_name, "PropertiesChanged") == 0) {
- _dbus_handle_free_desktop_properties_properties_changed (proxy, parameters);
+ _dbus_handle_free_desktop_properties_properties_changed ((FreeDesktopProperties*) proxy, parameters);
}
}
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 042bf89..5002463 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -137,6 +137,7 @@ indicator_sound_init (IndicatorSound *self)
IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(self);
priv->volume_widget = NULL;
+ priv->voip_widget = NULL;
priv->dbus_proxy = NULL;
GList* t_list = NULL;
priv->transport_widgets_list = t_list;
@@ -407,8 +408,14 @@ new_volume_slider_widget(DbusmenuMenuitem * newitem,
g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
io = g_object_get_data (G_OBJECT (client), "indicator");
- volume_widget = volume_widget_new (newitem, io);
IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
+
+ if (priv->volume_widget != NULL){
+ volume_widget_tidy_up (priv->volume_widget);
+ gtk_widget_destroy (priv->volume_widget);
+ priv->volume_widget = NULL;
+ }
+ volume_widget = volume_widget_new (newitem, io);
priv->volume_widget = volume_widget;
GtkWidget* ido_slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget));
@@ -452,6 +459,12 @@ new_voip_slider_widget (DbusmenuMenuitem * newitem,
io = g_object_get_data (G_OBJECT (client), "indicator");
IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
+ if (priv->voip_widget != NULL){
+ voip_input_widget_tidy_up (priv->voip_widget);
+ gtk_widget_destroy (priv->voip_widget);
+ priv->voip_widget = NULL;
+ }
+
voip_widget = voip_input_widget_new (newitem);
priv->voip_widget = voip_widget;
diff --git a/src/metadata-menu-item.c b/src/metadata-menu-item.c
index 981b951..17a4c5d 100644
--- a/src/metadata-menu-item.c
+++ b/src/metadata-menu-item.c
@@ -1,4 +1,4 @@
-/* metadata-menu-item.c generated by valac 0.11.7, the Vala compiler
+/* metadata-menu-item.c generated by valac 0.12.0, the Vala compiler
* generated from metadata-menu-item.vala, do not modify */
/*
diff --git a/src/mpris2-controller.c b/src/mpris2-controller.c
index 0576340..0b84e72 100644
--- a/src/mpris2-controller.c
+++ b/src/mpris2-controller.c
@@ -1,4 +1,4 @@
-/* mpris2-controller.c generated by valac 0.11.7, the Vala compiler
+/* mpris2-controller.c generated by valac 0.12.0, the Vala compiler
* generated from mpris2-controller.vala, do not modify */
/*
@@ -383,8 +383,8 @@ static void mpris2_controller_set_properties_interface (Mpris2Controller* self,
static void mpris2_controller_set_owner (Mpris2Controller* self, PlayerController* value);
static GObject * mpris2_controller_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
const gchar* player_controller_get_dbus_name (PlayerController* self);
-static void _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed (MprisPlaylists* _sender, PlaylistDetails* details, gpointer self);
static void _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed (FreeDesktopProperties* _sender, const gchar* source, GHashTable* changed_properties, gchar** invalid, int invalid_length1, gpointer self);
+static void _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed (MprisPlaylists* _sender, PlaylistDetails* details, gpointer self);
static void mpris2_controller_finalize (GObject* obj);
static void _vala_mpris2_controller_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
static void _vala_mpris2_controller_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
@@ -473,7 +473,7 @@ void mpris2_controller_property_changed_cb (Mpris2Controller* self, const gchar*
}
if (_tmp0_) {
g_warning ("mpris2-controller.vala:71: Property-changed hash is null or this is an" \
-" interface that doesn't concerns us");
+" interface that doesn't concern us");
return;
}
_tmp2_ = g_hash_table_lookup (changed_properties, "PlaybackStatus");
@@ -958,7 +958,7 @@ static gboolean mpris2_controller_fetch_playlists_co (Mpris2ControllerFetchPlayl
data->current_playlists = (_vala_PlaylistDetails_array_free (data->current_playlists, data->current_playlists_length1), NULL);
data->current_playlists = data->_tmp2_;
data->current_playlists_length1 = data->_tmp2__length1;
- data->_current_playlists_size_ = data->__tmp2__size_;
+ data->_current_playlists_size_ = data->_tmp2__length1;
goto __finally11;
__catch11_g_io_error:
{
@@ -989,7 +989,7 @@ static gboolean mpris2_controller_fetch_playlists_co (Mpris2ControllerFetchPlayl
playlists_menuitem_update (data->playlists_item, data->current_playlists, data->current_playlists_length1);
_g_object_unref0 (data->playlists_item);
} else {
- g_warning ("mpris2-controller.vala:239: Playlists are on but its returning no cur" \
+ g_warning ("mpris2-controller.vala:240: Playlists are on but its returning no cur" \
"rent_playlists");
data->_tmp5_ = FALSE;
data->_tmp6_ = __bool_dup0 (&data->_tmp5_);
@@ -1149,13 +1149,13 @@ static void mpris2_controller_set_owner (Mpris2Controller* self, PlayerControlle
}
-static void _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed (MprisPlaylists* _sender, PlaylistDetails* details, gpointer self) {
- mpris2_controller_on_playlistdetails_changed (self, details);
+static void _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed (FreeDesktopProperties* _sender, const gchar* source, GHashTable* changed_properties, gchar** invalid, int invalid_length1, gpointer self) {
+ mpris2_controller_property_changed_cb (self, source, changed_properties, invalid, invalid_length1);
}
-static void _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed (FreeDesktopProperties* _sender, const gchar* source, GHashTable* changed_properties, gchar** invalid, int invalid_length1, gpointer self) {
- mpris2_controller_property_changed_cb (self, source, changed_properties, invalid, invalid_length1);
+static void _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed (MprisPlaylists* _sender, PlaylistDetails* details, gpointer self) {
+ mpris2_controller_on_playlistdetails_changed (self, details);
}
@@ -1171,10 +1171,10 @@ static GObject * mpris2_controller_constructor (GType type, guint n_construct_pr
MprisPlayer* _tmp5_ = NULL;
MprisPlayer* _tmp6_;
MprisPlayer* _tmp7_;
- gboolean _tmp8_;
- FreeDesktopProperties* _tmp13_ = NULL;
- FreeDesktopProperties* _tmp14_;
- FreeDesktopProperties* _tmp15_;
+ FreeDesktopProperties* _tmp8_ = NULL;
+ FreeDesktopProperties* _tmp9_;
+ FreeDesktopProperties* _tmp10_;
+ gboolean _tmp11_;
GError * _inner_error_ = NULL;
parent_class = G_OBJECT_CLASS (mpris2_controller_parent_class);
obj = parent_class->constructor (type, n_construct_properties, construct_properties);
@@ -1205,15 +1205,28 @@ static GObject * mpris2_controller_constructor (GType type, guint n_construct_pr
_tmp7_ = _tmp6_;
mpris2_controller_set_player (self, _tmp7_);
_g_object_unref0 (_tmp7_);
- _tmp8_ = TRUE;
- if (_bool_equal (self->priv->_owner->use_playlists, &_tmp8_) == TRUE) {
- const gchar* _tmp9_ = NULL;
- MprisPlaylists* _tmp10_ = NULL;
- MprisPlaylists* _tmp11_;
- MprisPlaylists* _tmp12_;
- _tmp9_ = player_controller_get_dbus_name (self->priv->_owner);
- _tmp10_ = g_initable_new (TYPE_MPRIS_PLAYLISTS_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp9_, "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.mpris.MediaPlayer2.Playlists", NULL);
- _tmp11_ = (MprisPlaylists*) _tmp10_;
+ _tmp8_ = g_initable_new (TYPE_FREE_DESKTOP_PROPERTIES_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.Properties.PropertiesChanged", "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.freedesktop.DBus.Properties", NULL);
+ _tmp9_ = (FreeDesktopProperties*) _tmp8_;
+ if (_inner_error_ != NULL) {
+ if (_inner_error_->domain == G_IO_ERROR) {
+ goto __catch13_g_io_error;
+ }
+ 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_);
+ }
+ _tmp10_ = _tmp9_;
+ mpris2_controller_set_properties_interface (self, _tmp10_);
+ _g_object_unref0 (_tmp10_);
+ g_signal_connect_object (self->priv->_properties_interface, "properties-changed", (GCallback) _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed, self, 0);
+ _tmp11_ = TRUE;
+ if (_bool_equal (self->priv->_owner->use_playlists, &_tmp11_) == TRUE) {
+ const gchar* _tmp12_ = NULL;
+ MprisPlaylists* _tmp13_ = NULL;
+ MprisPlaylists* _tmp14_;
+ MprisPlaylists* _tmp15_;
+ _tmp12_ = player_controller_get_dbus_name (self->priv->_owner);
+ _tmp13_ = g_initable_new (TYPE_MPRIS_PLAYLISTS_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp12_, "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.mpris.MediaPlayer2.Playlists", NULL);
+ _tmp14_ = (MprisPlaylists*) _tmp13_;
if (_inner_error_ != NULL) {
if (_inner_error_->domain == G_IO_ERROR) {
goto __catch13_g_io_error;
@@ -1221,31 +1234,18 @@ static GObject * mpris2_controller_constructor (GType type, guint n_construct_pr
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_);
}
- _tmp12_ = _tmp11_;
- mpris2_controller_set_playlists (self, _tmp12_);
- _g_object_unref0 (_tmp12_);
+ _tmp15_ = _tmp14_;
+ mpris2_controller_set_playlists (self, _tmp15_);
+ _g_object_unref0 (_tmp15_);
g_signal_connect_object (self->priv->_playlists, "playlist-changed", (GCallback) _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed, self, 0);
}
- _tmp13_ = g_initable_new (TYPE_FREE_DESKTOP_PROPERTIES_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.Properties.PropertiesChanged", "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.freedesktop.DBus.Properties", NULL);
- _tmp14_ = (FreeDesktopProperties*) _tmp13_;
- if (_inner_error_ != NULL) {
- if (_inner_error_->domain == G_IO_ERROR) {
- goto __catch13_g_io_error;
- }
- 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_);
- }
- _tmp15_ = _tmp14_;
- mpris2_controller_set_properties_interface (self, _tmp15_);
- _g_object_unref0 (_tmp15_);
- g_signal_connect_object (self->priv->_properties_interface, "properties-changed", (GCallback) _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed, self, 0);
goto __finally13;
__catch13_g_io_error:
{
GError * e;
e = _inner_error_;
_inner_error_ = NULL;
- g_error ("mpris2-controller.vala:60: Problems connecting to the session bus - %s", e->message);
+ g_critical ("mpris2-controller.vala:60: Problems connecting to the session bus - %s", e->message);
_g_error_free0 (e);
}
__finally13:
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala
index 94c52c0..04ceb88 100644
--- a/src/mpris2-controller.vala
+++ b/src/mpris2-controller.vala
@@ -45,19 +45,19 @@ public class Mpris2Controller : GLib.Object
this.player = Bus.get_proxy_sync ( BusType.SESSION,
this.owner.dbus_name,
"/org/mpris/MediaPlayer2" );
+ this.properties_interface = Bus.get_proxy_sync ( BusType.SESSION,
+ "org.freedesktop.Properties.PropertiesChanged",
+ "/org/mpris/MediaPlayer2" );
+ this.properties_interface.PropertiesChanged.connect ( property_changed_cb );
if ( this.owner.use_playlists == true ){
this.playlists = Bus.get_proxy_sync ( BusType.SESSION,
this.owner.dbus_name,
"/org/mpris/MediaPlayer2" );
this.playlists.PlaylistChanged.connect (on_playlistdetails_changed);
}
- this.properties_interface = Bus.get_proxy_sync ( BusType.SESSION,
- "org.freedesktop.Properties.PropertiesChanged",
- "/org/mpris/MediaPlayer2" );
- this.properties_interface.PropertiesChanged.connect ( property_changed_cb );
}
catch (IOError e) {
- error("Problems connecting to the session bus - %s", e.message);
+ critical("Problems connecting to the session bus - %s", e.message);
}
}
@@ -68,7 +68,7 @@ public class Mpris2Controller : GLib.Object
//debug("properties-changed for interface %s and owner %s", interface_source, this.owner.dbus_name);
if ( changed_properties == null ||
interface_source.has_prefix ( MPRIS_PREFIX ) == false ){
- warning("Property-changed hash is null or this is an interface that doesn't concerns us");
+ warning("Property-changed hash is null or this is an interface that doesn't concern us");
return;
}
Variant? play_v = changed_properties.lookup("PlaybackStatus");
@@ -124,6 +124,7 @@ public class Mpris2Controller : GLib.Object
private GLib.HashTable<string, Variant?>? clean_metadata()
{
GLib.HashTable<string, Variant?> changed_updates = this.player.Metadata;
+
Variant? artist_v = this.player.Metadata.lookup("xesam:artist");
if(artist_v != null){
Variant? v_artists = this.player.Metadata.lookup("xesam:artist");
diff --git a/src/mpris2-interfaces.c b/src/mpris2-interfaces.c
index f12429f..d6e38ca 100644
--- a/src/mpris2-interfaces.c
+++ b/src/mpris2-interfaces.c
@@ -1,4 +1,4 @@
-/* mpris2-interfaces.c generated by valac 0.11.7, the Vala compiler
+/* mpris2-interfaces.c generated by valac 0.12.0, the Vala compiler
* generated from mpris2-interfaces.vala, do not modify */
/*
@@ -455,7 +455,7 @@ GType mpris_root_get_type (void) {
}
-G_DEFINE_TYPE_EXTENDED (MprisRootProxy, mpris_root_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_MPRIS_ROOT, mpris_root_proxy_mpris_root_interface_init) );
+G_DEFINE_TYPE_EXTENDED (MprisRootProxy, mpris_root_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_MPRIS_ROOT, mpris_root_proxy_mpris_root_interface_init) )
static void mpris_root_proxy_class_init (MprisRootProxyClass* klass) {
G_DBUS_PROXY_CLASS (klass)->g_signal = mpris_root_proxy_g_signal;
}
@@ -1111,7 +1111,7 @@ GType mpris_player_get_type (void) {
}
-G_DEFINE_TYPE_EXTENDED (MprisPlayerProxy, mpris_player_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_MPRIS_PLAYER, mpris_player_proxy_mpris_player_interface_init) );
+G_DEFINE_TYPE_EXTENDED (MprisPlayerProxy, mpris_player_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_MPRIS_PLAYER, mpris_player_proxy_mpris_player_interface_init) )
static void mpris_player_proxy_class_init (MprisPlayerProxyClass* klass) {
G_DBUS_PROXY_CLASS (klass)->g_signal = mpris_player_proxy_g_signal;
}
@@ -1131,7 +1131,7 @@ static void _dbus_handle_mpris_player_seeked (MprisPlayer* self, GVariant* param
static void mpris_player_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) {
if (strcmp (signal_name, "Seeked") == 0) {
- _dbus_handle_mpris_player_seeked (proxy, parameters);
+ _dbus_handle_mpris_player_seeked ((MprisPlayer*) proxy, parameters);
}
}
@@ -1885,7 +1885,7 @@ GType mpris_playlists_get_type (void) {
}
-G_DEFINE_TYPE_EXTENDED (MprisPlaylistsProxy, mpris_playlists_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_MPRIS_PLAYLISTS, mpris_playlists_proxy_mpris_playlists_interface_init) );
+G_DEFINE_TYPE_EXTENDED (MprisPlaylistsProxy, mpris_playlists_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_MPRIS_PLAYLISTS, mpris_playlists_proxy_mpris_playlists_interface_init) )
static void mpris_playlists_proxy_class_init (MprisPlaylistsProxyClass* klass) {
G_DBUS_PROXY_CLASS (klass)->g_signal = mpris_playlists_proxy_g_signal;
}
@@ -1921,7 +1921,7 @@ static void _dbus_handle_mpris_playlists_playlist_changed (MprisPlaylists* self,
static void mpris_playlists_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) {
if (strcmp (signal_name, "PlaylistChanged") == 0) {
- _dbus_handle_mpris_playlists_playlist_changed (proxy, parameters);
+ _dbus_handle_mpris_playlists_playlist_changed ((MprisPlaylists*) proxy, parameters);
}
}
diff --git a/src/mpris2-watcher.c b/src/mpris2-watcher.c
index f22c63c..d9cea7e 100644
--- a/src/mpris2-watcher.c
+++ b/src/mpris2-watcher.c
@@ -1,4 +1,4 @@
-/* mpris2-watcher.c generated by valac 0.11.7, the Vala compiler
+/* mpris2-watcher.c generated by valac 0.12.0, the Vala compiler
* generated from mpris2-watcher.vala, do not modify */
/*
@@ -273,7 +273,7 @@ static gboolean mpris2_watcher_check_for_active_clients_co (Mpris2WatcherCheckFo
data->interfaces = (_vala_array_free (data->interfaces, data->interfaces_length1, (GDestroyNotify) g_free), NULL);
data->interfaces = data->_tmp2_;
data->interfaces_length1 = data->_tmp2__length1;
- data->_interfaces_size_ = data->__tmp2__size_;
+ data->_interfaces_size_ = data->_tmp2__length1;
goto __finally7;
__catch7_g_io_error:
{
diff --git a/src/music-player-bridge.c b/src/music-player-bridge.c
index 7c652a1..48087b6 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.11.7, the Vala compiler
+/* music-player-bridge.c generated by valac 0.12.0, the Vala compiler
* generated from music-player-bridge.vala, do not modify */
/*
@@ -720,6 +720,7 @@ static gchar* music_player_bridge_determine_key (gchar* desktop_or_interface) {
result = _result_;
temp = (_vala_array_free (temp, temp_length1, (GDestroyNotify) g_free), NULL);
tokens = (_vala_array_free (tokens, tokens_length1, (GDestroyNotify) g_free), NULL);
+ _g_free0 (desktop_or_interface);
return result;
}
diff --git a/src/music-player-bridge.h b/src/music-player-bridge.h
index b155c6a..8e636ef 100644
--- a/src/music-player-bridge.h
+++ b/src/music-player-bridge.h
@@ -1,4 +1,4 @@
-/* music-player-bridge.h generated by valac 0.11.7, the Vala compiler, do not modify */
+/* music-player-bridge.h generated by valac 0.12.0, the Vala compiler, do not modify */
#ifndef __MUSIC_PLAYER_BRIDGE_H__
diff --git a/src/player-controller.c b/src/player-controller.c
index 6dfd909..1873a71 100644
--- a/src/player-controller.c
+++ b/src/player-controller.c
@@ -1,4 +1,4 @@
-/* player-controller.c generated by valac 0.11.7, the Vala compiler
+/* player-controller.c generated by valac 0.12.0, the Vala compiler
* generated from player-controller.vala, do not modify */
/*
@@ -533,7 +533,7 @@ void player_controller_update_layout (PlayerController* self) {
_tmp4_ = gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT);
_tmp5_ = (PlayerItem*) _tmp4_;
_tmp6_ = g_app_info_get_id (self->priv->_app_info);
- dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) _tmp5_, DBUSMENU_MENUITEM_PROP_VISIBLE, g_strcmp0 (_tmp6_, "banshee-1.desktop") == 0);
+ dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) _tmp5_, DBUSMENU_MENUITEM_PROP_VISIBLE, g_strcmp0 (_tmp6_, "banshee.desktop") == 0);
_g_object_unref0 (_tmp5_);
_g_object_unref0 (playlists_menuitem);
return;
@@ -550,7 +550,7 @@ void player_controller_update_layout (PlayerController* self) {
_g_object_unref0 (_tmp10_);
_g_object_unref0 (_tmp8_);
_tmp14_ = g_app_info_get_id (self->priv->_app_info);
- if (g_strcmp0 (_tmp14_, "banshee-1.desktop") == 0) {
+ if (g_strcmp0 (_tmp14_, "banshee.desktop") == 0) {
gpointer _tmp15_ = NULL;
PlayerItem* _tmp16_;
TransportMenuitem* transport;
diff --git a/src/player-controller.vala b/src/player-controller.vala
index 86dfe9b..20479d9 100644
--- a/src/player-controller.vala
+++ b/src/player-controller.vala
@@ -150,12 +150,12 @@ public class PlayerController : GLib.Object
playlists_menuitem.root_item.property_set_bool (MENUITEM_PROP_VISIBLE,
false );
this.custom_items[widget_order.TRANSPORT].property_set_bool (MENUITEM_PROP_VISIBLE,
- this.app_info.get_id() == "banshee-1.desktop");
+ this.app_info.get_id() == "banshee.desktop");
return;
}
this.custom_items[widget_order.METADATA].property_set_bool (MENUITEM_PROP_VISIBLE,
this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()));
- if (this.app_info.get_id() == "banshee-1.desktop"){
+ if (this.app_info.get_id() == "banshee.desktop"){
TransportMenuitem transport = this.custom_items[widget_order.TRANSPORT] as TransportMenuitem;
transport.handle_cached_action();
}
diff --git a/src/player-item.c b/src/player-item.c
index f5d88d8..d880347 100644
--- a/src/player-item.c
+++ b/src/player-item.c
@@ -1,4 +1,4 @@
-/* player-item.c generated by valac 0.11.7, the Vala compiler
+/* player-item.c generated by valac 0.12.0, the Vala compiler
* generated from player-item.vala, do not modify */
/*
diff --git a/src/playlists-menu-item.c b/src/playlists-menu-item.c
index ed78fc8..8ae00e1 100644
--- a/src/playlists-menu-item.c
+++ b/src/playlists-menu-item.c
@@ -1,4 +1,4 @@
-/* playlists-menu-item.c generated by valac 0.11.7, the Vala compiler
+/* playlists-menu-item.c generated by valac 0.12.0, the Vala compiler
* generated from playlists-menu-item.vala, do not modify */
/*
diff --git a/src/settings-manager.c b/src/settings-manager.c
index 8c67740..d433cb4 100644
--- a/src/settings-manager.c
+++ b/src/settings-manager.c
@@ -1,4 +1,4 @@
-/* settings-manager.c generated by valac 0.11.7, the Vala compiler
+/* settings-manager.c generated by valac 0.12.0, the Vala compiler
* generated from settings-manager.vala, do not modify */
/*
@@ -154,9 +154,15 @@ GeeArrayList* settings_manager_fetch_interested (SettingsManager* self) {
_tmp5_ = g_strdup (s_collection[s_it]);
s = _tmp5_;
{
- gboolean _tmp6_;
- _tmp6_ = gee_abstract_collection_contains ((GeeAbstractCollection*) list, s);
- if (_tmp6_) {
+ gboolean _tmp7_;
+ if (g_strcmp0 (s, "banshee-1") == 0) {
+ gchar* _tmp6_;
+ _tmp6_ = g_strdup ("banshee");
+ _g_free0 (s);
+ s = _tmp6_;
+ }
+ _tmp7_ = gee_abstract_collection_contains ((GeeAbstractCollection*) list, s);
+ if (_tmp7_) {
_g_free0 (s);
continue;
}
diff --git a/src/settings-manager.vala b/src/settings-manager.vala
index 7acc3b1..1b99cbc 100644
--- a/src/settings-manager.vala
+++ b/src/settings-manager.vala
@@ -41,6 +41,9 @@ public class SettingsManager : GLib.Object
var interested = this.settings.get_strv ("interested-media-players");
var list = new ArrayList<string>();
foreach(var s in interested){
+ if (s == "banshee-1"){
+ s = "banshee";
+ }
if (s in list) continue;
if (s in blacklisted) continue;
list.add(s);
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 1b9d29e..a22e648 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -164,13 +164,10 @@ sound_service_dbus_build_sound_menu ( SoundServiceDbus* self,
{
SoundServiceDbusPrivate * priv = SOUND_SERVICE_DBUS_GET_PRIVATE(self);
- // Mute button
- // TODO this additions should be fixed position, i.e. add via position and not just append
- // be explicit as it is fixed.
- dbusmenu_menuitem_child_append (priv->root_menuitem, mute_item);
- dbusmenu_menuitem_child_append (priv->root_menuitem, slider_item);
- g_debug ("just about to add the slider %i", DBUSMENU_IS_MENUITEM(slider_item));
- dbusmenu_menuitem_child_append (priv->root_menuitem, voip_input_menu_item);
+ // Mute, Volume and Voip widgets
+ dbusmenu_menuitem_child_add_position (priv->root_menuitem, mute_item, 0);
+ dbusmenu_menuitem_child_add_position (priv->root_menuitem, slider_item, 1);
+ dbusmenu_menuitem_child_add_position (priv->root_menuitem, voip_input_menu_item, 2);
// Separator
DbusmenuMenuitem* separator = dbusmenu_menuitem_new();
@@ -178,7 +175,7 @@ sound_service_dbus_build_sound_menu ( SoundServiceDbus* self,
dbusmenu_menuitem_property_set (separator,
DBUSMENU_MENUITEM_PROP_TYPE,
DBUSMENU_CLIENT_TYPES_SEPARATOR);
- dbusmenu_menuitem_child_append(priv->root_menuitem, separator);
+ dbusmenu_menuitem_child_add_position (priv->root_menuitem, separator, 3);
g_object_unref (separator);
// Sound preferences dialog
@@ -237,6 +234,13 @@ sound_service_dbus_update_sound_state (SoundServiceDbus* self,
GError * error = NULL;
+ if (priv->connection == NULL ||
+ g_dbus_connection_is_closed (priv->connection) == TRUE){
+ g_critical ("sound_service_dbus_update_sound_state - connection is %s !!",
+ priv->connection == NULL? "NULL" : "closed");
+ return;
+ }
+
g_debug ("emitting state signal with value %i", (int)new_state);
g_dbus_connection_emit_signal( priv->connection,
NULL,
@@ -246,9 +250,8 @@ sound_service_dbus_update_sound_state (SoundServiceDbus* self,
v_output,
&error );
if (error != NULL) {
- g_error("Unable to emit signal 'sinkinputwhilemuted' because : %s", error->message);
+ g_critical ("Unable to emit signal because : %s", error->message);
g_error_free(error);
- return;
}
}
diff --git a/src/title-menu-item.c b/src/title-menu-item.c
index 168bfd9..7888200 100644
--- a/src/title-menu-item.c
+++ b/src/title-menu-item.c
@@ -1,4 +1,4 @@
-/* title-menu-item.c generated by valac 0.11.7, the Vala compiler
+/* title-menu-item.c generated by valac 0.12.0, the Vala compiler
* generated from title-menu-item.vala, do not modify */
/*
diff --git a/src/transport-menu-item.c b/src/transport-menu-item.c
index 7f24dc6..1a647a5 100644
--- a/src/transport-menu-item.c
+++ b/src/transport-menu-item.c
@@ -1,4 +1,4 @@
-/* transport-menu-item.c generated by valac 0.11.7, the Vala compiler
+/* transport-menu-item.c generated by valac 0.12.0, the Vala compiler
* generated from transport-menu-item.vala, do not modify */
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 18:28:35 +0000