Commit 598b2edb authored by Michael Biebl's avatar Michael Biebl

Imported Upstream version 0.8.3.995

parent 184ac1d4
......@@ -167,8 +167,6 @@ GCONF_LIBS = @GCONF_LIBS@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLADE_CFLAGS = @GLADE_CFLAGS@
GLADE_LIBS = @GLADE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMEKEYRING_CFLAGS = @GNOMEKEYRING_CFLAGS@
......
=======================================================
network-manager-openvpn-0.8.4
Overview of changes since network-manager-openvpn-0.8.2
=======================================================
This is a new stable release of network-manager-openvpn. Notable changes include:
* Updated translations
* Convert to GtkBuilder; glade is not longer a build requirement
* Show unencrypted private keys in private key selection file chooser
* Allow larger renegotiation intervals
* Handle secrets for system connections
* Fix handling of various HTTP proxy password issues
=======================================================
network-manager-openvpn-0.8.2
Overview of changes since network-manager-openvpn-0.8.1
......
......@@ -8,7 +8,7 @@ nm_openvpn_auth_dialog_CPPFLAGS = \
$(GNOMEKEYRING_CFLAGS) \
-I$(top_srcdir)/
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
......
......@@ -114,8 +114,6 @@ GCONF_LIBS = @GCONF_LIBS@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLADE_CFLAGS = @GLADE_CFLAGS@
GLADE_LIBS = @GLADE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMEKEYRING_CFLAGS = @GNOMEKEYRING_CFLAGS@
......@@ -604,7 +602,7 @@ uninstall-am: uninstall-libexecPROGRAMS
tags uninstall uninstall-am uninstall-libexecPROGRAMS
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
......
......@@ -110,8 +110,6 @@ GCONF_LIBS = @GCONF_LIBS@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLADE_CFLAGS = @GLADE_CFLAGS@
GLADE_LIBS = @GLADE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMEKEYRING_CFLAGS = @GNOMEKEYRING_CFLAGS@
......
......@@ -108,8 +108,6 @@ GCONF_LIBS = @GCONF_LIBS@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLADE_CFLAGS = @GLADE_CFLAGS@
GLADE_LIBS = @GLADE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMEKEYRING_CFLAGS = @GNOMEKEYRING_CFLAGS@
......
This diff is collapsed.
AC_PREREQ(2.52)
AC_INIT(NetworkManager-openvpn, 0.8.2, dcbw@redhat.com, NetworkManager-openvpn)
AC_INIT(NetworkManager-openvpn, 0.8.3.995, dcbw@redhat.com, NetworkManager-openvpn)
AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
......@@ -66,10 +66,10 @@ AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
PKG_CHECK_MODULES(NETWORK_MANAGER,
NetworkManager >= 0.8.2
libnm-util >= 0.8.2
libnm-glib >= 0.8.2
libnm-glib-vpn >= 0.8.2)
NetworkManager >= 0.8.3
libnm-util >= 0.8.3
libnm-glib >= 0.8.3
libnm-glib-vpn >= 0.8.3)
AC_SUBST(NETWORK_MANAGER_CFLAGS)
AC_SUBST(NETWORK_MANAGER_LIBS)
......@@ -82,10 +82,6 @@ if test x"$with_gnome" != xno; then
AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS)
PKG_CHECK_MODULES(GLADE, libglade-2.0)
AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS)
PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
......
......@@ -10,7 +10,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
-Wdeclaration-after-statement -Wstrict-prototypes \
-Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
-fno-strict-aliasing; do
-fno-strict-aliasing -Wno-unused-but-set-variable; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
AC_MSG_CHECKING([whether gcc understands $option])
......
......@@ -4,6 +4,7 @@ ar
as
bg
ca
ca@valencia
cs
da
de
......@@ -35,6 +36,7 @@ pl
ps
pt
pt_BR
ro
ru
sk
sl
......
......@@ -5,7 +5,7 @@ auth-dialog/main.c
nm-openvpn.desktop.in
properties/auth-helpers.c
properties/nm-openvpn.c
properties/nm-openvpn-dialog.glade
properties/nm-openvpn-dialog.ui
src/nm-openvpn-service.c
src/nm-openvpn-service-openvpn-helper.c
This diff is collapsed.
This diff is collapsed.
......@@ -12,10 +12,11 @@ msgstr ""
"Project-Id-Version: NetworkManager-openvpn\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=NetworkManager&component=VPN: openvpn\n"
"POT-Creation-Date: 2010-09-08 13:12+0000\n"
"POT-Creation-Date: 2010-11-27 12:44+0000\n"
"PO-Revision-Date: 2010-09-09 23:34+0300\n"
"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
"Language-Team: Estonian <gnome-et@linux.ee>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......
# translation of eu.po to Basque
# translation of eu_to_be_translate.po to Basque
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2008, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: eu\n"
"Project-Id-Version: eu_to_be_translate\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-20 19:28+0100\n"
"PO-Revision-Date: 2010-03-20 19:38+0100\n"
"POT-Creation-Date: 2010-11-19 16:36+0100\n"
"PO-Revision-Date: 2010-11-19 16:38+0100\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
"MIME-Version: 1.0\n"
......@@ -33,11 +33,11 @@ msgstr "_Erabiltzaile-izena:"
msgid "_Domain:"
msgstr "_Domeinua:"
#: ../auth-dialog/gnome-two-password-dialog.c:342
#: ../auth-dialog/gnome-two-password-dialog.c:346
msgid "Connect _anonymously"
msgstr "Konektatu _anonimo gisa"
#: ../auth-dialog/gnome-two-password-dialog.c:347
#: ../auth-dialog/gnome-two-password-dialog.c:351
msgid "Connect as _user:"
msgstr "Konektatu _erabiltzaile gisa:"
......@@ -84,55 +84,68 @@ msgstr "Aukeratu gako pribatua..."
msgid "Choose an OpenVPN static key..."
msgstr "Aukeratu OpenVPN gako estatikoa..."
#: ../properties/auth-helpers.c:326 ../properties/auth-helpers.c:1057
#: ../properties/auth-helpers.c:1311
#: ../properties/auth-helpers.c:326 ../properties/auth-helpers.c:1078
#: ../properties/auth-helpers.c:1443
msgid "None"
msgstr "Bat ere ez"
#: ../properties/auth-helpers.c:769
#: ../properties/auth-helpers.c:775
msgid "PEM or PKCS#12 certificates (*.pem, *.crt, *.key, *.cer, *.p12)"
msgstr "PEM edo PKCS#12 ziurtagiriak (*.pem, *.crt, *.key, *.cer, *.p12)"
#: ../properties/auth-helpers.c:770
#: ../properties/auth-helpers.c:776
msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)"
msgstr "PEM ziurtagiriak (*.pem, *.crt, *.key, *.cer)"
#: ../properties/auth-helpers.c:830
#: ../properties/auth-helpers.c:836
msgid "OpenVPN Static Keys (*.key)"
msgstr "OpenVPN gako estatikoak (*.key)"
#: ../properties/auth-helpers.c:974 ../properties/auth-helpers.c:1049
#: ../properties/auth-helpers.c:995 ../properties/auth-helpers.c:1070
msgid "Default"
msgstr "Lehenetsia"
#: ../properties/auth-helpers.c:1059
#: ../properties/auth-helpers.c:1080
msgid "MD-5"
msgstr "MD-5"
#: ../properties/auth-helpers.c:1061
#: ../properties/auth-helpers.c:1082
msgid "SHA-1"
msgstr "SHA-1"
#: ../properties/auth-helpers.c:1063
#: ../properties/auth-helpers.c:1084
msgid "SHA-224"
msgstr "SHA-224"
#: ../properties/auth-helpers.c:1065
#: ../properties/auth-helpers.c:1086
msgid "SHA-256"
msgstr "SHA-256"
#: ../properties/auth-helpers.c:1067
#: ../properties/auth-helpers.c:1088
msgid "SHA-384"
msgstr "SHA-384"
#: ../properties/auth-helpers.c:1069
#: ../properties/auth-helpers.c:1090
msgid "SHA-512"
msgstr "SHA-512"
#: ../properties/auth-helpers.c:1071
#: ../properties/auth-helpers.c:1092
msgid "RIPEMD-160"
msgstr "RIPEMD-160"
#: ../properties/auth-helpers.c:1245
#: ../properties/nm-openvpn-dialog.glade.h:16
msgid "Not required"
msgstr "Ez da beharrezkoa"
#: ../properties/auth-helpers.c:1247
msgid "HTTP"
msgstr "HTTP"
#: ../properties/auth-helpers.c:1249
msgid "SOCKS"
msgstr "SOCKS"
#: ../properties/nm-openvpn.c:53
msgid "OpenVPN"
msgstr "OpenVPN"
......@@ -174,7 +187,8 @@ msgid ""
"<i>Connect only to servers whose certificate matches the given subject.\n"
"Example: /CN=myvpn.company.com</i>"
msgstr ""
"<i>Konektatu soilik emandako gaiarekin bat datozten ziurtagiriak dituzten zerbitzariekin.\n"
"<i>Konektatu soilik emandako gaiarekin bat datozten ziurtagiriak dituzten "
"zerbitzariekin.\n"
"Adibidez: /CN=nirevpn.enpresa.com</i>"
#: ../properties/nm-openvpn-dialog.glade.h:6
......@@ -189,126 +203,162 @@ msgstr ""
"administratzailearekin harremanetan.</i>"
#: ../properties/nm-openvpn-dialog.glade.h:7
msgid ""
"<i>Select this option if your organization requires the use of a proxy "
"server to access the Internet.</i>"
msgstr ""
"<i>Hautatu aukera hau erakundeak proxy zerbitzari bat behar badu Internetera "
"sarbidetzeko.</i>"
#: ../properties/nm-openvpn-dialog.glade.h:8
msgid "Ad_vanced..."
msgstr "_Aurreratua..."
#: ../properties/nm-openvpn-dialog.glade.h:8
#: ../properties/nm-openvpn-dialog.glade.h:9
msgid "CA Certificate:"
msgstr "ZE ziurtagiria:"
#: ../properties/nm-openvpn-dialog.glade.h:9
#: ../properties/nm-openvpn-dialog.glade.h:10
msgid "Cipher:"
msgstr "Zifratua:"
#: ../properties/nm-openvpn-dialog.glade.h:10
#: ../properties/nm-openvpn-dialog.glade.h:11
msgid "General"
msgstr "Orokorra"
#: ../properties/nm-openvpn-dialog.glade.h:11
#: ../properties/nm-openvpn-dialog.glade.h:12
msgid "HMAC Authentication:"
msgstr "HMAC autentifikazioa:"
#: ../properties/nm-openvpn-dialog.glade.h:12
#: ../properties/nm-openvpn-dialog.glade.h:13
msgid "Key Direction:"
msgstr "Gakoaren helbidea:"
#: ../properties/nm-openvpn-dialog.glade.h:13
#: ../properties/nm-openvpn-dialog.glade.h:14
msgid "Key File:"
msgstr "Gakoaren fitxategia:"
#: ../properties/nm-openvpn-dialog.glade.h:14
#: ../properties/nm-openvpn-dialog.glade.h:15
msgid "Local IP Address:"
msgstr "IP helbide lokala:"
#: ../properties/nm-openvpn-dialog.glade.h:15
#: ../properties/nm-openvpn-dialog.glade.h:17
msgid "OpenVPN Advanced Options"
msgstr "OpenVPN-ren aukera aurreratuak"
#: ../properties/nm-openvpn-dialog.glade.h:16
#: ../properties/nm-openvpn-dialog.glade.h:18
msgid "Password:"
msgstr "Pasahitza:"
#: ../properties/nm-openvpn-dialog.glade.h:17
#: ../properties/nm-openvpn-dialog.glade.h:19
msgid "Port:"
msgstr "Ataka:"
#: ../properties/nm-openvpn-dialog.glade.h:20
msgid "Private Key Password:"
msgstr "Gako pribatuaren pasahitza:"
#: ../properties/nm-openvpn-dialog.glade.h:18
#: ../properties/nm-openvpn-dialog.glade.h:21
msgid "Private Key:"
msgstr "Gako pribatua:"
#: ../properties/nm-openvpn-dialog.glade.h:19
#: ../properties/nm-openvpn-dialog.glade.h:22
msgid "Proxies"
msgstr "Proxy-ak"
#: ../properties/nm-openvpn-dialog.glade.h:23
msgid "Proxy Password:"
msgstr "Proxy-aren pasahitza:"
#: ../properties/nm-openvpn-dialog.glade.h:24
msgid "Proxy Type:"
msgstr "Proxy mota:"
#: ../properties/nm-openvpn-dialog.glade.h:25
msgid "Proxy Username:"
msgstr "Proxy-aren erabiltzaile-izena:"
#: ../properties/nm-openvpn-dialog.glade.h:26
msgid "Remote IP Address:"
msgstr "Urruneko IP helbidea:"
#: ../properties/nm-openvpn-dialog.glade.h:20
#: ../properties/nm-openvpn-dialog.glade.h:27
msgid "Restrict tunnel TCP Maximum Segment Size (MSS)"
msgstr "Murriztu TCP tunela gehienezko segmentu-tamainara (MSS)"
#: ../properties/nm-openvpn-dialog.glade.h:21
#: ../properties/nm-openvpn-dialog.glade.h:28
msgid "Retry indefinitely when errors occur"
msgstr "Saiatu behin et berriz errorea gertatzean"
#: ../properties/nm-openvpn-dialog.glade.h:29
msgid "Security"
msgstr "Segurtasuna"
#: ../properties/nm-openvpn-dialog.glade.h:22
#: ../properties/nm-openvpn-dialog.glade.h:30
msgid "Server Address:"
msgstr "Zerbitzariaren helbidea:"
#: ../properties/nm-openvpn-dialog.glade.h:31
msgid "Show passwords"
msgstr "Erakutsi pasahitzak"
#: ../properties/nm-openvpn-dialog.glade.h:23
#: ../properties/nm-openvpn-dialog.glade.h:32
msgid "Static Key:"
msgstr "Gako estatikoa:"
#: ../properties/nm-openvpn-dialog.glade.h:24
#: ../properties/nm-openvpn-dialog.glade.h:33
msgid "Subject Match:"
msgstr "Gaiaren bat etortzea:"
#: ../properties/nm-openvpn-dialog.glade.h:25
#: ../properties/nm-openvpn-dialog.glade.h:34
msgid "TLS Authentication"
msgstr "TLS autentifikazioa"
#: ../properties/nm-openvpn-dialog.glade.h:26
#: ../properties/nm-openvpn-dialog.glade.h:35
msgid "Type:"
msgstr "Mota:"
#: ../properties/nm-openvpn-dialog.glade.h:27
#: ../properties/nm-openvpn-dialog.glade.h:36
msgid "Use L_ZO data compression"
msgstr "Erabili _LZO datu-konpresioa"
#: ../properties/nm-openvpn-dialog.glade.h:28
#: ../properties/nm-openvpn-dialog.glade.h:37
msgid "Use a TA_P device"
msgstr "Erabili TA_P gailua"
#: ../properties/nm-openvpn-dialog.glade.h:29
#: ../properties/nm-openvpn-dialog.glade.h:38
msgid "Use a _TCP connection"
msgstr "Erabili _TCP konexioa"
#: ../properties/nm-openvpn-dialog.glade.h:30
#: ../properties/nm-openvpn-dialog.glade.h:39
msgid "Use additional TLS authentication"
msgstr "Erabili TLS autentifikazio gehigarria"
#: ../properties/nm-openvpn-dialog.glade.h:31
#: ../properties/nm-openvpn-dialog.glade.h:40
msgid "Use custom UDP _fragment size:"
msgstr "Erabili UDP _zatiaren tamaina pertsonalizatua:"
#: ../properties/nm-openvpn-dialog.glade.h:32
#: ../properties/nm-openvpn-dialog.glade.h:41
msgid "Use custom _renegotiation interval:"
msgstr "Erabili berriro negoziatzeko bitarte pertsonalizatua:"
#: ../properties/nm-openvpn-dialog.glade.h:33
#: ../properties/nm-openvpn-dialog.glade.h:42
msgid "Use custom _tunnel Maximum Transmission Unit (MTU):"
msgstr "Erabili _tunelaren Gehienezko Transmisio Unitatea (MTU) pertsonalizatua:"
msgstr ""
"Erabili _tunelaren Gehienezko Transmisio Unitatea (MTU) pertsonalizatua:"
#: ../properties/nm-openvpn-dialog.glade.h:34
#: ../properties/nm-openvpn-dialog.glade.h:43
msgid "Use custom gateway p_ort:"
msgstr "Erabili atebidearen _ataka pertsonalizatua:"
#: ../properties/nm-openvpn-dialog.glade.h:35
#: ../properties/nm-openvpn-dialog.glade.h:44
msgid "User Certificate:"
msgstr "Erabiltzailearen ziurtagiria:"
#: ../properties/nm-openvpn-dialog.glade.h:36
#: ../properties/nm-openvpn-dialog.glade.h:45
msgid "User name:"
msgstr "Erabiltzaile-izena:"
#: ../properties/nm-openvpn-dialog.glade.h:37
#: ../properties/nm-openvpn-dialog.glade.h:46
msgid "_Gateway:"
msgstr "_Atebidea:"
This diff is collapsed.
......@@ -11,11 +11,10 @@ libnm_openvpn_properties_la_SOURCES = \
import-export.c \
import-export.h
gladedir = $(datadir)/gnome-vpn-properties/openvpn
glade_DATA = nm-openvpn-dialog.glade
uidir = $(datadir)/gnome-vpn-properties/openvpn
ui_DATA = nm-openvpn-dialog.ui
libnm_openvpn_properties_la_CFLAGS = \
$(GLADE_CFLAGS) \
$(GTK_CFLAGS) \
$(GCONF_CFLAGS) \
$(NETWORK_MANAGER_CFLAGS) \
......@@ -23,7 +22,7 @@ libnm_openvpn_properties_la_CFLAGS = \
$(DISABLE_DEPRECATED) \
-I$(top_srcdir)/ \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DUIDIR=\""$(uidir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
......@@ -31,7 +30,6 @@ libnm_openvpn_properties_la_CFLAGS = \
-DVERSION=\"$(VERSION)\"
libnm_openvpn_properties_la_LIBADD = \
$(GLADE_LIBS) \
$(GTK_LIBS) \
$(GCONF_LIBS) \
$(NETWORK_MANAGER_LIBS) \
......@@ -41,7 +39,7 @@ libnm_openvpn_properties_la_LIBADD = \
libnm_openvpn_properties_la_LDFLAGS = \
-avoid-version
CLEANFILES = *.bak *.gladep *~
CLEANFILES = *.bak *~
EXTRA_DIST = \
$(glade_DATA)
$(ui_DATA)
......@@ -70,12 +70,11 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)"
am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(uidir)"
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
libnm_openvpn_properties_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) \
$(top_builddir)/common-gnome/libnm-openvpn-common-gnome.la \
$(top_builddir)/common/libnm-openvpn-common.la
am_libnm_openvpn_properties_la_OBJECTS = \
......@@ -110,7 +109,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
DATA = $(glade_DATA)
DATA = $(ui_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
......@@ -181,8 +180,6 @@ GCONF_LIBS = @GCONF_LIBS@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLADE_CFLAGS = @GLADE_CFLAGS@
GLADE_LIBS = @GLADE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMEKEYRING_CFLAGS = @GNOMEKEYRING_CFLAGS@
......@@ -311,10 +308,9 @@ libnm_openvpn_properties_la_SOURCES = \
import-export.c \
import-export.h
gladedir = $(datadir)/gnome-vpn-properties/openvpn
glade_DATA = nm-openvpn-dialog.glade
uidir = $(datadir)/gnome-vpn-properties/openvpn
ui_DATA = nm-openvpn-dialog.ui
libnm_openvpn_properties_la_CFLAGS = \
$(GLADE_CFLAGS) \
$(GTK_CFLAGS) \
$(GCONF_CFLAGS) \
$(NETWORK_MANAGER_CFLAGS) \
......@@ -322,7 +318,7 @@ libnm_openvpn_properties_la_CFLAGS = \
$(DISABLE_DEPRECATED) \
-I$(top_srcdir)/ \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DUIDIR=\""$(uidir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
......@@ -330,7 +326,6 @@ libnm_openvpn_properties_la_CFLAGS = \
-DVERSION=\"$(VERSION)\"
libnm_openvpn_properties_la_LIBADD = \
$(GLADE_LIBS) \
$(GTK_LIBS) \
$(GCONF_LIBS) \
$(NETWORK_MANAGER_LIBS) \
......@@ -340,9 +335,9 @@ libnm_openvpn_properties_la_LIBADD = \
libnm_openvpn_properties_la_LDFLAGS = \
-avoid-version
CLEANFILES = *.bak *.gladep *~
CLEANFILES = *.bak *~
EXTRA_DIST = \
$(glade_DATA)
$(ui_DATA)
all: all-recursive
......@@ -472,26 +467,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
install-gladeDATA: $(glade_DATA)
install-uiDATA: $(ui_DATA)
@$(NORMAL_INSTALL)
test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gladedir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(gladedir)" || exit $$?; \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
done
uninstall-gladeDATA:
uninstall-uiDATA:
@$(NORMAL_UNINSTALL)
@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(gladedir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(gladedir)" && rm -f $$files
echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(uidir)" && rm -f $$files
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
......@@ -691,7 +686,7 @@ check: check-recursive
all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)"; do \
for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(uidir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
......@@ -743,7 +738,7 @@ info: info-recursive
info-am:
install-data-am: install-gladeDATA install-pluginLTLIBRARIES
install-data-am: install-pluginLTLIBRARIES install-uiDATA
install-dvi: install-dvi-recursive
......@@ -789,7 +784,7 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-gladeDATA uninstall-pluginLTLIBRARIES
uninstall-am: uninstall-pluginLTLIBRARIES uninstall-uiDATA
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
install-am install-strip tags-recursive
......@@ -800,16 +795,15 @@ uninstall-am: uninstall-gladeDATA uninstall-pluginLTLIBRARIES
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-gladeDATA \
install-html install-html-am install-info install-info-am \
install-man install-pdf install-pdf-am \
install-pluginLTLIBRARIES install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-gladeDATA \
uninstall-pluginLTLIBRARIES
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-pluginLTLIBRARIES \
install-ps install-ps-am install-strip install-uiDATA \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-pluginLTLIBRARIES uninstall-uiDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
......
This diff is collapsed.
......@@ -24,21 +24,20 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <nm-connection.h>
#include <nm-setting-vpn.h>
typedef void (*ChangedCallback) (GtkWidget *widget, gpointer user_data);
void fill_vpn_passwords (GladeXML *xml,
void fill_vpn_passwords (GtkBuilder *builder,
GtkSizeGroup *group,
NMConnection *connection,
const char *contype,
ChangedCallback changed_cb,
gpointer user_data);
void tls_pw_init_auth_widget (GladeXML *xml,
void tls_pw_init_auth_widget (GtkBuilder *builder,
GtkSizeGroup *group,
NMSettingVPN *s_vpn,
const char *contype,
......@@ -46,19 +45,19 @@ void tls_pw_init_auth_widget (GladeXML *xml,
ChangedCallback changed_cb,
gpointer user_data);
void sk_init_auth_widget (GladeXML *xml,
void sk_init_auth_widget (GtkBuilder *builder,
GtkSizeGroup *group,
NMSettingVPN *s_vpn,
ChangedCallback changed_cb,
gpointer user_data);
gboolean auth_widget_check_validity (GladeXML *xml, const char *contype, GError **error);
gboolean auth_widget_check_validity (GtkBuilder *builder, const char *contype, GError **error);
gboolean auth_widget_update_connection (GladeXML *xml,
gboolean auth_widget_update_connection (GtkBuilder *builder,
const char *contype,
NMSettingVPN *s_vpn);
gboolean auth_widget_save_secrets (GladeXML *xml,
gboolean auth_widget_save_secrets (GtkBuilder *builder,
const char *contype,
const char *uuid,
const char *name);
......
......@@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2008 - 2010 Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
* Copyright (C) 2008 - 2011 Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
*
**************************************************************************/
......@@ -393,7 +393,7 @@ do_import (const char *path, char **lines, GError **error)
errno = 0;
secs = strtol (items[0], NULL, 10);
if ((errno == 0) && (secs >= 0) && (secs < 604800)) {
if ((errno == 0) && (secs >= 0) && (secs <= 604800)) {
tmp = g_strdup_printf ("%d", (guint32) secs);
nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, tmp);
g_free (tmp);
......
This diff is collapsed.
......@@ -9,7 +9,6 @@ test_import_export_SOURCES = \
test_import_export_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GLADE_CFLAGS) \
$(GTK_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEKEYRING_CFLAGS) \
......@@ -18,7 +17,6 @@ test_import_export_CPPFLAGS = \
test_import_export_LDADD = \
$(GTHREAD_LIBS) \
$(GLADE_LIBS) \
$(GTK_LIBS) \
$(GCONF_LIBS) \
$(GNOMEKEYRING_LIBS) \
......
......@@ -57,7 +57,7 @@ am__DEPENDENCIES_1 =
test_import_export_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) \