Install a nautilus-mpg123 symlink that points to the real mpg123 if it

* components/music/Makefile.am: Install a nautilus-mpg123 symlink
	that points to the real mpg123 if it exists on the system.
	* components/music/mpg123_handler.c (start_playing_file): Run nautilus-mpg123
	* nautilus-clean.sh: Kill nautilus-mpg123
	* nautilus-spec.in: Install the nautilus-mpg123 symlink
This commit is contained in:
Maciej Stachowiak 2000-11-02 19:46:52 +00:00
parent da7edc6c66
commit 7db82cee95
5 changed files with 21 additions and 2 deletions

View file

@ -1,3 +1,11 @@
2000-11-02 Maciej Stachowiak <mjs@eazel.com>
* components/music/Makefile.am: Install a nautilus-mpg123 symlink
that points to the real mpg123 if it exists on the system.
* components/music/mpg123_handler.c (start_playing_file): Run nautilus-mpg123
* nautilus-clean.sh: Kill nautilus-mpg123
* nautilus-spec.in: Install the nautilus-mpg123 symlink
2000-11-02 Maciej Stachowiak <mjs@eazel.com>
Believed fix to 4361 and possible progress on 4157.

View file

@ -39,3 +39,12 @@ nautilus_music_view_LDADD = \
$(GNORBA_LIBS)
EXTRA_DIST = $(oaf_DATA)
install-exec-hook:
MPG123_PATH=`which mpg123`; \
if test -x /usr/bin/mpg123; then \
ln -sf /usr/bin/mpg123 $(DESTDIR)/$(bindir)/nautilus-mpg123; \
elif test "x$${MPG123_PATH}" != "x"; then \
ln -sf "$${MPG123_PATH}" $(DESTDIR)/$(bindir)/nautilus-mpg123; \
fi

View file

@ -650,7 +650,7 @@ void start_playing_file(gchar* filename, gboolean start_from_beginning)
/* create all command line arguments */
strcpy(cmd_arguments[cmd_cnt],"mpg123");
strcpy(cmd_arguments[cmd_cnt],"nautilus-mpg123");
cmd_ptr[cmd_cnt] = cmd_arguments[cmd_cnt];
cmd_cnt++;
@ -757,7 +757,7 @@ void start_playing_file(gchar* filename, gboolean start_from_beginning)
/* set the group (session) id to this process for future killing */
setsid();
execvp("mpg123",cmd_ptr);
execvp("nautilus-mpg123",cmd_ptr);
printf("unable to run mpg123 (in the path?)\n");
exit(1);
}

View file

@ -83,6 +83,7 @@ nautilus-history-view \
nautilus-image-view \
nautilus-inventory-view \
nautilus-mozilla-content-view \
nautilus-mpg123 \
nautilus-music-view \
nautilus-notes \
nautilus-rpm-view \

View file

@ -153,6 +153,7 @@ fi
%{prefix}/bin/nautilus-hardware-view
%{prefix}/bin/nautilus-history-view
%{prefix}/bin/nautilus-image-view
%{prefix}/bin/nautilus-mpg123
%{prefix}/bin/nautilus-music-view
%{prefix}/bin/nautilus-notes
%{prefix}/bin/nautilus-sample-content-view