diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-07-07 16:41:10 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-07-07 16:41:10 -0400 |
| commit | 08cee9d8f475337362ea4e935b0d1b2697f0ec79 (patch) | |
| tree | 51c0fec7431593cb3b6ffa9a2141c5d2122ff38c /src/player-item.c | |
| parent | d6c3971f3dc1d69de7e6f937b4bc0aa82842b05f (diff) | |
| parent | 4fe864d53eea581c95685e31a4372a83f87fce55 (diff) | |
| download | ayatana-indicator-sound-08cee9d8f475337362ea4e935b0d1b2697f0ec79.tar.gz ayatana-indicator-sound-08cee9d8f475337362ea4e935b0d1b2697f0ec79.tar.bz2 ayatana-indicator-sound-08cee9d8f475337362ea4e935b0d1b2697f0ec79.zip | |
* New upstream release.
- libindicator scroll signals (LP: #804618)
- metadatawidget collapse (LP: #806439)
* debian/control
- Bumped build depends for libindicator to 0.3.90
* debian/patches/gtk3_define.patch
- dropped
Diffstat (limited to 'src/player-item.c')
| -rw-r--r-- | src/player-item.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/player-item.c b/src/player-item.c index 3c9cbeb..89c291d 100644 --- a/src/player-item.c +++ b/src/player-item.c @@ -56,6 +56,7 @@ typedef struct _PlayerController PlayerController; typedef struct _PlayerControllerClass PlayerControllerClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) +#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) #define TYPE_METADATA_MENUITEM (metadata_menuitem_get_type ()) #define METADATA_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_METADATA_MENUITEM, MetadataMenuitem)) @@ -66,7 +67,6 @@ typedef struct _PlayerControllerClass PlayerControllerClass; typedef struct _MetadataMenuitem MetadataMenuitem; typedef struct _MetadataMenuitemClass MetadataMenuitemClass; -#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) struct _PlayerItem { DbusmenuMenuitem parent_instance; @@ -237,6 +237,13 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu _tmp6_ = g_hash_table_lookup (data, search_key); _tmp7_ = _g_variant_ref0 ((GVariant*) _tmp6_); v = _tmp7_; + if (v == NULL) { + _g_variant_unref0 (v); + _g_free0 (search_key); + input_keys = (_vala_array_free (input_keys, input_keys_length1, (GDestroyNotify) g_free), NULL); + _g_free0 (property); + continue; + } _tmp8_ = g_variant_is_of_type (v, G_VARIANT_TYPE_STRING); if (_tmp8_) { const gchar* _tmp9_ = NULL; |