aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-09-08 19:48:18 +0100
committerConor Curran <conor.curran@canonical.com>2011-09-08 19:48:18 +0100
commit0d51c6ae44ccc759a384a63ebb6ffb05debca5df (patch)
treef780f4698b542178ada1b6709955b899f0daf0f6
parent2f796d959845faa751422a5d8517babcf445f242 (diff)
parent8f41c4e6e74805c63944f73d4acebef3f9efafe9 (diff)
downloadayatana-indicator-sound-0d51c6ae44ccc759a384a63ebb6ffb05debca5df.tar.gz
ayatana-indicator-sound-0d51c6ae44ccc759a384a63ebb6ffb05debca5df.tar.bz2
ayatana-indicator-sound-0d51c6ae44ccc759a384a63ebb6ffb05debca5df.zip
merge in the valac fixes
-rw-r--r--src/Makefile.am1
-rw-r--r--src/player-controller.vala2
-rw-r--r--src/specific-items-manager.vala2
3 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 2381429..29cc33c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,7 +66,6 @@ music_bridge_VALASOURCES = \
music_bridge_VALAFLAGS = \
--ccode \
- --disable-dbus-transformation \
-H music-player-bridge.h -d . \
--vapidir=$(top_srcdir)/vapi/ \
--vapidir=./ \
diff --git a/src/player-controller.vala b/src/player-controller.vala
index ced7d96..2f5569c 100644
--- a/src/player-controller.vala
+++ b/src/player-controller.vala
@@ -24,7 +24,7 @@ public class PlayerController : GLib.Object
{
public const int WIDGET_QUANTITY = 4;
- public static enum widget_order{
+ public enum widget_order{
SEPARATOR,
METADATA,
TRANSPORT,
diff --git a/src/specific-items-manager.vala b/src/specific-items-manager.vala
index d26199f..1bfe03e 100644
--- a/src/specific-items-manager.vala
+++ b/src/specific-items-manager.vala
@@ -22,7 +22,7 @@ using Gee;
public class SpecificItemsManager : GLib.Object
{
- public static enum category{
+ public enum category{
TRACK,
PLAYER
}