aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-01-09 15:30:29 +0000
committerConor Curran <conor.curran@canonical.com>2011-01-09 15:30:29 +0000
commit33e8e6c2ac125ba3806032ea3ef730bd5c782ac8 (patch)
tree8824cfe53ae0fea3a90f6489e3eed8610e74da86
parent07197b0c4a8153ad65daecf920d0e0d51b1bebbc (diff)
downloadayatana-indicator-sound-33e8e6c2ac125ba3806032ea3ef730bd5c782ac8.tar.gz
ayatana-indicator-sound-33e8e6c2ac125ba3806032ea3ef730bd5c782ac8.tar.bz2
ayatana-indicator-sound-33e8e6c2ac125ba3806032ea3ef730bd5c782ac8.zip
more refactoring
-rw-r--r--src/freedesktop-interfaces.vala6
-rw-r--r--src/mpris2-controller.vala9
-rw-r--r--src/sound-service.c4
3 files changed, 9 insertions, 10 deletions
diff --git a/src/freedesktop-interfaces.vala b/src/freedesktop-interfaces.vala
index 3e5d832..4d75044 100644
--- a/src/freedesktop-interfaces.vala
+++ b/src/freedesktop-interfaces.vala
@@ -30,6 +30,12 @@ public interface FreeDesktopIntrospectable: Object {
public abstract string Introspect() throws IOError;
}
+[DBus (name = "org.freedesktop.DBus.Properties")]
+public interface FreeDesktopProperties : Object{
+ public signal void PropertiesChanged (string source, HashTable<string, Variant?> changed_properties,
+ string[] invalid );
+}
+
public errordomain XmlError {
FILE_NOT_FOUND,
XML_DOCUMENT_EMPTY
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala
index 66da069..fc61c12 100644
--- a/src/mpris2-controller.vala
+++ b/src/mpris2-controller.vala
@@ -18,12 +18,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using Dbusmenu;
-[DBus (name = "org.freedesktop.DBus.Properties")]
-public interface FreeDesktopProperties : Object{
- public signal void PropertiesChanged (string source, HashTable<string, Variant?> changed_properties,
- string[] invalid );
-}
-
/*
This class will entirely replace mpris-controller.vala hence why there is no
point in trying to get encorporate both into the same object model.
@@ -148,9 +142,8 @@ public class Mpris2Controller : GLib.Object
MetadataMenuitem.attributes_format());
if ( this.owner.use_playlists == true ){
- debug ("it thinks that there is a valid playlist interface");
this.fetch_playlists();
- this.fetch_active_playlist();
+ this.fetch_active_playlist();
}
}
diff --git a/src/sound-service.c b/src/sound-service.c
index defcb94..98f1881 100644
--- a/src/sound-service.c
+++ b/src/sound-service.c
@@ -40,8 +40,8 @@ service_shutdown (IndicatorService *service, gpointer user_data)
{
if (mainloop != NULL) {
g_debug("Service shutdown !");
- //close_pulse_activites();
- //g_main_loop_quit(mainloop);
+ close_pulse_activites();
+ g_main_loop_quit(mainloop);
}
return;
}