diff options
Diffstat (limited to 'src/playlists-menu-item.c')
-rw-r--r-- | src/playlists-menu-item.c | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/src/playlists-menu-item.c b/src/playlists-menu-item.c index b8ea942..ced54cf 100644 --- a/src/playlists-menu-item.c +++ b/src/playlists-menu-item.c @@ -1,4 +1,4 @@ -/* playlists-menu-item.c generated by valac 0.11.6, the Vala compiler +/* playlists-menu-item.c generated by valac 0.11.7, the Vala compiler * generated from playlists-menu-item.vala, do not modify */ /* @@ -33,6 +33,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <common-defs.h> #include <stdlib.h> #include <string.h> +#include <glib/gi18n-lib.h> #include <gio/gio.h> @@ -225,7 +226,8 @@ void playlists_menuitem_update (PlaylistsMenuitem* self, PlaylistDetails* playli PlaylistDetails _tmp0_; PlaylistDetails _tmp1_ = {0}; PlaylistDetails detail; - _tmp0_ = (playlist_details_copy (&detail_collection[detail_it], &_tmp1_), _tmp1_); + playlist_details_copy (&detail_collection[detail_it], &_tmp1_); + _tmp0_ = _tmp1_; detail = _tmp0_; { Block1Data* _data1_; @@ -275,7 +277,9 @@ void playlists_menuitem_update (PlaylistsMenuitem* self, PlaylistDetails* playli _tmp6_ = gee_map_get_values ((GeeMap*) self->priv->current_playlists); _tmp7_ = _tmp6_; _tmp8_ = gee_iterable_iterator ((GeeIterable*) _tmp7_); - _item_it = (_tmp9_ = _tmp8_, _g_object_unref0 (_tmp7_), _tmp9_); + _tmp9_ = _tmp8_; + _g_object_unref0 (_tmp7_); + _item_it = _tmp9_; while (TRUE) { gboolean _tmp10_; gpointer _tmp11_ = NULL; @@ -298,7 +302,8 @@ void playlists_menuitem_update (PlaylistsMenuitem* self, PlaylistDetails* playli PlaylistDetails _tmp12_; PlaylistDetails _tmp13_ = {0}; PlaylistDetails detail; - _tmp12_ = (playlist_details_copy (&detail_collection[detail_it], &_tmp13_), _tmp13_); + playlist_details_copy (&detail_collection[detail_it], &_tmp13_); + _tmp12_ = _tmp13_; detail = _tmp12_; { const gchar* _tmp14_ = NULL; @@ -318,7 +323,9 @@ void playlists_menuitem_update (PlaylistsMenuitem* self, PlaylistDetails* playli _tmp15_ = dbusmenu_menuitem_property_get (self->root_item, DBUSMENU_PLAYLIST_MENUITEM_PATH); _tmp16_ = dbusmenu_menuitem_property_get (item, DBUSMENU_PLAYLIST_MENUITEM_PATH); if (g_strcmp0 (_tmp15_, _tmp16_) == 0) { - dbusmenu_menuitem_property_set (self->root_item, DBUSMENU_MENUITEM_PROP_LABEL, "Choose Playlist"); + const gchar* _tmp17_ = NULL; + _tmp17_ = _ ("Choose Playlist"); + dbusmenu_menuitem_property_set (self->root_item, DBUSMENU_MENUITEM_PROP_LABEL, _tmp17_); } dbusmenu_menuitem_child_delete (self->root_item, item); } @@ -354,7 +361,9 @@ static gchar* playlists_menuitem_parse_icon_path (PlaylistsMenuitem* self, const icon_file = _tmp0_; _tmp1_ = g_file_get_path (icon_file); _tmp2_ = _tmp1_; - if ((_tmp3_ = _tmp2_ == NULL, _g_free0 (_tmp2_), _tmp3_)) { + _tmp3_ = _tmp2_ == NULL; + _g_free0 (_tmp2_); + if (_tmp3_) { result = NULL; _g_object_unref0 (icon_file); return result; @@ -365,7 +374,10 @@ static gchar* playlists_menuitem_parse_icon_path (PlaylistsMenuitem* self, const _tmp8_ = _tmp7_; _tmp8__length1 = _vala_array_length (_tmp6_); _tmp9_ = g_strdup (_tmp8_[0]); - result = (_tmp10_ = _tmp9_, _tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL), _g_free0 (_tmp5_), _tmp10_); + _tmp10_ = _tmp9_; + _tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL); + _g_free0 (_tmp5_); + result = _tmp10_; _g_object_unref0 (icon_file); return result; } @@ -383,7 +395,9 @@ void playlists_menuitem_update_individual_playlist (PlaylistsMenuitem* self, Pla _tmp0_ = gee_map_get_values ((GeeMap*) self->priv->current_playlists); _tmp1_ = _tmp0_; _tmp2_ = gee_iterable_iterator ((GeeIterable*) _tmp1_); - _item_it = (_tmp3_ = _tmp2_, _g_object_unref0 (_tmp1_), _tmp3_); + _tmp3_ = _tmp2_; + _g_object_unref0 (_tmp1_); + _item_it = _tmp3_; while (TRUE) { gboolean _tmp4_; gpointer _tmp5_ = NULL; @@ -430,7 +444,9 @@ static gboolean playlists_menuitem_already_observed (PlaylistsMenuitem* self, Pl _tmp0_ = gee_map_get_values ((GeeMap*) self->priv->current_playlists); _tmp1_ = _tmp0_; _tmp2_ = gee_iterable_iterator ((GeeIterable*) _tmp1_); - _item_it = (_tmp3_ = _tmp2_, _g_object_unref0 (_tmp1_), _tmp3_); + _tmp3_ = _tmp2_; + _g_object_unref0 (_tmp1_); + _item_it = _tmp3_; while (TRUE) { gboolean _tmp4_; gpointer _tmp5_ = NULL; @@ -471,10 +487,10 @@ void playlists_menuitem_active_playlist_update (PlaylistsMenuitem* self, Playlis _tmp0_ = g_strdup ((*detail).name); update = _tmp0_; if (g_strcmp0 (update, "") == 0) { - gchar* _tmp1_; + const gchar* _tmp1_ = NULL; gchar* _tmp2_; - _tmp1_ = g_strdup ("Choose Playlist"); - _tmp2_ = _tmp1_; + _tmp1_ = _ ("Choose Playlist"); + _tmp2_ = g_strdup (_tmp1_); _g_free0 (update); update = _tmp2_; } @@ -493,7 +509,7 @@ static void playlists_menuitem_submenu_item_activated (PlaylistsMenuitem* self, g_return_if_fail (self != NULL); _tmp0_ = gee_abstract_map_has_key ((GeeAbstractMap*) self->priv->current_playlists, GINT_TO_POINTER (menu_item_id)); if (!_tmp0_) { - g_warning ("playlists-menu-item.vala:129: item %i was activated but we don't have " \ + g_warning ("playlists-menu-item.vala:133: item %i was activated but we don't have " \ "a corresponding playlist", menu_item_id); return; } @@ -524,21 +540,19 @@ static GObject * playlists_menuitem_constructor (GType type, guint n_construct_p GObjectClass * parent_class; PlaylistsMenuitem * self; GeeHashMap* _tmp0_ = NULL; - GeeHashMap* _tmp1_; - DbusmenuMenuitem* _tmp2_ = NULL; - DbusmenuMenuitem* _tmp3_; + DbusmenuMenuitem* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; parent_class = G_OBJECT_CLASS (playlists_menuitem_parent_class); obj = parent_class->constructor (type, n_construct_properties, construct_properties); self = PLAYLISTS_MENUITEM (obj); _tmp0_ = gee_hash_map_new (G_TYPE_INT, NULL, NULL, DBUSMENU_TYPE_MENUITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); - _tmp1_ = _tmp0_; _g_object_unref0 (self->priv->current_playlists); - self->priv->current_playlists = _tmp1_; - _tmp2_ = dbusmenu_menuitem_new (); - _tmp3_ = _tmp2_; + self->priv->current_playlists = _tmp0_; + _tmp1_ = dbusmenu_menuitem_new (); _g_object_unref0 (self->root_item); - self->root_item = _tmp3_; - dbusmenu_menuitem_property_set (self->root_item, DBUSMENU_MENUITEM_PROP_LABEL, "Choose Playlist"); + self->root_item = _tmp1_; + _tmp2_ = _ ("Choose Playlist"); + dbusmenu_menuitem_property_set (self->root_item, DBUSMENU_MENUITEM_PROP_LABEL, _tmp2_); dbusmenu_menuitem_property_set (self->root_item, DBUSMENU_PLAYLIST_MENUITEM_PATH, ""); return obj; } |