diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2010-08-26 11:32:53 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2010-08-26 11:32:53 +0200 |
| commit | 80e5ad4f83a8b1218133761de11d433a7854041e (patch) | |
| tree | 897ac9aa33cd0f1f703403e2bfc73136db80c86d /src/player-item.c | |
| parent | b4d305f16bae6804dcf2acf8b9ecc4629807c150 (diff) | |
| download | ayatana-indicator-sound-80e5ad4f83a8b1218133761de11d433a7854041e.tar.gz ayatana-indicator-sound-80e5ad4f83a8b1218133761de11d433a7854041e.tar.bz2 ayatana-indicator-sound-80e5ad4f83a8b1218133761de11d433a7854041e.zip | |
Import upstream version 0.4.1
Diffstat (limited to 'src/player-item.c')
| -rw-r--r-- | src/player-item.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/player-item.c b/src/player-item.c index 74d3e2f..f70c04c 100644 --- a/src/player-item.c +++ b/src/player-item.c @@ -1,4 +1,4 @@ -/* player-item.c generated by valac 0.9.5, the Vala compiler +/* player-item.c generated by valac 0.9.7, the Vala compiler * generated from player-item.vala, do not modify */ /* @@ -84,8 +84,8 @@ enum { PlayerItem* player_item_new (const char* type); PlayerItem* player_item_construct (GType object_type, const char* type); void player_item_reset (PlayerItem* self, GeeHashSet* attrs); -static GValue* _g_value_dup (GValue* self); void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attributes); +static GValue* _g_value_dup (GValue* self); gboolean player_item_populated (PlayerItem* self, GeeHashSet* attrs); PlayerController* player_item_get_owner (PlayerItem* self); static void player_item_set_owner (PlayerItem* self, PlayerController* value); @@ -178,11 +178,10 @@ static char* bool_to_string (gboolean self) { void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attributes) { - GError * _inner_error_; + GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (data != NULL); g_return_if_fail (attributes != NULL); - _inner_error_ = NULL; g_debug ("player-item.vala:47: PlayerItem::update()"); if (data == NULL) { g_debug ("player-item.vala:49: PlayerItem::Update -> The hashtable was null - ju" \ @@ -194,13 +193,13 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu _property_it = gee_abstract_collection_iterator ((GeeAbstractCollection*) attributes); while (TRUE) { char* property; - char** _tmp1_; - gint _input_keys_size_; gint input_keys_length1; + gint _input_keys_size_; + char** _tmp1_; char** _tmp0_; char** input_keys; - char** _tmp3_ = NULL; gint _tmp2_; + char** _tmp3_ = NULL; char* search_key; GValue* v; if (!gee_iterator_next (_property_it)) { @@ -215,7 +214,7 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu char* update; update = string_strip (g_value_get_string (v)); g_debug ("player-item.vala:61: with value : %s", update); - if (string_contains (property, "arturl")) { + if (string_contains (property, "mpris:artUrl")) { { char* _tmp4_; char* _tmp5_; @@ -269,9 +268,9 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu g_debug ("player-item.vala:74: with value : %i", g_value_get_int (v)); dbusmenu_menuitem_property_set_int ((DbusmenuMenuitem*) self, property, g_value_get_int (v)); } else { - if (G_VALUE_HOLDS (v, G_TYPE_UINT)) { - g_debug ("player-item.vala:78: with value : %i", (gint) g_value_get_uint (v)); - dbusmenu_menuitem_property_set_int ((DbusmenuMenuitem*) self, property, (gint) g_value_get_uint (v)); + if (G_VALUE_HOLDS (v, G_TYPE_INT64)) { + g_debug ("player-item.vala:78: with value : %i", (gint) g_value_get_int64 (v)); + dbusmenu_menuitem_property_set_int ((DbusmenuMenuitem*) self, property, (gint) g_value_get_int64 (v)); } else { if (G_VALUE_HOLDS (v, G_TYPE_BOOLEAN)) { char* _tmp8_; @@ -309,8 +308,9 @@ gboolean player_item_populated (PlayerItem* self, GeeHashSet* attrs) { break; } prop = (char*) gee_iterator_get (_prop_it); + g_debug ("player-item.vala:95: populated ? - prop: %s", prop); value_int = dbusmenu_menuitem_property_get_int ((DbusmenuMenuitem*) self, prop); - g_debug ("player-item.vala:96: populate - prop %s and value %i", prop, value_int); + g_debug ("player-item.vala:97: populated ? - prop %s and value %i", prop, value_int); if (dbusmenu_menuitem_property_get_int ((DbusmenuMenuitem*) self, prop) != PLAYER_ITEM_EMPTY) { result = TRUE; _g_free0 (prop); |