summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/networkmanager-pptp/ChangeLog18
-rw-r--r--net-misc/networkmanager-pptp/Manifest41
-rw-r--r--net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.6.5_p200708206
-rw-r--r--net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch13
-rw-r--r--net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch25
-rw-r--r--net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch825
-rw-r--r--net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch220
-rw-r--r--net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch29
-rw-r--r--net-misc/networkmanager-pptp/networkmanager-pptp-0.6.5_p20070820.ebuild64
-rw-r--r--net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild2
10 files changed, 1238 insertions, 5 deletions
diff --git a/net-misc/networkmanager-pptp/ChangeLog b/net-misc/networkmanager-pptp/ChangeLog
new file mode 100644
index 0000000..747bf78
--- /dev/null
+++ b/net-misc/networkmanager-pptp/ChangeLog
@@ -0,0 +1,18 @@
+# ChangeLog for net-misc/networkmanager-pptp
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 29 Aug 2007; Robert Buchholz <rbu@gentoo.org>
+ +networkmanager-pptp-0.6.5_p20070820.ebuild,
+ +files/networkmanager-pptp-0.6.5_p20070820-patchset,
+ +files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch,
+ +files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-
+ dialog.patch,
+ +files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp
+ -parts.patch,
+ +files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subs
+ ystem-changes.patch,
+ +files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.pa
+ tch, networkmanager-pptp-0.7.0_pre20070621.ebuild:
+ Adding backport of trunk, doesn't fully work yet
+
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index 8621248..30b590c 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,12 +1,45 @@
+AUX networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch 449 RMD160 e297f283ba715f5f6849f07823d0759f1e7a52c7 SHA1 b54eb9abfb110f97a9d958695a14bf3836714547 SHA256 c6d992353570fc4d60ad9ec311a9a7093535fde453882f0311a4a3c78977d1c0
+MD5 0c210f93b95908fce006bf0909960a62 files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch 449
+RMD160 e297f283ba715f5f6849f07823d0759f1e7a52c7 files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch 449
+SHA256 c6d992353570fc4d60ad9ec311a9a7093535fde453882f0311a4a3c78977d1c0 files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch 449
+AUX networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch 631 RMD160 df5236616e7c095eab594f56f4219786b768a13f SHA1 444f8b3b95ee459ce40e1839b095a56373d27fdb SHA256 65551a10892a61b9e0478f7f900e5c1526984e93eefe71c38a174391725e806c
+MD5 4ebb2e199ff5ee928e3f3515b7f136e3 files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch 631
+RMD160 df5236616e7c095eab594f56f4219786b768a13f files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch 631
+SHA256 65551a10892a61b9e0478f7f900e5c1526984e93eefe71c38a174391725e806c files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch 631
+AUX networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch 33861 RMD160 5176d17e72cc7c3f03a16a7634aaa5588f679d86 SHA1 c33d08813c07ca81624a296d978312b97a8045e0 SHA256 6d398cfcc96479814fde98685cca99dd040b53f98eb2ef37e7cb4aa8794951e4
+MD5 91691ccdd839119f4a6d9c0fd95b03e3 files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch 33861
+RMD160 5176d17e72cc7c3f03a16a7634aaa5588f679d86 files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch 33861
+SHA256 6d398cfcc96479814fde98685cca99dd040b53f98eb2ef37e7cb4aa8794951e4 files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch 33861
+AUX networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch 7389 RMD160 5a5fc2417c84af7eb7923d97441df66d2f27670f SHA1 a6ff9898cee5dc3deb990e7983378a07e2e4be4e SHA256 651e554e00302f11aac844f850176d47cbcc473b73a0923a43e0122057cf7dd6
+MD5 115ca038c284bee1c19c3155008fa8bf files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch 7389
+RMD160 5a5fc2417c84af7eb7923d97441df66d2f27670f files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch 7389
+SHA256 651e554e00302f11aac844f850176d47cbcc473b73a0923a43e0122057cf7dd6 files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch 7389
+AUX networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch 921 RMD160 e3882c6848b69ede84f0b70c027500cf0d2a863c SHA1 55f1f3b6f667f3f13ebfa5207f1dad4e857629c1 SHA256 bd97906243d4116b31321fb101f27d96be182c6f7fbddb0bad8d8fdeabd9e3a9
+MD5 4a855459d15ae7699f9db18ab2f1e519 files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch 921
+RMD160 e3882c6848b69ede84f0b70c027500cf0d2a863c files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch 921
+SHA256 bd97906243d4116b31321fb101f27d96be182c6f7fbddb0bad8d8fdeabd9e3a9 files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch 921
DIST NetworkManager-ppp_vpn-0.7.0_pre20070621.tar.gz 568340 RMD160 30b9dafa41e616460045847b97efd0e4b8dd3824 SHA1 7f29ffeafb3767e2909b20305fab67863a2e8aa5 SHA256 ea934673c57a50b094797c677c6a76dba8042f696d02ab379dcd57d1a1f19999
-EBUILD networkmanager-pptp-0.7.0_pre20070621.ebuild 1263 RMD160 e95b8ed282a7a152b20ab5d7053b9e86624742ca SHA1 9210f25107f091e8b8a036d6e5fba0572b12622a SHA256 17735fb3850feb5a577b774eda44bcbe6e470a5e99a2fd12bafaf40526d85ea4
-MD5 677dbfd22b7fdd77079725a49d7bdd1a networkmanager-pptp-0.7.0_pre20070621.ebuild 1263
-RMD160 e95b8ed282a7a152b20ab5d7053b9e86624742ca networkmanager-pptp-0.7.0_pre20070621.ebuild 1263
-SHA256 17735fb3850feb5a577b774eda44bcbe6e470a5e99a2fd12bafaf40526d85ea4 networkmanager-pptp-0.7.0_pre20070621.ebuild 1263
+DIST NetworkManager-pptp-0.6.5_p20070820.tar.gz 565989 RMD160 deec889de25bf4295473b85674d554eba4f0ced8 SHA1 da67b135d6974643e3ad32b42987b38e8b9ee590 SHA256 fdb02ce57a55264fa94f2a966f162922e703be7530e988fa698dc4ec54427fa3
+DIST networkmanager-pptp-0.6.5_p20070820-patchset.tar.gz 6965 RMD160 dff290c0286634d28a8e9b96225755b6c594c6d8 SHA1 a48ca7b2a6b95e7476d68be0fe0f0a593e01c16e SHA256 2aa2efe405875aa1d83b6ee70dc531e5dd7ee146f0dd5f74af6bc5fdb076ca1e
+EBUILD networkmanager-pptp-0.6.5_p20070820.ebuild 1731 RMD160 cf493a643e8a27b6cf2bcabaebd4999527d980cd SHA1 bde70c986e8301897bcb6781173435db00b7e151 SHA256 ccbcab47302b38d1ea8b5159ee4abb73e19bd0a78db45b85596edd583cbc29c1
+MD5 4ea2b2ab2bce8e9d86d167ce4e825b9e networkmanager-pptp-0.6.5_p20070820.ebuild 1731
+RMD160 cf493a643e8a27b6cf2bcabaebd4999527d980cd networkmanager-pptp-0.6.5_p20070820.ebuild 1731
+SHA256 ccbcab47302b38d1ea8b5159ee4abb73e19bd0a78db45b85596edd583cbc29c1 networkmanager-pptp-0.6.5_p20070820.ebuild 1731
+EBUILD networkmanager-pptp-0.7.0_pre20070621.ebuild 1243 RMD160 48ca1367903ab8f4de0b0c648fdd749cd47f1efa SHA1 1c12aa520e051ef269157c4363be43f414134100 SHA256 07c0dabf3b72932b2cdfca0b718f7a29f65ea228ffc321b24cadd2b8737b01e0
+MD5 8ba7921f9dbc7dba952c2513f2992475 networkmanager-pptp-0.7.0_pre20070621.ebuild 1243
+RMD160 48ca1367903ab8f4de0b0c648fdd749cd47f1efa networkmanager-pptp-0.7.0_pre20070621.ebuild 1243
+SHA256 07c0dabf3b72932b2cdfca0b718f7a29f65ea228ffc321b24cadd2b8737b01e0 networkmanager-pptp-0.7.0_pre20070621.ebuild 1243
+MISC ChangeLog 822 RMD160 1a50c8852ba0568f31bf7f7879418ad72a4ebf48 SHA1 f2bab286280268d7663a5c3aa41f24441d5a82c5 SHA256 3c566fab17840eceaad4e8bd2365825d62f9a119de522f1a98b78aa3026ba187
+MD5 6bd69e381fa84a1126bd3af582330833 ChangeLog 822
+RMD160 1a50c8852ba0568f31bf7f7879418ad72a4ebf48 ChangeLog 822
+SHA256 3c566fab17840eceaad4e8bd2365825d62f9a119de522f1a98b78aa3026ba187 ChangeLog 822
MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967
MD5 cde19aea2ad5bbd47a8660b625acbd60 metadata.xml 881
RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a metadata.xml 881
SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 metadata.xml 881
+MD5 d69e344c592f9142ef986b0064eae1ef files/digest-networkmanager-pptp-0.6.5_p20070820 635
+RMD160 05db13af117db7ecc51369dee1e5f86b5ad128c5 files/digest-networkmanager-pptp-0.6.5_p20070820 635
+SHA256 28a2946a3e6a055f714d10fb38321b3c9963e23f9161f5f8861b26d346cecdf1 files/digest-networkmanager-pptp-0.6.5_p20070820 635
MD5 229dcb3e57f92f1d6f2c6a8c278fc1db files/digest-networkmanager-pptp-0.7.0_pre20070621 322
RMD160 5ecfc7814dce68826237b98dc2c1cced77ecd376 files/digest-networkmanager-pptp-0.7.0_pre20070621 322
SHA256 c320eef5275bebf0bca000b564c10202339e9ddd6ac43f062ac8cb24e9455e41 files/digest-networkmanager-pptp-0.7.0_pre20070621 322
diff --git a/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.6.5_p20070820 b/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.6.5_p20070820
new file mode 100644
index 0000000..dc502ab
--- /dev/null
+++ b/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.6.5_p20070820
@@ -0,0 +1,6 @@
+MD5 e13cda2dff8061c1e6965026ecc3da3b NetworkManager-pptp-0.6.5_p20070820.tar.gz 565989
+RMD160 deec889de25bf4295473b85674d554eba4f0ced8 NetworkManager-pptp-0.6.5_p20070820.tar.gz 565989
+SHA256 fdb02ce57a55264fa94f2a966f162922e703be7530e988fa698dc4ec54427fa3 NetworkManager-pptp-0.6.5_p20070820.tar.gz 565989
+MD5 d1976be463b194e3bee0798db9646bcc networkmanager-pptp-0.6.5_p20070820-patchset.tar.gz 6965
+RMD160 dff290c0286634d28a8e9b96225755b6c594c6d8 networkmanager-pptp-0.6.5_p20070820-patchset.tar.gz 6965
+SHA256 2aa2efe405875aa1d83b6ee70dc531e5dd7ee146f0dd5f74af6bc5fdb076ca1e networkmanager-pptp-0.6.5_p20070820-patchset.tar.gz 6965
diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch
new file mode 100644
index 0000000..3a7ecee
--- /dev/null
+++ b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch
@@ -0,0 +1,13 @@
+Index: configure.in
+===================================================================
+--- configure.in (revision 2743)
++++ configure.in (working copy)
+@@ -111,7 +111,7 @@
+ AC_SUBST(DBUS_CFLAGS)
+ AC_SUBST(DBUS_LIBS)
+
+-PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1 libnm-util >= 0.7.0)
++PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1 libnm-util >= 0.6.5)
+ AC_SUBST(NETWORK_MANAGER_CFLAGS)
+ AC_SUBST(NETWORK_MANAGER_LIBS)
+
diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch
new file mode 100644
index 0000000..7c4ed2e
--- /dev/null
+++ b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch
@@ -0,0 +1,25 @@
+Index: configure.in
+===================================================================
+--- configure.in (Revision 2743)
++++ configure.in (Arbeitskopie)
+@@ -191,7 +191,6 @@
+ Makefile
+ src/Makefile
+ auth-dialog/Makefile
+-auth-dialog-general/Makefile
+ properties/Makefile
+ po/Makefile.in
+ ])
+Index: Makefile.am
+===================================================================
+--- Makefile.am (Revision 2743)
++++ Makefile.am (Arbeitskopie)
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign
+
+ if WITH_GNOME
+-SUBDIRS = src auth-dialog auth-dialog-general properties po
++SUBDIRS = src auth-dialog properties po
+ else
+ SUBDIRS = src
+ endif
diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch
new file mode 100644
index 0000000..255c51d
--- /dev/null
+++ b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch
@@ -0,0 +1,825 @@
+## 03_nm_ppp_dialog.glade.patch.dpatch by Craig Box <ubuntu@dubculture.co.nz>
+## 04_nm_ppp_properties.c.dpatch by Craig Box <ubuntu@dubculture.co.nz>
+
+--- properties/nm-ppp-dialog.glade (Revision 2743)
++++ properties/nm-ppp-dialog.glade (Arbeitskopie)
+@@ -286,305 +286,6 @@
+ </packing>
+ </child>
+
+- <child>
+- <widget class="GtkVBox" id="dialup-front">
+- <property name="homogeneous">False</property>
+- <property name="spacing">4</property>
+-
+- <child>
+- <widget class="GtkHBox" id="hbox20">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">12</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label47">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Telep_hone number:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">1</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">phone-number</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="phone-number">
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Host name or IP address of the PPTP server</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkVBox" id="bluetooth-front">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkTable" id="table99">
+- <property name="visible">True</property>
+- <property name="n_rows">2</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">False</property>
+- <property name="row_spacing">6</property>
+- <property name="column_spacing">12</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label53">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">C_hannel:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">bt-channel</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="bt-channel">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">3</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="bt-bdaddr">
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Host name or IP address of the PPTP server</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">17</property>
+- <property name="text" translatable="yes">00:00:00:00</property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHBox" id="hbox21">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">12</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label49">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">_Device address:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">1</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">bt-bdaddr</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="x_options">fill</property>
+- <property name="y_options">fill</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHButtonBox" id="hbuttonbox2">
+- <property name="visible">True</property>
+- <property name="layout_style">GTK_BUTTONBOX_END</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkButton" id="bt-find-device">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment28">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">0</property>
+- <property name="yscale">0</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">0</property>
+- <property name="left_padding">0</property>
+- <property name="right_padding">0</property>
+-
+- <child>
+- <widget class="GtkHBox" id="hbox32">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">2</property>
+-
+- <child>
+- <widget class="GtkImage" id="image2">
+- <property name="visible">True</property>
+- <property name="stock">gtk-find</property>
+- <property name="icon_size">4</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label92">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Find Device</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+@@ -711,226 +412,6 @@
+ </child>
+
+ <child>
+- <widget class="GtkTable" id="gprs-options">
+- <property name="border_width">12</property>
+- <property name="visible">True</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">False</property>
+- <property name="row_spacing">6</property>
+- <property name="column_spacing">12</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label54">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">_Access point name:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">1</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">gprs-apn</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="gprs-apn">
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Service providers GPRS access point from device config</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label57">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">IP a_ddress:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">gprs-ip-address</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="gprs-ip-address">
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Service providers IP address</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label58">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">_Packet type:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">gprs-packet-type</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="gprs-packet-type">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- <property name="width_chars">9</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label59">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Context _number:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">gprs-context-num</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="gprs-context-num">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- <property name="width_chars">3</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="tab_expand">False</property>
+- <property name="tab_fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+ <widget class="GtkLabel" id="label76">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">GPRS Options</property>
+@@ -2075,80 +1556,6 @@
+ </child>
+
+ <child>
+- <widget class="GtkVBox" id="serial-options">
+- <property name="border_width">12</property>
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkCheckButton" id="ppp-modem">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="label" translatable="yes">_Modem connection</property>
+- <property name="use_underline">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <property name="active">False</property>
+- <property name="inconsistent">False</property>
+- <property name="draw_indicator">True</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkCheckButton" id="ppp-crtscts">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="label" translatable="yes">_Hardware RTS/CTS</property>
+- <property name="use_underline">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <property name="active">False</property>
+- <property name="inconsistent">False</property>
+- <property name="draw_indicator">True</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="tab_expand">False</property>
+- <property name="tab_fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label80">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Serial Options</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="type">tab</property>
+- </packing>
+- </child>
+-
+- <child>
+ <widget class="GtkVBox" id="routing-options">
+ <property name="border_width">12</property>
+ <property name="visible">True</property>
+diff -urNad network-manager-pptp-0.6.4+pptp0.6.5~/properties/nm-ppp-properties.c network-manager-pptp-0.6.4+pptp0.6.5/properties/nm-ppp-properties.c
+--- properties/nm-ppp-properties.c 2007-05-26 12:19:31.000000000 +1200
++++ properties/nm-ppp-properties.c 2007-05-26 12:18:27.000000000 +1200
+@@ -42,7 +42,7 @@
+
+ #define BUILD_BLUETOOTH
+
+-#define VPNUI_DISPLAY_NAME _("pppd tunnel (PPTP, BTGPRS, Dialup)")
++#define VPNUI_DISPLAY_NAME _("PPTP tunnel")
+ #define VPNUI_SERVICE_NAME "org.freedesktop.NetworkManager.ppp_starter"
+ #define VPNUI_BASIC_DEFAULTS "connection-name='';" \
+ "ppp-debug=no;" \
+@@ -50,7 +50,7 @@
+ "usepeerdns-overtunnel=yes;" \
+ "ppp-lock=yes;" \
+ "ppp-auth-peer=no;" \
+- "ppp-refuse-eap=no;" \
++ "ppp-refuse-eap=yes;" \
+ "ppp-refuse-chap=no;" \
+ "ppp-refuse-mschap=no;" \
+ "lcp-echo-failure=10;" \
+@@ -59,26 +59,6 @@
+ "routes=;" \
+ "ppp-debug=no;" \
+ "ppp-extra='';"
+-#define VPNUI_BTOOTH_DEFAULTS "bt-bdaddr=00:00:00:00:00:00;" \
+- "bt-channel=1;"
+-#define VPNUI_GPRS_DEFAULTS "gprs-packet-type=IP;" \
+- "gprs-context-num=1;" \
+- "gprs-ip-address=0.0.0.0;" \
+- "gprs-apn=internet;" \
+- "ppp-crtscts=yes;" \
+- "ppp-noipdefault=yes;" \
+- "ppp-modem=yes;" \
+- "usepeerdns=yes;" \
+- "ppp-connect-delay=5000;"
+-#define VPNUI_BTGPRS_DEFAULTS "ppp-connection-type=btgprs;" \
+- "encrypt-mppe=no;" \
+- "encrypt-mppe-128=no;" \
+- "encrypt-mppe-stateful=no;" \
+- "compress-mppc=no;" \
+- "compress-bsd=no;" \
+- "compress-deflate=no;" \
+- "mru=1000;" \
+- "mtu=1000;"
+ #define VPNUI_PPTP_DEFAULTS "pptp-remote='';" \
+ "ppp-connection-type=pptp;" \
+ "encrypt-mppe=no;" \
+@@ -89,18 +69,6 @@
+ "compress-deflate=no;" \
+ "mru=1416;" \
+ "mtu=1416;"
+-#define VPNUI_DIALUP_DEFAULTS "phone-number=THIS DOESN'T DO ANYTHING;" \
+- "ppp-crtscts=yes;" \
+- "ppp-modem=yes;" \
+- "ppp-connection-type=dialup;" \
+- "encrypt-mppe=no;" \
+- "encrypt-mppe-128=no;" \
+- "encrypt-mppe-stateful=no;" \
+- "compress-mppc=no;" \
+- "compress-bsd=no;" \
+- "compress-deflate=no;" \
+- "mru=1000;" \
+- "mtu=1000;"
+
+ #ifdef NMVPNUI_PPTP_PROPERTIES_C
+ #endif
+@@ -192,51 +160,6 @@
+ GTK_SIGNAL_FUNC(&editable_changed), NULL, impl );
+
+ opt = vpnui_opt_new(
+- "phone-number", VPN_UI_OPTTYPE_STRING,
+- "phone-number", "Telephone-Number", _("Telephone Number"),
+- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl );
+-
+- opt = vpnui_opt_new(
+- "bt-bdaddr", VPN_UI_OPTTYPE_STRING,
+- "bt-bdaddr", "Bluetooth-Address", _("Bluetooth Address"),
+- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl );
+-
+- opt = vpnui_opt_new(
+- "bt-channel", VPN_UI_OPTTYPE_STRING,
+- "bt-channel", "Bluetooth-Channel", _("Bluetooth Channel"),
+- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl );
+-
+- opt = vpnui_opt_new(
+- "gprs-apn", VPN_UI_OPTTYPE_STRING,
+- "gprs-apn", "GPRS-Access-Point-Name", _("GPRS APN"),
+- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl );
+-
+- opt = vpnui_opt_new(
+- "gprs-ip-address", VPN_UI_OPTTYPE_STRING,
+- "gprs-ip-address", "GPRS-IP-Address", _("GPRS IP"),
+- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl );
+-
+- opt = vpnui_opt_new(
+- "gprs-context-num", VPN_UI_OPTTYPE_STRING,
+- "gprs-context-num", "GPRS-Context-Number", _("GPRS Context No."),
+- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl );
+-
+- opt = vpnui_opt_new(
+- "gprs-packet-type", VPN_UI_OPTTYPE_STRING,
+- "gprs-packet-type", "GPRS-Packet-Type", _("GPRS Packet Type"),
+- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl );
+-
+- opt = vpnui_opt_new(
+- "ppp-crtscts", VPN_UI_OPTTYPE_YESNO,
+- "ppp-crtscts", "PPP-Hardware-CTSRTS", _("Use CTS/RTS flow control"),
+- GTK_SIGNAL_FUNC(&editable_changed), NULL, impl );
+-
+- opt = vpnui_opt_new(
+- "ppp-modem", VPN_UI_OPTTYPE_YESNO,
+- "ppp-modem", "PPP-Modem", _("Connect via a modem"),
+- GTK_SIGNAL_FUNC(&editable_changed), NULL, impl );
+-
+- opt = vpnui_opt_new(
+ "ppp-noipdefault", VPN_UI_OPTTYPE_YESNO,
+ "ppp-noipdefault", "PPP-No-IP-Default", _("Require IP to be provided"),
+ GTK_SIGNAL_FUNC(&editable_changed), NULL, impl );
+@@ -358,29 +281,14 @@
+ VPNUI_BASIC_DEFAULTS VPNUI_PPTP_DEFAULTS,
+ impl);
+
+-#ifdef BUILD_BLUETOOTH
+- variant = vpnui_variant_new( "btgprs", "GPRS over Bluetooth (via mobile phone)",
+- VPNUI_BASIC_DEFAULTS VPNUI_GPRS_DEFAULTS VPNUI_BTOOTH_DEFAULTS VPNUI_BTGPRS_DEFAULTS,
+- impl);
+-#endif
++ gtk_combo_box_set_active(impl->variant_combo, 0);
++// vpnui_variant_select_byname(impl,"Windows VPN (PPTP)");
+
+- variant = vpnui_variant_new( "dialup", "Dialup",
+- VPNUI_BASIC_DEFAULTS VPNUI_DIALUP_DEFAULTS,
+- impl);
+ //
+ // GLADE NAME IMPLEMENTATION_OBJ
+ // expand= vpnui_expand_new ("routing-expander",impl);
+-// expand= vpnui_expand_new ("dialup-expander",impl);
+ // expand= vpnui_expand_new ("pppd-expander",impl);
+ // expand= vpnui_expand_new ("pptp-expander",impl);
+-// expand= vpnui_expand_new ("bluetooth-expander",impl);
+-// expand= vpnui_expand_new ("serial-expander",impl);
+-// expand= vpnui_expand_new ("gprs-expander",impl);
+-
+-// Attach to press event of the Bluetooth "Find Device" button.
+-// will need libbtcl
+-// impl->w_import_button = GTK_BUTTON (glade_xml_get_widget (impl->xml,
+-// "import-button"));
+
+ // Attach an import_button
+ impl->w_import_button = GTK_BUTTON (glade_xml_get_widget (impl->xml,
+@@ -444,15 +352,11 @@
+ void
+ impl_hide_and_show (NetworkManagerVpnUIImpl *impl)
+ {
+- GtkWidget *serial_options = NULL;
+- GtkWidget *gprs_options = NULL;
+ GtkWidget *auth_options = NULL;
+ GtkWidget *comp_enc_options = NULL;
+ GtkWidget *routing_options = NULL;
+ GtkWidget *ppp_options = NULL;
+- GtkWidget *bluetooth_front = NULL;
+ GtkWidget *pptp_front = NULL;
+- GtkWidget *dialup_front = NULL;
+ GtkComboBox *combo = NULL;
+ char *variant_name;
+
+@@ -466,17 +370,9 @@
+ auth_options = glade_xml_get_widget(impl->xml, "auth-options");
+ comp_enc_options = glade_xml_get_widget(impl->xml, "comp-enc-options");
+ routing_options = glade_xml_get_widget(impl->xml, "routing-options");
+- gprs_options = glade_xml_get_widget(impl->xml, "gprs-options");
+- serial_options = glade_xml_get_widget(impl->xml, "serial-options");
+- bluetooth_front = glade_xml_get_widget(impl->xml, "bluetooth-front");
+- dialup_front = glade_xml_get_widget(impl->xml, "dialup-front");
+ pptp_front = glade_xml_get_widget(impl->xml, "pptp-front");
+
+ if (pptp_front) gtk_widget_hide(pptp_front);
+- if (bluetooth_front) gtk_widget_hide(bluetooth_front);
+- if (dialup_front) gtk_widget_hide(dialup_front);
+- if (gprs_options) gtk_widget_hide(gprs_options);
+- if (serial_options) gtk_widget_hide(serial_options);
+ if (ppp_options) gtk_widget_hide(ppp_options);
+ if (auth_options) gtk_widget_hide(auth_options);
+ if (comp_enc_options) gtk_widget_hide(comp_enc_options);
+@@ -491,20 +387,5 @@
+ if (auth_options) gtk_widget_show(auth_options);
+ if (comp_enc_options) gtk_widget_show(comp_enc_options);
+ if (routing_options) gtk_widget_show(routing_options);
+- } else if (strcmp(variant_name,"dialup")==0) {
+- if (dialup_front) gtk_widget_show(dialup_front);
+- if (serial_options) gtk_widget_show(serial_options);
+- if (ppp_options) gtk_widget_show(ppp_options);
+- if (auth_options) gtk_widget_show(auth_options);
+- if (comp_enc_options) gtk_widget_show(comp_enc_options);
+- if (routing_options) gtk_widget_show(routing_options);
+- } else if (strcmp(variant_name,"btgprs")==0) {
+- if (bluetooth_front) gtk_widget_show(bluetooth_front);
+- if (gprs_options) gtk_widget_show(gprs_options);
+- if (serial_options) gtk_widget_show(serial_options);
+- if (ppp_options) gtk_widget_show(ppp_options);
+- if (auth_options) gtk_widget_show(auth_options);
+- if (comp_enc_options) gtk_widget_show(comp_enc_options);
+- if (routing_options) gtk_widget_show(routing_options);
+ }
+ }
diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch
new file mode 100644
index 0000000..05b2808
--- /dev/null
+++ b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch
@@ -0,0 +1,220 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog (Revision 2679)
++++ ChangeLog (Revision 2678)
+@@ -1,9 +1,3 @@
+-2007-08-14 Dan Williams <dcbw@redhat.com>
+-
+- * src/nm-openvpn-service.c
+- - Handle NM_VPN_STATE_* -> NM_VPN_SERVICE_STATE_* and NMVPNState ->
+- NMVPNServiceState renames
+-
+ 2007-07-26 Dan Williams <dcbw@redhat.com>
+
+ Patch from Kelemen Gábor <kelemeng@gnome.hu>
+Index: src/nm-ppp-starter.c
+===================================================================
+--- src/nm-ppp-starter.c (Revision 2679)
++++ src/nm-ppp-starter.c (Revision 2678)
+@@ -76,7 +76,7 @@
+ {
+ GMainLoop *loop;
+ DBusConnection *con;
+- NMVPNServiceState state;
++ NMVPNState state;
+ GPid pid;
+ guint quit_timer;
+ guint helper_timer;
+@@ -162,7 +162,7 @@
+ * Signal the bus that our state changed.
+ *
+ */
+-static void nm_ppp_dbus_signal_state_change (NmPPPData *data, NMVPNServiceState old_state)
++static void nm_ppp_dbus_signal_state_change (NmPPPData *data, NMVPNState old_state)
+ {
+ DBusMessage *message;
+
+@@ -189,9 +189,9 @@
+ * Set our state and make sure to signal the bus.
+ *
+ */
+-static void nm_ppp_set_state (NmPPPData *data, NMVPNServiceState new_state)
++static void nm_ppp_set_state (NmPPPData *data, NMVPNState new_state)
+ {
+- NMVPNServiceState old_state;
++ NMVPNState old_state;
+
+ g_return_if_fail (data != NULL);
+
+@@ -356,7 +356,7 @@
+ break;
+ }
+
+- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED);
++ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED);
+ nm_ppp_schedule_quit_timer (data, 10000);
+ }
+
+@@ -425,7 +425,7 @@
+ }
+
+
+- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED);
++ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED);
+ nm_ppp_schedule_quit_timer (data, 10000);
+ }
+
+@@ -1110,7 +1110,7 @@
+ g_return_val_if_fail (message != NULL, FALSE);
+ g_return_val_if_fail (data != NULL, FALSE);
+
+- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STARTING);
++ nm_ppp_set_state (data, NM_VPN_STATE_STARTING);
+
+ dbus_error_init (&error);
+ if (!dbus_message_get_args (message, &error,
+@@ -1152,7 +1152,7 @@
+ dbus_free_string_array (auth_items);
+ dbus_free_string_array (user_routes);
+ if (!success)
+- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED);
++ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED);
+ return success;
+ }
+
+@@ -1169,13 +1169,13 @@
+
+ if (data->pid > 0)
+ {
+- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPING);
++ nm_ppp_set_state (data, NM_VPN_STATE_STOPPING);
+
+ kill (data->pid, SIGTERM);
+ nm_info ("Terminated pppd with PID %d.", data->pid);
+ data->pid = 0;
+
+- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED);
++ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED);
+ nm_ppp_schedule_quit_timer (data, 10000);
+ }
+
+@@ -1194,13 +1194,13 @@
+
+ if (data->pid > 0)
+ {
+- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPING);
++ nm_ppp_set_state (data, NM_VPN_STATE_STOPPING);
+
+ kill (data->pid, SIGTERM);
+ nm_info ("Terminated pppd with PID %d.", data->pid);
+ data->pid = 0;
+
+- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED);
++ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED);
+ nm_ppp_schedule_quit_timer (data, 10000);
+ }
+
+@@ -1224,22 +1224,22 @@
+
+ switch (data->state)
+ {
+- case NM_VPN_SERVICE_STATE_STARTING:
++ case NM_VPN_STATE_STARTING:
+ reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_STARTING_IN_PROGRESS,
+ "Could not process the request because the VPN connection is already being started.");
+ break;
+
+- case NM_VPN_SERVICE_STATE_STARTED:
++ case NM_VPN_STATE_STARTED:
+ reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_ALREADY_STARTED,
+ "Could not process the request because a VPN connection was already active.");
+ break;
+
+- case NM_VPN_SERVICE_STATE_STOPPING:
++ case NM_VPN_STATE_STOPPING:
+ reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_STOPPING_IN_PROGRESS,
+ "Could not process the request because the VPN connection is being stopped.");
+ break;
+
+- case NM_VPN_SERVICE_STATE_STOPPED:
++ case NM_VPN_STATE_STOPPED:
+ nm_ppp_cancel_quit_timer (data);
+ nm_ppp_dbus_handle_start_vpn (message, data);
+ reply = dbus_message_new_method_return (message);
+@@ -1270,18 +1270,18 @@
+
+ switch (data->state)
+ {
+- case NM_VPN_SERVICE_STATE_STOPPING:
++ case NM_VPN_STATE_STOPPING:
+ reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_STOPPING_IN_PROGRESS,
+ "Could not process the request because the VPN connection is already being stopped.");
+ break;
+
+- case NM_VPN_SERVICE_STATE_STOPPED:
++ case NM_VPN_STATE_STOPPED:
+ reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_ALREADY_STOPPED,
+ "Could not process the request because no VPN connection was active.");
+ break;
+
+- case NM_VPN_SERVICE_STATE_STARTING:
+- case NM_VPN_SERVICE_STATE_STARTED:
++ case NM_VPN_STATE_STARTING:
++ case NM_VPN_STATE_STARTED:
+ nm_ppp_dbus_handle_stop_vpn (data);
+ reply = dbus_message_new_method_return (message);
+ break;
+@@ -1398,7 +1398,7 @@
+ g_return_if_fail (message != NULL);
+
+ /* Only accept the config info if we're in STARTING state */
+- if (data->state != NM_VPN_SERVICE_STATE_STARTING)
++ if (data->state != NM_VPN_STATE_STARTING)
+ return;
+
+ if (dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &error_item, DBUS_TYPE_INVALID))
+@@ -1446,7 +1446,7 @@
+ g_return_if_fail (message != NULL);
+
+ /* Only accept the config info if we're in STARTING state */
+- if (data->state != NM_VPN_SERVICE_STATE_STARTING)
++ if (data->state != NM_VPN_STATE_STARTING)
+ return;
+
+ /* If IP is up then we don't need to leave the auth info lying around */
+@@ -1568,7 +1568,7 @@
+ }
+
+ dbus_message_unref (signal);
+- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STARTED);
++ nm_ppp_set_state (data, NM_VPN_STATE_STARTED);
+ success = TRUE;
+ }
+
+@@ -1608,7 +1608,7 @@
+ /* nm_info ("nm_ppp_dbus_message_handler() got method '%s' for path '%s'.", method, path); */
+
+ /* If we aren't ready to accept dbus messages, don't */
+- if ((data->state == NM_VPN_SERVICE_STATE_INIT) || (data->state == NM_VPN_SERVICE_STATE_SHUTDOWN))
++ if ((data->state == NM_VPN_STATE_INIT) || (data->state == NM_VPN_STATE_SHUTDOWN))
+ {
+ nm_warning ("Received dbus messages but couldn't handle them due to INIT or SHUTDOWN states.");
+ reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_WRONG_STATE,
+@@ -1792,7 +1792,7 @@
+ vpn_data = g_malloc0 (sizeof (NmPPPData));
+
+ vpn_data->debug = FALSE;
+- vpn_data->state = NM_VPN_SERVICE_STATE_INIT;
++ vpn_data->state = NM_VPN_STATE_INIT;
+
+ vpn_data->loop = g_main_loop_new (NULL, FALSE);
+
+@@ -1806,7 +1806,7 @@
+ sigaction (SIGINT, &action, NULL);
+ sigaction (SIGTERM, &action, NULL);
+
+- nm_ppp_set_state (vpn_data, NM_VPN_SERVICE_STATE_STOPPED);
++ nm_ppp_set_state (vpn_data, NM_VPN_STATE_STOPPED);
+ g_main_loop_run (vpn_data->loop);
+
+ nm_ppp_dbus_handle_stop_vpn (vpn_data);
diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch
new file mode 100644
index 0000000..26e5673
--- /dev/null
+++ b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch
@@ -0,0 +1,29 @@
+Index: Makefile.am
+===================================================================
+--- Makefile.am (Revision 2743)
++++ Makefile.am (Arbeitskopie)
+@@ -15,7 +15,7 @@
+
+ %.name: %.name.in Makefile
+ @sed -e "s|%bindir%|$(bindir)|g" \
+- -e "s|%libdir%|$(libdir)|g" \
++ -e "s|%prefix%|$(prefix)|g" \
+ -e "s|%libexecdir%|$(libexecdir)|g" $< > $@
+
+ if WITH_GNOME
+Index: nm-ppp-starter.name.in
+===================================================================
+--- nm-ppp-starter.name.in (Revision 2743)
++++ nm-ppp-starter.name.in (Arbeitskopie)
+@@ -1,8 +1,8 @@
+ [VPN Connection]
+ name=ppp
+ service=org.freedesktop.NetworkManager.ppp_starter
+-program=@bindir@/nm-ppp-starter
++program=%bindir%/nm-ppp-starter
+
+ [GNOME]
+-auth-dialog=@libexecdir@/nm-ppp-auth-dialog
+-properties=@prefix@/${LIB}/libnm-ppp-properties
++auth-dialog=%libexecdir%/nm-ppp-auth-dialog
++properties=%prefix%/${LIB}/libnm-ppp-properties
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.6.5_p20070820.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.6.5_p20070820.ebuild
new file mode 100644
index 0000000..9aa9773
--- /dev/null
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-0.6.5_p20070820.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild,v 1.2 2007/08/23 20:01:40 mr_bones_ Exp $
+
+inherit gnome2 eutils autotools
+
+# NetworkManager likes itself with capital letters
+MY_P=${P/networkmanager/NetworkManager}
+
+DESCRIPTION="NetworkManager vpnc plugin for daemon and client configuration."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz
+ http://dev.gentoo.org/~rbu/distfiles/${P}-patchset.tar.gz"
+# SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+# mirror://gentoo/${P}-patchset.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="crypt debug doc gnome"
+
+BOTH_DEPEND=">=sys-apps/dbus-0.35.2
+ >=dev-libs/glib-2.8
+ >=net-misc/networkmanager-0.6.5_p20070823
+ net-dialup/ppp
+ gnome? ( >=x11-libs/gtk+-2.8
+ >=gnome-base/libglade-2
+ >=gnome-base/gnome-keyring-0.4
+ >=gnome-base/gnome-panel-2
+ >=gnome-base/gconf-2
+ >=gnome-base/libgnomeui-2 )
+ !gnome? ( >=gnome-base/libglade-2
+ >=gnome-base/gnome-keyring-0.4
+ >=gnome-base/gconf-2 )
+ >=net-misc/openvpn-2.0.5
+ crypt? ( dev-libs/libgcrypt )"
+
+DEPEND="${BOTH_DEPEND}
+ dev-util/pkgconfig
+ dev-util/intltool"
+RDEPEND="${BOTH_DEPEND}
+ net-dialup/pptpclient"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+USE_DESTDIR="1"
+
+G2CONF="${G2CONF} \
+ `use_with crypt gcrypt` \
+ `use_with gnome` \
+ --disable-more-warnings \
+ --with-dbus-sys=/etc/dbus-1/system.d \
+ --enable-notification-icon
+ --enable-nm-vpn-dbus-old"
+
+src_unpack () {
+ unpack ${A}
+ cd "${S}"
+
+ EPATCH_SUFFIX="patch"
+ epatch "${WORKDIR}/${P}-patchset"
+ eautoreconf
+}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild
index f0a37ef..9424101 100644
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild
@@ -19,7 +19,7 @@ IUSE="crypt debug doc gnome"
RDEPEND=">=sys-apps/dbus-0.35.2
>=dev-libs/glib-2.8
- >=net-misc/networkmanager-0.7.0_pre20070627
+ net-misc/networkmanager
net-dialup/ppp
gnome? ( >=x11-libs/gtk+-2.8
>=gnome-base/libglade-2