diff options
| -rw-r--r-- | admin/Makefile.in | 2 | ||||
| -rw-r--r-- | admin/acinclude.m4.in | 6 | ||||
| -rw-r--r-- | admin/libtool/Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/app/Makefile.am (renamed from data/applnk/Makefile.am) | 2 | ||||
| -rw-r--r-- | data/app/kvirc.desktop (renamed from data/applnk/kvirc.desktop) | 18 | ||||
| -rw-r--r-- | doc/hackers.guide.txt | 2 | ||||
| -rw-r--r-- | scripts/config/kvirc-config.in | 2 |
9 files changed, 18 insertions, 20 deletions
diff --git a/admin/Makefile.in b/admin/Makefile.in index 1087211..5c1511d 100644 --- a/admin/Makefile.in +++ b/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 \ diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index a3ee740..a46275c 100644 --- a/admin/acinclude.m4.in +++ b/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" diff --git a/admin/libtool/Makefile.in b/admin/libtool/Makefile.in index ae8719d..3f6fc93 100644 --- a/admin/libtool/Makefile.in +++ b/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 diff --git a/configure.in b/configure.in index 7f8d4d0..e6c8e0f 100644 --- a/configure.in +++ b/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 \ diff --git a/data/Makefile.am b/data/Makefile.am index 1d329f1..60551c8 100644 --- a/data/Makefile.am +++ b/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 diff --git a/data/applnk/Makefile.am b/data/app/Makefile.am index cf7c6f3..cd2d496 100644 --- a/data/applnk/Makefile.am +++ b/data/app/Makefile.am @@ -1,4 +1,4 @@ -tmpdir = $(applnkdir) +tmpdir = $(xdg_apps) tmp_DATA = kvirc.desktop diff --git a/data/applnk/kvirc.desktop b/data/app/kvirc.desktop index 0464150..25cfe28 100644 --- a/data/applnk/kvirc.desktop +++ b/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 diff --git a/doc/hackers.guide.txt b/doc/hackers.guide.txt index 693cf54..9004f96 100644 --- a/doc/hackers.guide.txt +++ b/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 | | diff --git a/scripts/config/kvirc-config.in b/scripts/config/kvirc-config.in index 20e1dd8..2427a56 100644 --- a/scripts/config/kvirc-config.in +++ b/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@" |