Mercurial > audlegacy
changeset 3676:4920d6d4ac6e
Automated merge with ssh://hg.atheme.org//hg/audacious
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Sun, 30 Sep 2007 12:02:15 -0500 |
| parents | 65b9207fb7b2 (current diff) 8b3f1801b9d6 (diff) |
| children | 30ef1287da19 |
| files | applications/audacious.desktop |
| diffstat | 4 files changed, 29 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Sep 30 12:02:07 2007 -0500 +++ b/Makefile Sun Sep 30 12:02:15 2007 -0500 @@ -117,6 +117,14 @@ ${INSTALL_FAILED}; \ fi; \ done + for i in audacious.desktop; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/applications && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/applications/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done uninstall-extra: for i in audacious.pc audclient.pc; do \ @@ -128,3 +136,12 @@ fi \ fi; \ done + for i in audacious.desktop; do \ + if test -f ${DESTDIR}${datadir}/applications/$$i; then \ + if rm -f ${DESTDIR}${datadir}/applications/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done
--- a/applications/audacious.desktop Sun Sep 30 12:02:07 2007 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=Audacious -GenericName=Audio Player -Comment=Play music -Comment[hu]=Zene lejátszása -Exec=audacious %U -Icon=audacious -MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg -Categories=Application;GTK;AudioVideo;Player; -Terminal=false -Type=Application -Encoding=UTF-8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/audacious.desktop Sun Sep 30 12:02:15 2007 -0500 @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Audacious +GenericName=Audio Player +Comment=Play music +Comment[hu]=Zene lejátszása +Exec=audacious %U +Icon=audacious +MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg +Categories=Application;GTK;AudioVideo;Player; +Terminal=false +Type=Application +Encoding=UTF-8
--- a/src/audacious/plugin.h Sun Sep 30 12:02:07 2007 -0500 +++ b/src/audacious/plugin.h Sun Sep 30 12:02:15 2007 -0500 @@ -284,11 +284,6 @@ /* So that input plugins can get the title formatting information */ G_CONST_RETURN gchar * get_gentitle_format(void); -/* So that output plugins can communicate with effect plugins */ -EffectPlugin *get_current_effect_plugin(void); -gboolean effects_enabled(void); -gboolean plugin_set_errortext(const gchar * text); - G_END_DECLS #include "audacious/mime.h"