Import upstream version 0.4.0

1 files changed, 13 insertions, 13 deletions

diff --git a/src/transport-menu-item.c b/src/transport-menu-item.c
index 50d166b..7c6b46b 100644
--- a/src/transport-menu-item.c
+++ b/src/transport-menu-item.c
@@ -1,4 +1,4 @@
-/* transport-menu-item.c generated by valac, the Vala compiler
+/* transport-menu-item.c generated by valac 0.9.5, the Vala compiler
  * generated from transport-menu-item.vala, do not modify */
 
 /*
@@ -68,15 +68,15 @@ typedef struct _PlayerControllerClass PlayerControllerClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
-#define TYPE_MPRIS_CONTROLLER (mpris_controller_get_type ())
-#define MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER, MprisController))
-#define MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
-#define IS_MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER))
-#define IS_MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER))
-#define MPRIS_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
+#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
+#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
+#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
+#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
+#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
 
-typedef struct _MprisController MprisController;
-typedef struct _MprisControllerClass MprisControllerClass;
+typedef struct _MprisBridge MprisBridge;
+typedef struct _MprisBridgeClass MprisBridgeClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 struct _PlayerItem {
@@ -108,7 +108,7 @@ struct _PlayerController {
 	PlayerControllerPrivate * priv;
 	gint current_state;
 	GeeArrayList* custom_items;
-	MprisController* mpris_adaptor;
+	MprisBridge* mpris_bridge;
 };
 
 struct _PlayerControllerClass {
@@ -130,8 +130,8 @@ TransportMenuitem* transport_menuitem_construct (GType object_type, PlayerContro
 void transport_menuitem_change_play_state (TransportMenuitem* self, gint state);
 PlayerController* player_item_get_owner (PlayerItem* self);
 const char* player_controller_get_name (PlayerController* self);
-GType mpris_controller_get_type (void) G_GNUC_CONST;
-void mpris_controller_transport_event (MprisController* self, TransportMenuitemaction command);
+GType mpris_bridge_get_type (void) G_GNUC_CONST;
+void mpris_bridge_transport_update (MprisBridge* self, TransportMenuitemaction update);
 static void transport_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 GeeHashSet* transport_menuitem_attributes_format (void);
 
@@ -179,7 +179,7 @@ static void transport_menuitem_real_handle_event (DbusmenuMenuitem* base, const
 	g_debug ("transport-menu-item.vala:46: handle_event with value %s", _tmp0_ = g_strdup_printf ("%i", input));
 	_g_free0 (_tmp0_);
 	g_debug ("transport-menu-item.vala:47: transport owner name = %s", player_controller_get_name (player_item_get_owner ((PlayerItem*) self)));
-	mpris_controller_transport_event (player_item_get_owner ((PlayerItem*) self)->mpris_adaptor, (TransportMenuitemaction) input);
+	mpris_bridge_transport_update (player_item_get_owner ((PlayerItem*) self)->mpris_bridge, (TransportMenuitemaction) input);
 }