[rhythmbox] add a new .desktop file to be invoked for device insertion



commit d06238d8013bcd8c4173b08f79d07ea5621b08c4
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Aug 10 23:26:22 2010 +1000

    add a new .desktop file to be invoked for device insertion
    
    This handles x-content/audio-player and x-content/audio-cdda (which have
    been removed from the normal .desktop file), using rhythmbox-client with
    the --select-source argument to just select the source for the device.
    It's not clear that starting playback immediately is the right thing to do
    for any type of device, but if it is, we can use the --play-source or
    --activate-source argument instead.

 configure.ac                        |    1 +
 data/Makefile.am                    |   15 +++++++++++----
 data/rhythmbox-device.desktop.in.in |   19 +++++++++++++++++++
 data/rhythmbox.desktop.in.in        |    2 +-
 4 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c8a8ac3..999af91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,6 +829,7 @@ podcast/Makefile
 shell/Makefile
 data/Makefile
 data/rhythmbox.desktop.in
+data/rhythmbox-device.desktop.in
 data/ui/Makefile
 data/icons/Makefile
 data/icons/hicolor/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 721f489..96c279b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = ui icons
 @INTLTOOL_DESKTOP_RULE@
 
 Multimediadir = $(datadir)/applications
-Multimedia_in_files = rhythmbox.desktop.in
+Multimedia_in_files = rhythmbox.desktop.in rhythmbox-device.desktop.in
 Multimedia_DATA = $(Multimedia_in_files:.desktop.in=.desktop)
 
 schemadir = @GCONF_SCHEMA_FILE_DIR@
@@ -48,6 +48,13 @@ EXTRA_DIST = $(service_in_files)    \
 	     $(schema_DATA)	    \
 	     $(man_MANS)            \
 	     $(playlists_in_files)  \
-	     rhythmbox.desktop.in.in
-
-CLEANFILES = rhythmbox.desktop org.gnome.Rhythmbox.service playlists.xml rhythmbox.desktop.in
+	     rhythmbox.desktop.in.in \
+	     rhythmbox-device.desktop.in.in
+
+CLEANFILES = 					\
+	rhythmbox.desktop			\
+	rhythmbox-device.desktop		\
+	org.gnome.Rhythmbox.service		\
+	playlists.xml				\
+	rhythmbox.desktop.in			\
+	rhythmbox-device.desktop.in
diff --git a/data/rhythmbox-device.desktop.in.in b/data/rhythmbox-device.desktop.in.in
new file mode 100644
index 0000000..b2db216
--- /dev/null
+++ b/data/rhythmbox-device.desktop.in.in
@@ -0,0 +1,19 @@
+[Desktop Entry]
+_Name=Rhythmbox
+_GenericName=Music Player
+_X-GNOME-FullName=Rhythmbox Music Player
+_Comment=Play and organize your music collection
+Exec=rhythmbox-client --select-source %U
+Terminal=false
+Hidden=true
+Type=Application
+Icon=rhythmbox
+X-GNOME-DocPath=rhythmbox/rhythmbox.xml
+Categories=GNOME;GTK;AudioVideo;
+MimeType=x-content/audio-player;x-content/audio-cdda;
+StartupNotify=false
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=rhythmbox
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-OtherBinaries=rhythmbox;rhythmbox-metadata;
+X-GNOME-Bugzilla-Version= VERSION@
diff --git a/data/rhythmbox.desktop.in.in b/data/rhythmbox.desktop.in.in
index 8d8cc82..fa9dcf8 100644
--- a/data/rhythmbox.desktop.in.in
+++ b/data/rhythmbox.desktop.in.in
@@ -9,7 +9,7 @@ Type=Application
 Icon=rhythmbox
 X-GNOME-DocPath=rhythmbox/rhythmbox.xml
 Categories=GNOME;GTK;AudioVideo;
-MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;x-content/audio-cdda;x-content/audio-player;
+MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;
 StartupNotify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=rhythmbox



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]