4:46 p.m.
Author: salimma
Update of /cvs/free/rpms/vagalume/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15554/devel
Modified Files:
vagalume.spec
Added Files:
vagalume-0.7.1-others.patch
Log Message:
* Wed May 13 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-3
- Enable playback of others' recommendations and tags (upstream bug #4072)
vagalume-0.7.1-others.patch:
--- NEW FILE vagalume-0.7.1-others.patch ---
--- vagalume-0.7.1.orig/src/vgl-main-window.c.others 2009-02-26 09:12:11.000000000 -0500
+++ vagalume-0.7.1.orig/src/vgl-main-window.c 2009-05-13 12:19:23.168774960 -0400
@@ -770,7 +770,7 @@
GtkWidget *play, *stop, *skip, *separ1, *separ2;
GtkWidget *stopafter, *love, *ban, *tag, *dorecomm, *addtopls, *dload;
GtkWidget *library, *neigh, *loved, *playlist, *recomm, *usertag;
- GtkWidget *library2, *neigh2, *loved2, *playlist2;
+ GtkWidget *library2, *neigh2, *loved2, *playlist2, *recomm2, *usertag2;
GtkWidget *managebmk, *bmkartist, *bmktrack;
GtkWidget *about;
#ifdef USE_HILDON_WINDOW
@@ -863,10 +863,14 @@
neigh2 = gtk_menu_item_new_with_label(_("Neighbours..."));
loved2 = gtk_menu_item_new_with_label(_("Loved tracks..."));
playlist2 = gtk_menu_item_new_with_label(_("Playlist..."));
+ recomm2 = gtk_menu_item_new_with_label(_("Recommendations..."));
+ usertag2 = gtk_menu_item_new_with_label(_("Music tagged..."));
gtk_menu_shell_append(othersub, library2);
gtk_menu_shell_append(othersub, neigh2);
gtk_menu_shell_append(othersub, loved2);
gtk_menu_shell_append(othersub, playlist2);
+ gtk_menu_shell_append(othersub, recomm2);
+ gtk_menu_shell_append(othersub, usertag2);
g_signal_connect(G_OBJECT(library2), "activate",
G_CALLBACK(others_radio_selected),
GINT_TO_POINTER(LASTFM_LIBRARY_RADIO));
@@ -879,6 +883,12 @@
g_signal_connect(G_OBJECT(playlist2), "activate",
G_CALLBACK(others_radio_selected),
GINT_TO_POINTER(LASTFM_USERPLAYLIST_RADIO));
+ g_signal_connect(G_OBJECT(recomm2), "activate",
+ G_CALLBACK(others_radio_selected),
+ GINT_TO_POINTER(LASTFM_RECOMMENDED_RADIO));
+ g_signal_connect(G_OBJECT(usertag2), "activate",
+ G_CALLBACK(others_radio_selected),
+ GINT_TO_POINTER(LASTFM_USERTAG_RADIO));
/* Actions */
actions =
GTK_MENU_ITEM(gtk_menu_item_new_with_mnemonic(_("_Actions")));
--- vagalume-0.7.1.orig/src/controller.c.other 2009-02-26 09:07:31.000000000 -0500
+++ vagalume-0.7.1.orig/src/controller.c 2009-05-13 12:31:12.382534553 -0400
@@ -1448,13 +1448,34 @@
_("Play this user's
radio"),
friends,
previous);
- if (user != NULL) {
+ if (user == NULL) return;
+
+ /* Store the new value for later use */
+ g_free(previous);
+ previous = user;
+
+ if (type == LASTFM_RECOMMENDED_RADIO) {
+ url = lastfm_recommended_radio_url(
+ user, 100);
+ } else if (type == LASTFM_USERTAG_RADIO) {
+ static char *previoustag = NULL;
+ char *tag;
+ tag = ui_input_dialog_with_list(
+ vgl_main_window_get_window(mainwin, TRUE),
+ _("Enter tag"), _("Enter one of your tags"),
+ usertags, previoustag);
+ if (tag != NULL) {
+ url = lastfm_usertag_radio_url(user, tag);
+ /* Store the new value for later use */
+ g_free(previoustag);
+ previoustag = tag;
+ }
+ } else {
url = lastfm_radio_url(type, user);
+ }
+ if (url != NULL) {
controller_play_radio_by_url(url);
g_free(url);
- /* Store the new value for later use */
- g_free(previous);
- previous = user;
}
}
Index: vagalume.spec
===================================================================
RCS file: /cvs/free/rpms/vagalume/devel/vagalume.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vagalume.spec 6 May 2009 00:08:03 -0000 1.5
+++ vagalume.spec 13 May 2009 16:46:58 -0000 1.6
@@ -1,13 +1,15 @@
Name: vagalume
Version: 0.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Last.fm client for GNOME and Maemo
Group: Applications/Multimedia
License: GPLv3
URL: http://vagalume.igalia.com/
Source0: http://vagalume.igalia.com/files/source/vagalume_%{version}.orig.tar.gz
+# remove patch0 when 0.7.2 is released
Patch0: %{name}-0.7.1-border_width.patch
+Patch1: %{name}-0.7.1-others.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gstreamer-devel gtk2-devel libxml2-devel
@@ -47,6 +49,7 @@
%prep
%setup -q -n %{name}-%{version}.orig
%patch0 -p1 -b .border_width
+%patch1 -p1 -b .others
%build
@@ -93,6 +96,9 @@
%changelog
+* Wed May 13 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-3
+- Enable playback of others' recommendations and tags (upstream bug #4072)
+
* Tue May 5 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-2
- Fix border width (upstream bug #4041)