[network-manager-vpnc] Revert "Install a desktop file for nm-vpnc-auth-dialog"
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-vpnc] Revert "Install a desktop file for nm-vpnc-auth-dialog"
- Date: Wed, 27 Jan 2016 16:49:26 +0000 (UTC)
commit e8687269ef38ca852a27e393e2eb51500142a47b
Author: Michael Biebl <biebl debian org>
Date: Fri Jan 22 00:36:52 2016 +0100
Revert "Install a desktop file for nm-vpnc-auth-dialog"
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
This is a multi-part message in MIME format.
The desktop file was added a long time ago, when we didn't have native
gnome-shell dialogs yet. This is no longer the case and the vpnc plugin
uses supports-external-ui-mode=true nowadays. So drop the desktop file
again.
Regards,
Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
From d58947f6173fc2ebec5ac8734e2daa27b0e2e3fc Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl debian org>
Date: Fri, 22 Jan 2016 00:28:28 +0100
Subject: [PATCH] Revert "Install a desktop file for nm-vpnc-auth-dialog"
This reverts commit ae326938797b93dbc07df07296f9b00c5b042f69.
The plugin uses supports-external-ui-mode=true nowadays. This means
gnome-shell no longer needs to start nm-vpnc-auth-dialog but uses
builtin dialogs to prompt for authentication.
acinclude.m4 | 40 -------------------------
auth-dialog/Makefile.am | 15 +---------
auth-dialog/nm-vpnc-auth-dialog.desktop.in.in | 7 ----
configure.ac | 3 --
4 files changed, 1 insertions(+), 64 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 580e1a6..9add74a 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -19,18 +19,5 @@ nm_vpnc_auth_dialog_LDADD = \
$(LIBNMA_LIBS) \
$(LIBSECRET_LIBS)
- INTLTOOL_DESKTOP_RULE@
-desktopdir = $(datadir)/applications
-desktop_in_in_files = nm-vpnc-auth-dialog.desktop.in.in
-desktop_in_files = nm-vpnc-auth-dialog.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+CLEANFILES = *~
-EXTRA_DIST = \
- $(desktop_in_in_files)
-
-CLEANFILES = \
- *~ \
- $(desktop_DATA)
-
-DISTCLEANFILES = \
- $(desktop_in_files)
diff --git a/configure.ac b/configure.ac
index 7b42058..847a4bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,13 +117,10 @@ if ! test x"$ac_distver" = x""; then
AC_DEFINE_UNQUOTED(DIST_VERSION, "$ac_distver", [Define the distribution version string])
fi
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
-
AC_CONFIG_FILES([
Makefile
src/Makefile
auth-dialog/Makefile
-auth-dialog/nm-vpnc-auth-dialog.desktop.in
properties/Makefile
properties/tests/Makefile
properties/tests/pcf/Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]