Move kvirc.desktop from 'applnk' to 'applications/tde' folder and update

its internal structure.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

admin/Makefile.in

@@ -183,7 +183,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-applnkdir = @applnkdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -256,6 +255,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 topdir = @topdir@
+xdg_apps = @xdg_apps@
 SUBDIRS = libtool
 EXTRA_DIST = acinclude.m4.in libtool.m4.in gendoc.pl gensrc.pl \
 		depcomp config.guess config.sub install-sh ltmain.sh \

admin/acinclude.m4.in

@@ -2298,7 +2298,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
 		iconmime64datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/64x64/mimetypes"
 		iconmime128datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/128x128/mimetypes"
 		iconmimescalabledatadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/scalable/mimetypes"
-		applnkdir="$SS_KDE_GENERAL_DIR/share/applnk/Internet"
+		xdg_apps="$SS_KDE_GENERAL_DIR/share/applications/tde"
 		mimelnkdir="$SS_KDE_GENERAL_DIR/share/mimelnk/text"
 	else
 		iconapps16datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/16x16"
@@ -2313,7 +2313,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
 		iconmime64datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/64x64"
 		iconmime128datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/128x128"
 		iconmimescalabledatadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/scalable"
-		applnkdir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/applnk"
+		xdg_apps="\${exec_prefix}/share/kvirc/$SS_DIRTAG/applications"
 		mimelnkdir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/mimelnk"
 	fi
 	AC_SUBST(iconapps16datadir)
@@ -2328,7 +2328,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
 	AC_SUBST(iconmime64datadir)
 	AC_SUBST(iconmime128datadir)
 	AC_SUBST(iconmimescalabledatadir)
-	AC_SUBST(applnkdir)
+	AC_SUBST(xdg_apps)
 	AC_SUBST(mimelnkdir)
 
 	localedir="\${globalkvircdir}/locale"

admin/libtool/Makefile.in

@@ -143,7 +143,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-applnkdir = @applnkdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -216,6 +215,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 topdir = @topdir@
+xdg_apps = @xdg_apps@
 EXTRA_DIST = ltmain.sh config.guess config.sub
 all: all-am
 

configure.in

@@ -120,7 +120,7 @@ AC_OUTPUT( \
 	admin/Makefile \
 	admin/libtool/Makefile \
 	data/Makefile \
-	data/applnk/Makefile \
+	data/app/Makefile \
 	data/config/Makefile \
 	data/defscript/Makefile \
 	data/deftheme/Makefile \

data/Makefile.am

@@ -2,5 +2,5 @@
 # KVirc IRC client Makefile - 16.12.98 Szymon Stefanek <stefanek@tin.it>
 ###############################################################################
 
-SUBDIRS          = applnk config defscript deftheme doctemplates \
+SUBDIRS = app config defscript deftheme doctemplates \
 helppics icons man mimelnk msgcolors pics protocols resources resources_mac

data/app/Makefile.am

@@ -1,4 +1,4 @@
-tmpdir = $(applnkdir)
+tmpdir = $(xdg_apps)
 
 tmp_DATA = kvirc.desktop
    

data/app/kvirc.desktop

@@ -1,18 +1,16 @@
 [Desktop Entry]
-BinaryPattern=
+Name=KVIrc 3
+
 GenericName=IRC Client
+
 Comment=Connect to Internet Relay Chat
-MimeType=application/x-kva;application/x-kvt
+
 Exec=kvirc -m %u
+Type=Application
+MimeType=application/x-kva;application/x-kvt
+Terminal=false
 Icon=kvirc
+Categories=Qt;TDE;Network;InstantMessaging;
 MapNotify=true
-Name=KVIrc 3
-SwallowExec=
-SwallowTitle=
-Terminal=false
-TerminalOptions=
-Path=
-Type=Application
 X-TDE-SubstituteUID=false
-X-TDE-Username=
 X-TDE-StartupNotify=true

doc/hackers.guide.txt

@@ -16,7 +16,7 @@ The source tree
 |-- data                  Data for the KVIrc program. Most of this stuff is
 |   |                     installed in $(prefix)/share/kvirc/$VERSION/
 |   |
-|   |-- applnk            *.desktop and menu entries for KDE
+|   |-- app               *.desktop and menu entries for KDE
 |   |
 |   |-- config            Default configuration files
 |   |

scripts/config/kvirc-config.in

@@ -44,7 +44,6 @@ mandir="@mandir@"
 includedir="@includedir@"
 oldincludedir="/usr/include"
 headersdir="@headersdir@"
-applnkdir="@applnkdir@"
 configdir="@configdir@"
 configmodulesdir="@configmodulesdir@"
 defscriptdir="@defscriptdir@"
@@ -62,6 +61,7 @@ mimelnkdir="@mimelnkdir@"
 picsdir="@globalkvircdir@/pics"
 pluglibdir="@pluglibdir@"
 topdir="@topdir@"
+xdg_apps="@xdg_apps@"
 
 
 build_alias="@build_alias@"