From 80e5ad4f83a8b1218133761de11d433a7854041e Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 26 Aug 2010 11:32:53 +0200 Subject: Import upstream version 0.4.1 --- src/music-player-bridge.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/music-player-bridge.c') diff --git a/src/music-player-bridge.c b/src/music-player-bridge.c index 3e83e7c..1e908a9 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.9.5, the Vala compiler +/* music-player-bridge.c generated by valac 0.9.7, the Vala compiler * generated from music-player-bridge.vala, do not modify */ /* @@ -107,6 +107,8 @@ GType familiar_players_db_get_type (void) G_GNUC_CONST; enum { MUSIC_PLAYER_BRIDGE_DUMMY_PROPERTY }; +MusicPlayerBridge* music_player_bridge_new (void); +MusicPlayerBridge* music_player_bridge_construct (GType object_type); FamiliarPlayersDB* familiar_players_db_new (void); FamiliarPlayersDB* familiar_players_db_construct (GType object_type); void music_player_bridge_on_indicator_added (MusicPlayerBridge* self, IndicateListenerServer* object, IndicateListenerIndicator* p0); @@ -121,15 +123,13 @@ void music_player_bridge_on_server_removed (MusicPlayerBridge* self, IndicateLis static void _music_player_bridge_on_server_removed_indicate_listener_server_removed (IndicateListener* _sender, IndicateListenerServer* object, const char* p0, gpointer self); void music_player_bridge_on_server_count_changed (MusicPlayerBridge* self, IndicateListenerServer* object, guint i); static void _music_player_bridge_on_server_count_changed_indicate_listener_server_count_changed (IndicateListener* _sender, IndicateListenerServer* object, guint p0, gpointer self); -MusicPlayerBridge* music_player_bridge_new (void); -MusicPlayerBridge* music_player_bridge_construct (GType object_type); +static void music_player_bridge_try_to_add_inactive_familiar_clients (MusicPlayerBridge* self); GeeSet* familiar_players_db_records (FamiliarPlayersDB* self); static gint music_player_bridge_calculate_menu_position (MusicPlayerBridge* self); GType player_controller_state_get_type (void) G_GNUC_CONST; PlayerController* player_controller_new (DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state); PlayerController* player_controller_construct (GType object_type, DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state); -static void music_player_bridge_try_to_add_inactive_familiar_clients (MusicPlayerBridge* self); -#define PLAYER_CONTROLLER_WIDGET_QUANTITY 5 +#define PLAYER_CONTROLLER_WIDGET_QUANTITY 4 static gboolean music_player_bridge_server_is_not_of_interest (MusicPlayerBridge* self, const char* type); void player_controller_update_state (PlayerController* self, PlayerControllerstate new_state); void player_controller_activate (PlayerController* self); @@ -237,10 +237,10 @@ static void music_player_bridge_try_to_add_inactive_familiar_clients (MusicPlaye GDesktopAppInfo* _tmp2_; GAppInfo* app_info; PlayerController* ctrl; - char* _tmp4_; char* _tmp3_; - char* _tmp6_; + char* _tmp4_; char* _tmp5_; + char* _tmp6_; if (app == NULL) { g_warning ("music-player-bridge.vala:52: App string in keyfile is null therefore m" \ "oving on to next player"); @@ -292,9 +292,9 @@ static gint music_player_bridge_calculate_menu_position (MusicPlayerBridge* self void music_player_bridge_on_server_added (MusicPlayerBridge* self, IndicateListenerServer* object, const char* type) { - gint _tmp1__length1; - char** _tmp1_; char** _tmp0_; + char** _tmp1_; + gint _tmp1__length1; char* _tmp2_; char* client_name; gboolean _tmp3_ = FALSE; @@ -344,9 +344,9 @@ void music_player_bridge_on_server_added (MusicPlayerBridge* self, IndicateListe void music_player_bridge_on_server_removed (MusicPlayerBridge* self, IndicateListenerServer* object, const char* type) { - gint _tmp1__length1; - char** _tmp1_; char** _tmp0_; + char** _tmp1_; + gint _tmp1__length1; char* _tmp2_; char* client_name; gboolean _tmp3_ = FALSE; @@ -419,8 +419,8 @@ static void music_player_bridge_desktop_info_callback (MusicPlayerBridge* self, familiar_players_db_insert (bridge->priv->playersDB, path); app_info = music_player_bridge_create_app_info (path); if (app_info != NULL) { - char* _tmp3_; char* _tmp2_; + char* _tmp3_; PlayerController* _tmp4_; PlayerController* ctrl; ctrl = (_tmp4_ = (PlayerController*) gee_abstract_map_get ((GeeAbstractMap*) bridge->priv->registered_clients, _tmp3_ = string_strip (_tmp2_ = g_utf8_strdown (g_app_info_get_name (app_info), -1))), _g_free0 (_tmp3_), _g_free0 (_tmp2_), _tmp4_); -- cgit v1.2.3