discomfitor pushed a commit to branch master.
commit 25de8115112d0bb510fdc2cfe89fdf8afe095c27
Author: discomfitor <[email protected]>
Date: Sat Aug 31 14:46:17 2013 +0100
in a move which is likely to make me both hugely popular and unpopular, I'm
removing the "extra desktops" that we've been shipping for a few years
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.
---
src/bin/e_open.c | 1 -
src/bin/e_utils.c | 1 -
src/modules/Makefile_wizard.am | 6 +----
.../wizard/data/extra_desktops/mplayer.desktop | 26 ----------------------
.../wizard/data/extra_desktops/xterm.desktop | 22 ------------------
5 files changed, 1 insertion(+), 55 deletions(-)
diff --git a/src/bin/e_open.c b/src/bin/e_open.c
index aca3cbd..c429029 100644
--- 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 ce5f71e..7d0c6db 100644
--- 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 07f63b2..32da4eb 100644
--- 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
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
[...]
-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
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
--
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
