Import upstream version 0.4.2

1 files changed, 13 insertions, 13 deletions

diff --git a/src/scrub-menu-item.c b/src/scrub-menu-item.c
index c4aa807..18a8129 100644
--- a/src/scrub-menu-item.c
+++ b/src/scrub-menu-item.c
@@ -1,4 +1,4 @@
-/* scrub-menu-item.c generated by valac 0.9.7, the Vala compiler
+/* scrub-menu-item.c generated by valac 0.9.8, the Vala compiler
  * generated from scrub-menu-item.vala, do not modify */
 
 /*
@@ -68,15 +68,15 @@ typedef struct _PlayerControllerClass PlayerControllerClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
-#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))
+#define TYPE_MPRIS2_CONTROLLER (mpris2_controller_get_type ())
+#define MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2Controller))
+#define MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
+#define IS_MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS2_CONTROLLER))
+#define IS_MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS2_CONTROLLER))
+#define MPRIS2_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
 
-typedef struct _MprisBridge MprisBridge;
-typedef struct _MprisBridgeClass MprisBridgeClass;
+typedef struct _Mpris2Controller Mpris2Controller;
+typedef struct _Mpris2ControllerClass Mpris2ControllerClass;
 
 struct _PlayerItem {
 	DbusmenuMenuitem parent_instance;
@@ -101,7 +101,7 @@ struct _PlayerController {
 	PlayerControllerPrivate * priv;
 	gint current_state;
 	GeeArrayList* custom_items;
-	MprisBridge* mpris_bridge;
+	Mpris2Controller* mpris_bridge;
 };
 
 struct _PlayerControllerClass {
@@ -124,8 +124,8 @@ GeeHashSet* scrub_menuitem_attributes_format (void);
 static void scrub_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 PlayerController* player_item_get_owner (PlayerItem* self);
 const char* player_controller_get_name (PlayerController* self);
-GType mpris_bridge_get_type (void) G_GNUC_CONST;
-void mpris_bridge_set_track_position (MprisBridge* self, double pos);
+GType mpris2_controller_get_type (void) G_GNUC_CONST;
+void mpris2_controller_set_track_position (Mpris2Controller* self, double position);
 void scrub_menuitem_update_position (ScrubMenuitem* self, gint32 new_position);
 void scrub_menuitem_update_playstate (ScrubMenuitem* self, gint state);
 
@@ -152,7 +152,7 @@ static void scrub_menuitem_real_handle_event (DbusmenuMenuitem* base, const char
 	self = (ScrubMenuitem*) base;
 	g_return_if_fail (name != NULL);
 	g_debug ("scrub-menu-item.vala:34: handle_event for owner %s with value: %f", player_controller_get_name (player_item_get_owner ((PlayerItem*) self)), g_value_get_double (input_value));
-	mpris_bridge_set_track_position (player_item_get_owner ((PlayerItem*) self)->mpris_bridge, g_value_get_double (input_value));
+	mpris2_controller_set_track_position (player_item_get_owner ((PlayerItem*) self)->mpris_bridge, g_value_get_double (input_value));
 }