in a move which is likely to make me both hugely popular and unpopular, I'm removing...

this was, I guess, an attempt to provide users with an easily accessible ibar icon when starting a new config. problem: xterm isn't installed by default on ANY distributions! so now we end up providing a launcher which is guaranteed to fail, and that makes us look pretty stupid. same thing goes for mplayer.

regardless of whether they're installed, however, these aren't our apps, so we shouldn't be trying to provide .desktops for them: doing that tell users that we support and recommend the use of these apps, and I'm not prepared to make that claim for any app other than powerpoint.

diff --git a/src/bin/e_open.c b/src/bin/e_open.c
index aca3cbd7d080a3a5b7b5e1f24be4843b48e8ee98..c4290292624e63f42d8b967980d3900ad5265c73 100644 (file)
--- a/src/bin/e_open.c
+++ b/src/bin/e_open.c
@@ -288,7 +288,6 @@ terminal_open(void)
    const char *terms[] =
    {
       "terminology.desktop",
-      "xterm.desktop",
       "rxvt.desktop",
       "gnome-terimnal.desktop",
       "konsole.desktop",

diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index ce5f71e651fd992e718844b834ee580e9e5d99d4..7d0c6db6a73f0ad94c75f6c909cf036c211c0158 100644 (file)
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -1421,7 +1421,6 @@ e_util_terminal_desktop_get(void)
    const char *terms[] =
    {
       "terminology.desktop",
-      "xterm.desktop",
       "rxvt.desktop",
       "gnome-terminal.desktop",
       "konsole.desktop",

diff --git a/src/modules/Makefile_wizard.am b/src/modules/Makefile_wizard.am
index 07f63b272190a57f10f319dd011a053beddfaa0b..32da4eb38b4f06b5f8cadc7e5a5ec9e23b6e3658 100644 (file)
--- a/src/modules/Makefile_wizard.am
+++ b/src/modules/Makefile_wizard.am
@@ -1,16 +1,12 @@
 wizarddir = $(MDIR)/wizard
 wizard_DATA = wizard/data/def-ibar.txt
 
-wizard_desksdir= $(MDIR)/wizard/extra_desktops
-wizard_desks_DATA = wizard/data/extra_desktops/mplayer.desktop \
-                   wizard/data/extra_desktops/xterm.desktop
-
 wizard_desktopdir = $(MDIR)/wizard/desktop
 wizard_desktop_DATA = wizard/data/desktop/home.desktop \
                      wizard/data/desktop/root.desktop \
                      wizard/data/desktop/tmp.desktop
 
-EXTRA_DIST += $(wizard_DATA) $(wizard_desks_DATA) $(wizard_desktop_DATA)
+EXTRA_DIST += $(wizard_DATA) $(wizard_desktop_DATA)
 
 ### dont install these - this way e wont list the module for people to
 #wizard_DATA = wizard/e-module-wizard.edj \

diff --git a/src/modules/wizard/data/extra_desktops/mplayer.desktop b/src/modules/wizard/data/extra_desktops/mplayer.desktop
deleted file mode 100644 (file)
index 9724ced..0000000
--- a/src/modules/wizard/data/extra_desktops/mplayer.desktop
+++ /dev/null
@@ -1,26 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=MPlayer
-Name[eo]=MPlayer
-Name[fr]=MPlayer
-GenericName=Movie Player
-GenericName[eo]=Ludilo de videoj
-GenericName[es]=Reproductor de vídeo
-GenericName[fr]=Lecteur de films
-GenericName[gl]=Reprodutor de vídeo
-GenericName[pt]=Reprodutor multimédia
-GenericName[ru]=Видеоплеер
-Comment=Watch movies and videos
-Comment[eo]=Por spekti filmojn kaj videojn
-Comment[es]=Para ver películas y vídeos
-Comment[fr]=Regarder des films et vidéos
-Comment[gl]=Para ver películas e vídeos
-Comment[it]=Per guardare filmati e video
-Comment[pt]=Ver filmes e ouvir músicas
-Comment[ru]=Просмотр фильмов и видео
-Icon=video_player
-Exec=mplayer %U
-MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/smil;application/smil+xml;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktime-media-link;application/x-quicktimeplayer;application/x-shorten;application/x-smil;application/xspf+xml;audio/3gpp;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-wav;audio/x-wavpack;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/google-video-pointer;text/x-google-video-pointer;video/3gpp;video/dv;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ms-asf;video/x-ms-asx;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;video/x-totem-stream;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;
-Categories=AudioVideo;Player;
-StartupWMClass=MPlayer

diff --git a/src/modules/wizard/data/extra_desktops/xterm.desktop b/src/modules/wizard/data/extra_desktops/xterm.desktop
deleted file mode 100644 (file)
index 4ca3dd8..0000000
--- a/src/modules/wizard/data/extra_desktops/xterm.desktop
+++ /dev/null
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=XTerm
-Name[eo]=XTerm
-Name[fr]=XTerm
-GenericName=Terminal
-GenericName[eo]=Terminalo
-GenericName[fr]=Console
-GenericName[ru]=Терминал
-Comment=Run commands in a shell
-Comment[eo]=Lanĉi komandojn en ĉelo
-Comment[es]=Ejecute comandos en una consola
-Comment[fr]=Lancer des commandes dans le shell
-Comment[gl]=Execute comandos nunha consola
-Comment[it]=Esegue comandi in una shell
-Comment[pt]=Execução de comandos na consola
-Comment[ru]=Запуск команд в командной оболочке
-Icon=xterm
-Exec=xterm
-Categories=Utility;TerminalEmulator;System;
-StartupWMClass=XTerm