Hello community,
here is the log from the commit of package NetworkManager-gnome for
openSUSE:Factory checked in at 2016-01-08 15:39:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-gnome (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-gnome"
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-gnome/NetworkManager-appindicator.changes
2015-09-24 06:13:39.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-gnome.new/NetworkManager-appindicator.changes
2016-01-08 15:39:45.000000000 +0100
@@ -1,0 +2,41 @@
+Wed Dec 23 21:24:45 UTC 2015 - [email protected]
+
+- Update to version 1.0.10:
+ + Bluetooth page in connection editor is now populated with
+ available Bluetooth devices.
+ + Fix a possible agent crash when cancelling the secrets request.
+ + Updated translations.
+- Rebase nm-applet-private-connection.patch.
+
+-------------------------------------------------------------------
+Mon Dec 7 10:50:05 UTC 2015 - [email protected]
+
+- Split nm-connection-editor into a separate package
+ (NetworkManager-connection-editor), which is then recommended by
+ NetworkManager-gnome and NetworkManager-appindicator. The VPN
+ plugins should then require connection editor, as that's what
+ they're actually extending. As a result,
+ NetworkManager-appindicator users would receive the option to
+ install those plugins without conflicts.
+
+-------------------------------------------------------------------
+Sun Nov 22 14:02:51 UTC 2015 - [email protected]
+
+- Update to version 1.0.8:
+ + Added hotspot support to the editor.
+ + Password widgets now emits a signal for secret flag changes.
+ + The connection validation errors are now communicated in a
+ tooltip.
+ + The editor is now able to edit the VLAN flags.
+ + Several bug fixes.
+ + Updated translations.
+- Rebase nm-applet-probe-radius-server-cert.patch.
+
+-------------------------------------------------------------------
+Mon Oct 12 11:07:12 UTC 2015 - [email protected]
+
+- Align the name of the appdata file with the desktop file: rename
+ org.gnome.nm-connection-editor.appdata.xml to
+ nm-connection-editor.appdata.xml
+
+-------------------------------------------------------------------
---
/work/SRC/openSUSE:Factory/NetworkManager-gnome/NetworkManager-gnome.changes
2015-10-17 16:36:11.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-gnome.new/NetworkManager-gnome.changes
2016-01-08 15:39:45.000000000 +0100
@@ -1,0 +2,34 @@
+Wed Dec 23 21:24:45 UTC 2015 - [email protected]
+
+- Update to version 1.0.10:
+ + Bluetooth page in connection editor is now populated with
+ available Bluetooth devices.
+ + Fix a possible agent crash when cancelling the secrets request.
+ + Updated translations.
+- Rebase nm-applet-private-connection.patch.
+
+-------------------------------------------------------------------
+Mon Dec 7 10:50:05 UTC 2015 - [email protected]
+
+- Split nm-connection-editor into a separate package
+ (NetworkManager-connection-editor), which is then recommended by
+ NetworkManager-gnome and NetworkManager-appindicator. The VPN
+ plugins should then require connection editor, as that's what
+ they're actually extending. As a result,
+ NetworkManager-appindicator users would receive the option to
+ install those plugins without conflicts.
+
+-------------------------------------------------------------------
+Sun Nov 22 14:02:51 UTC 2015 - [email protected]
+
+- Update to version 1.0.8:
+ + Added hotspot support to the editor.
+ + Password widgets now emits a signal for secret flag changes.
+ + The connection validation errors are now communicated in a
+ tooltip.
+ + The editor is now able to edit the VLAN flags.
+ + Several bug fixes.
+ + Updated translations.
+- Rebase nm-applet-probe-radius-server-cert.patch.
+
+-------------------------------------------------------------------
Old:
----
network-manager-applet-1.0.6.tar.xz
New:
----
network-manager-applet-1.0.10.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-appindicator.spec ++++++
--- /var/tmp/diff_new_pack.zkRkJH/_old 2016-01-08 15:39:46.000000000 +0100
+++ /var/tmp/diff_new_pack.zkRkJH/_new 2016-01-08 15:39:46.000000000 +0100
@@ -24,7 +24,7 @@
Name: NetworkManager-appindicator
%define _name NetworkManager-gnome
Url: http://www.gnome.org/projects/NetworkManager/
-Version: 1.0.6
+Version: 1.0.10
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-devel
@@ -78,6 +78,7 @@
Requires: NetworkManager(cacert-patch)
%endif
Recommends: %{_name}-lang
+Recommends: NetworkManager-connection-editor
%glib2_gsettings_schema_requires
%if %{build_appindicator}
@@ -90,6 +91,13 @@
NetworkManager, including a panel applet for wireless networks.
%if !%{build_appindicator}
+%package -n NetworkManager-connection-editor
+Summary: GUI to configure connections for NetworkManager
+Group: System/GUI/GNOME
+
+%description -n NetworkManager-connection-editor
+NetworkManager Configuration tool - take control over your connection settings.
+
%package -n libnm-gtk0
Summary: NetworkManager Gtk+ dialogs
Group: System/Libraries
@@ -144,6 +152,9 @@
%install
%makeinstall
find %{buildroot}%{_libdir} -name '*.la' -delete -print
+# align the name of the appdata file with the name of the .desktop file
+mv %{buildroot}%{_datadir}/appdata/org.gnome.nm-connection-editor.appdata.xml \
+ %{buildroot}%{_datadir}/appdata/nm-connection-editor.appdata.xml
%suse_update_desktop_file
%{buildroot}%{_datadir}/applications/nm-applet.desktop
%suse_update_desktop_file
%{buildroot}%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%suse_update_desktop_file -r nm-connection-editor GTK GNOME System
X-SuSE-ServiceConfiguration
@@ -168,6 +179,10 @@
rm %{buildroot}%{_libdir}/pkgconfig/libnm-gtk.pc
rm -r %{buildroot}%{_datadir}/locale/
+
+# nm-connection-editor is built as a separate package and can be shared
+find %{buildroot} -name 'nm-connection-editor*' -delete -print
+
%endif
%post
@@ -189,25 +204,33 @@
%files
%defattr(-,root,root)
%doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING
-%doc %{_mandir}/man?/nm-*.gz
+%{_mandir}/man1/nm-applet.1%{?ext_man}
%{_bindir}/nm-applet
-%{_bindir}/nm-connection-editor
%{_datadir}/nm-applet
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/*
+# This file moves to NetworkManager-connection-editor
+%exclude %{_datadir}/nm-applet/nm-connection-editor.ui
%{_datadir}/GConf/gsettings/nm-applet.convert
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/apps/*.svg
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%{_datadir}/applications/nm-applet.desktop
-%{_datadir}/applications/nm-connection-editor.desktop
%if %{build_appindicator}
%{_docdir}/*
%{_datadir}/icons/hicolor/*/status/*.png
%endif
%if !%{build_appindicator}
+%files -n NetworkManager-connection-editor
+%defattr(-,root,root)
+%{_bindir}/nm-connection-editor
+%{_datadir}/applications/nm-connection-editor.desktop
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/nm-connection-editor.appdata.xml
+%dir %{_datadir}/nm-applet
+%{_datadir}/nm-applet/nm-connection-editor.ui
+%{_mandir}/man1/nm-connection-editor.1%{?ext_man}
+
%files -n libnm-gtk0
%defattr(-,root,root)
%{_libdir}/libnm-gtk.so.*
++++++ NetworkManager-gnome.spec ++++++
--- /var/tmp/diff_new_pack.zkRkJH/_old 2016-01-08 15:39:46.000000000 +0100
+++ /var/tmp/diff_new_pack.zkRkJH/_new 2016-01-08 15:39:46.000000000 +0100
@@ -23,7 +23,7 @@
Name: NetworkManager-gnome
%define _name NetworkManager-gnome
Url: http://www.gnome.org/projects/NetworkManager/
-Version: 1.0.6
+Version: 1.0.10
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-devel
@@ -77,6 +77,7 @@
Requires: NetworkManager(cacert-patch)
%endif
Recommends: %{_name}-lang
+Recommends: NetworkManager-connection-editor
%glib2_gsettings_schema_requires
%if %{build_appindicator}
@@ -89,6 +90,13 @@
NetworkManager, including a panel applet for wireless networks.
%if !%{build_appindicator}
+%package -n NetworkManager-connection-editor
+Summary: GUI to configure connections for NetworkManager
+Group: System/GUI/GNOME
+
+%description -n NetworkManager-connection-editor
+NetworkManager Configuration tool - take control over your connection settings.
+
%package -n libnm-gtk0
Summary: NetworkManager Gtk+ dialogs
Group: System/Libraries
@@ -170,6 +178,10 @@
rm %{buildroot}%{_libdir}/pkgconfig/libnm-gtk.pc
rm -r %{buildroot}%{_datadir}/locale/
+
+# nm-connection-editor is built as a separate package and can be shared
+find %{buildroot} -name 'nm-connection-editor*' -delete -print
+
%endif
%post
@@ -191,25 +203,33 @@
%files
%defattr(-,root,root)
%doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING
-%doc %{_mandir}/man?/nm-*.gz
+%{_mandir}/man1/nm-applet.1%{?ext_man}
%{_bindir}/nm-applet
-%{_bindir}/nm-connection-editor
%{_datadir}/nm-applet
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/*
+# This file moves to NetworkManager-connection-editor
+%exclude %{_datadir}/nm-applet/nm-connection-editor.ui
%{_datadir}/GConf/gsettings/nm-applet.convert
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/apps/*.svg
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%{_datadir}/applications/nm-applet.desktop
-%{_datadir}/applications/nm-connection-editor.desktop
%if %{build_appindicator}
%{_docdir}/*
%{_datadir}/icons/hicolor/*/status/*.png
%endif
%if !%{build_appindicator}
+%files -n NetworkManager-connection-editor
+%defattr(-,root,root)
+%{_bindir}/nm-connection-editor
+%{_datadir}/applications/nm-connection-editor.desktop
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/nm-connection-editor.appdata.xml
+%dir %{_datadir}/nm-applet
+%{_datadir}/nm-applet/nm-connection-editor.ui
+%{_mandir}/man1/nm-connection-editor.1%{?ext_man}
+
%files -n libnm-gtk0
%defattr(-,root,root)
%{_libdir}/libnm-gtk.so.*
++++++ network-manager-applet-1.0.6.tar.xz ->
network-manager-applet-1.0.10.tar.xz ++++++
++++ 55352 lines of diff (skipped)
++++++ nm-applet-private-connection.patch ++++++
--- /var/tmp/diff_new_pack.zkRkJH/_old 2016-01-08 15:39:47.000000000 +0100
+++ /var/tmp/diff_new_pack.zkRkJH/_new 2016-01-08 15:39:47.000000000 +0100
@@ -24,11 +24,11 @@
src/utils/utils.h | 2 ++
12 files changed, 189 insertions(+), 1 deletion(-)
-Index: network-manager-applet-1.0.4/configure.ac
+Index: network-manager-applet-1.0.10/configure.ac
===================================================================
---- network-manager-applet-1.0.4.orig/configure.ac
-+++ network-manager-applet-1.0.4/configure.ac
-@@ -82,6 +82,10 @@ PKG_CHECK_MODULES(NMA,
+--- network-manager-applet-1.0.10.orig/configure.ac
++++ network-manager-applet-1.0.10/configure.ac
+@@ -86,6 +86,10 @@ PKG_CHECK_MODULES(NMA,
NMA_CFLAGS="$NMA_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
@@ -39,10 +39,10 @@
AC_MSG_CHECKING([whether to build nm-applet-migration-tool])
AC_ARG_ENABLE([migration],
[AS_HELP_STRING([--disable-migration], [Don't build migration
tool for NM <= 0.8 settings])],
-Index: network-manager-applet-1.0.4/src/applet-device-ethernet.c
+Index: network-manager-applet-1.0.10/src/applet-device-ethernet.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/applet-device-ethernet.c
-+++ network-manager-applet-1.0.4/src/applet-device-ethernet.c
+--- network-manager-applet-1.0.10.orig/src/applet-device-ethernet.c
++++ network-manager-applet-1.0.10/src/applet-device-ethernet.c
@@ -40,6 +40,7 @@
#include "applet-device-ethernet.h"
#include "ethernet-dialog.h"
@@ -64,10 +64,10 @@
nm_connection_add_setting (connection, NM_SETTING (s_con));
-Index: network-manager-applet-1.0.4/src/applet-device-wifi.c
+Index: network-manager-applet-1.0.10/src/applet-device-wifi.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/applet-device-wifi.c
-+++ network-manager-applet-1.0.4/src/applet-device-wifi.c
+--- network-manager-applet-1.0.10.orig/src/applet-device-wifi.c
++++ network-manager-applet-1.0.10/src/applet-device-wifi.c
@@ -445,6 +445,18 @@ _do_new_auto_connection (NMApplet *apple
nm_connection_add_setting (connection, NM_SETTING (s_8021x));
}
@@ -87,10 +87,10 @@
/* If it's an 802.1x connection, we need more information, so pop up the
* Dialog Of Doom.
*/
-Index: network-manager-applet-1.0.4/src/applet-device-wimax.c
+Index: network-manager-applet-1.0.10/src/applet-device-wimax.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/applet-device-wimax.c
-+++ network-manager-applet-1.0.4/src/applet-device-wimax.c
+--- network-manager-applet-1.0.10.orig/src/applet-device-wimax.c
++++ network-manager-applet-1.0.10/src/applet-device-wimax.c
@@ -39,6 +39,7 @@
#include "nma-marshal.h"
#include "mb-menu-item.h"
@@ -112,10 +112,10 @@
nm_connection_add_setting (connection, NM_SETTING (s_con));
-Index: network-manager-applet-1.0.4/src/connection-editor/Makefile.am
+Index: network-manager-applet-1.0.10/src/connection-editor/Makefile.am
===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/Makefile.am
-+++ network-manager-applet-1.0.4/src/connection-editor/Makefile.am
+--- network-manager-applet-1.0.10.orig/src/connection-editor/Makefile.am
++++ network-manager-applet-1.0.10/src/connection-editor/Makefile.am
@@ -13,6 +13,7 @@ nm_connection_editor_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DNMALOCALEDIR=\"$(datadir)/locale\" \
@@ -132,10 +132,10 @@
-lm
uidir = $(datadir)/nm-applet
-Index: network-manager-applet-1.0.4/src/connection-editor/ce-page.c
+Index: network-manager-applet-1.0.10/src/connection-editor/ce-page.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/ce-page.c
-+++ network-manager-applet-1.0.4/src/connection-editor/ce-page.c
+--- network-manager-applet-1.0.10.orig/src/connection-editor/ce-page.c
++++ network-manager-applet-1.0.10/src/connection-editor/ce-page.c
@@ -29,6 +29,8 @@
#include <glib/gi18n.h>
@@ -144,8 +144,8 @@
+
#include <nm-setting-connection.h>
#include <nm-utils.h>
-
-@@ -798,6 +800,44 @@ ce_page_class_init (CEPageClass *page_cl
+ #include <nm-device-bt.h>
+@@ -868,6 +870,44 @@ ce_page_class_init (CEPageClass *page_cl
G_TYPE_NONE, 1, G_TYPE_POINTER);
}
@@ -190,7 +190,7 @@
NMConnection *
ce_page_new_connection (const char *format,
-@@ -832,6 +872,13 @@ ce_page_new_connection (const char *form
+@@ -902,6 +942,13 @@ ce_page_new_connection (const char *form
g_free (uuid);
g_free (id);
@@ -204,10 +204,10 @@
return connection;
}
-Index: network-manager-applet-1.0.4/src/gnome-bluetooth/Makefile.am
+Index: network-manager-applet-1.0.10/src/gnome-bluetooth/Makefile.am
===================================================================
---- network-manager-applet-1.0.4.orig/src/gnome-bluetooth/Makefile.am
-+++ network-manager-applet-1.0.4/src/gnome-bluetooth/Makefile.am
+--- network-manager-applet-1.0.10.orig/src/gnome-bluetooth/Makefile.am
++++ network-manager-applet-1.0.10/src/gnome-bluetooth/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/utils \
-I${top_srcdir}/src/libnm-gtk \
@@ -224,10 +224,10 @@
$(GNOME_BLUETOOTH_LIBS)
if WITH_MODEM_MANAGER_1
-Index: network-manager-applet-1.0.4/src/gnome-bluetooth/nma-bt-device.c
+Index: network-manager-applet-1.0.10/src/gnome-bluetooth/nma-bt-device.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/gnome-bluetooth/nma-bt-device.c
-+++ network-manager-applet-1.0.4/src/gnome-bluetooth/nma-bt-device.c
+--- network-manager-applet-1.0.10.orig/src/gnome-bluetooth/nma-bt-device.c
++++ network-manager-applet-1.0.10/src/gnome-bluetooth/nma-bt-device.c
@@ -34,6 +34,8 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
@@ -321,10 +321,10 @@
nm_connection_add_setting (connection, setting);
/* The Bluetooth settings */
-Index: network-manager-applet-1.0.4/src/mobile-helpers.c
+Index: network-manager-applet-1.0.10/src/mobile-helpers.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/mobile-helpers.c
-+++ network-manager-applet-1.0.4/src/mobile-helpers.c
+--- network-manager-applet-1.0.10.orig/src/mobile-helpers.c
++++ network-manager-applet-1.0.10/src/mobile-helpers.c
@@ -219,6 +219,12 @@ mobile_wizard_done (NMAMobileWizard *wiz
"user", g_get_user_name
(), NULL);
g_free (uuid);
@@ -338,10 +338,10 @@
nm_connection_add_setting (connection, setting);
}
-Index: network-manager-applet-1.0.4/src/utils/Makefile.am
+Index: network-manager-applet-1.0.10/src/utils/Makefile.am
===================================================================
---- network-manager-applet-1.0.4.orig/src/utils/Makefile.am
-+++ network-manager-applet-1.0.4/src/utils/Makefile.am
+--- network-manager-applet-1.0.10.orig/src/utils/Makefile.am
++++ network-manager-applet-1.0.10/src/utils/Makefile.am
@@ -10,7 +10,8 @@ libutils_la_SOURCES = \
libutils_la_CPPFLAGS = \
$(GTK_CFLAGS) \
@@ -352,10 +352,10 @@
-libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS)
+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(POLKIT_LIBS)
-Index: network-manager-applet-1.0.4/src/utils/utils.c
+Index: network-manager-applet-1.0.10/src/utils/utils.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/utils/utils.c
-+++ network-manager-applet-1.0.4/src/utils/utils.c
+--- network-manager-applet-1.0.10.orig/src/utils/utils.c
++++ network-manager-applet-1.0.10/src/utils/utils.c
@@ -27,6 +27,8 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
@@ -407,10 +407,10 @@
+
+ return is_authorized;
+}
-Index: network-manager-applet-1.0.4/src/utils/utils.h
+Index: network-manager-applet-1.0.10/src/utils/utils.h
===================================================================
---- network-manager-applet-1.0.4.orig/src/utils/utils.h
-+++ network-manager-applet-1.0.4/src/utils/utils.h
+--- network-manager-applet-1.0.10.orig/src/utils/utils.h
++++ network-manager-applet-1.0.10/src/utils/utils.h
@@ -107,5 +107,7 @@ gboolean utils_filter_editable_on_insert
UtilsFilterGtkEditableFunc
validate_character,
gpointer block_func);
++++++ nm-applet-probe-radius-server-cert.patch ++++++
--- /var/tmp/diff_new_pack.zkRkJH/_old 2016-01-08 15:39:47.000000000 +0100
+++ /var/tmp/diff_new_pack.zkRkJH/_new 2016-01-08 15:39:47.000000000 +0100
@@ -15,11 +15,11 @@
src/wireless-security/wireless-security.h | 3 ++
8 files changed, 426 insertions(+), 47 deletions(-)
-Index: network-manager-applet-1.0.4/src/wireless-security/eap-method-peap.c
+Index: network-manager-applet-1.0.8/src/wireless-security/eap-method-peap.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/eap-method-peap.c
-+++ network-manager-applet-1.0.4/src/wireless-security/eap-method-peap.c
-@@ -35,6 +35,8 @@
+--- network-manager-applet-1.0.8.orig/src/wireless-security/eap-method-peap.c
++++ network-manager-applet-1.0.8/src/wireless-security/eap-method-peap.c
+@@ -36,6 +36,8 @@
#define I_NAME_COLUMN 0
#define I_METHOD_COLUMN 1
@@ -28,7 +28,7 @@
struct _EAPMethodPEAP {
EAPMethod parent;
-@@ -107,6 +109,10 @@ add_to_size_group (EAPMethod *parent, Gt
+@@ -114,6 +116,10 @@ add_to_size_group (EAPMethod *parent, Gt
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@@ -39,7 +39,7 @@
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_ca_cert_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
-@@ -135,6 +141,7 @@ fill_connection (EAPMethod *parent, NMCo
+@@ -142,6 +148,7 @@ fill_connection (EAPMethod *parent, NMCo
{
NMSetting8021x *s_8021x;
NMSetting8021xCKFormat format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN;
@@ -47,7 +47,7 @@
GtkWidget *widget;
const char *text;
char *filename;
-@@ -156,13 +163,21 @@ fill_connection (EAPMethod *parent, NMCo
+@@ -163,13 +170,21 @@ fill_connection (EAPMethod *parent, NMCo
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY,
text, NULL);
@@ -73,7 +73,7 @@
}
eap_method_ca_cert_ignore_set (parent, connection, filename,
ca_cert_error);
g_free (filename);
-@@ -327,6 +342,37 @@ update_secrets (EAPMethod *parent, NMCon
+@@ -334,6 +349,37 @@ update_secrets (EAPMethod *parent, NMCon
I_METHOD_COLUMN);
}
@@ -111,7 +111,7 @@
EAPMethodPEAP *
eap_method_peap_new (WirelessSecurity *ws_parent,
NMConnection *connection,
-@@ -414,6 +460,43 @@ eap_method_peap_new (WirelessSecurity *w
+@@ -421,6 +467,43 @@ eap_method_peap_new (WirelessSecurity *w
(GCallback) wireless_security_changed_cb,
ws_parent);
@@ -155,7 +155,7 @@
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_anon_identity_entry"));
if (s_8021x && nm_setting_802_1x_get_anonymous_identity (s_8021x))
gtk_entry_set_text (GTK_ENTRY (widget),
nm_setting_802_1x_get_anonymous_identity (s_8021x));
-@@ -426,12 +509,18 @@ eap_method_peap_new (WirelessSecurity *w
+@@ -433,12 +516,18 @@ eap_method_peap_new (WirelessSecurity *w
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_anon_identity_entry"));
gtk_widget_hide (widget);
@@ -174,10 +174,10 @@
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_inner_auth_label"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_inner_auth_combo"));
-Index: network-manager-applet-1.0.4/src/wireless-security/eap-method-peap.ui
+Index: network-manager-applet-1.0.8/src/wireless-security/eap-method-peap.ui
===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/eap-method-peap.ui
-+++ network-manager-applet-1.0.4/src/wireless-security/eap-method-peap.ui
+--- network-manager-applet-1.0.8.orig/src/wireless-security/eap-method-peap.ui
++++ network-manager-applet-1.0.8/src/wireless-security/eap-method-peap.ui
@@ -38,7 +38,7 @@
<object class="GtkTable" id="table13">
<property name="visible">True</property>
@@ -327,20 +327,20 @@
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
-Index: network-manager-applet-1.0.4/src/wireless-security/eap-method-tls.c
+Index: network-manager-applet-1.0.8/src/wireless-security/eap-method-tls.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/eap-method-tls.c
-+++ network-manager-applet-1.0.4/src/wireless-security/eap-method-tls.c
-@@ -34,6 +34,8 @@
- #include "helpers.h"
+--- network-manager-applet-1.0.8.orig/src/wireless-security/eap-method-tls.c
++++ network-manager-applet-1.0.8/src/wireless-security/eap-method-tls.c
+@@ -35,6 +35,8 @@
#include "nm-ui-utils.h"
+ #include "utils.h"
+#define SUBJECT_NOTE _("<will be filled automatically>")
+
struct _EAPMethodTLS {
EAPMethod parent;
-@@ -123,6 +125,10 @@ add_to_size_group (EAPMethod *parent, Gt
+@@ -140,6 +142,10 @@ add_to_size_group (EAPMethod *parent, Gt
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@@ -351,7 +351,7 @@
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_private_key_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
-@@ -137,10 +143,12 @@ fill_connection (EAPMethod *parent, NMCo
+@@ -154,10 +160,12 @@ fill_connection (EAPMethod *parent, NMCo
{
EAPMethodTLS *method = (EAPMethodTLS *) parent;
NMSetting8021xCKFormat format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN;
@@ -364,7 +364,7 @@
const char *password = NULL;
GError *error = NULL;
gboolean ca_cert_error = FALSE;
-@@ -231,14 +239,22 @@ fill_connection (EAPMethod *parent, NMCo
+@@ -248,14 +256,22 @@ fill_connection (EAPMethod *parent, NMCo
ca_cert_error = TRUE;
}
} else {
@@ -391,7 +391,7 @@
}
static void
-@@ -407,6 +423,37 @@ update_secrets (EAPMethod *parent, NMCon
+@@ -424,6 +440,37 @@ update_secrets (EAPMethod *parent, NMCon
}
}
@@ -429,7 +429,7 @@
EAPMethodTLS *
eap_method_tls_new (WirelessSecurity *ws_parent,
NMConnection *connection,
-@@ -470,6 +517,31 @@ eap_method_tls_new (WirelessSecurity *ws
+@@ -487,6 +534,31 @@ eap_method_tls_new (WirelessSecurity *ws
phase2 ? nm_setting_802_1x_get_phase2_ca_cert_scheme
: nm_setting_802_1x_get_ca_cert_scheme,
phase2 ? nm_setting_802_1x_get_phase2_ca_cert_path :
nm_setting_802_1x_get_ca_cert_path,
FALSE, FALSE);
@@ -461,7 +461,7 @@
setup_filepicker (parent->builder, "eap_tls_private_key_button",
_("Choose your private key..."),
ws_parent, parent, s_8021x,
-@@ -521,6 +593,10 @@ eap_method_tls_new (WirelessSecurity *ws
+@@ -538,6 +610,10 @@ eap_method_tls_new (WirelessSecurity *ws
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_not_required_checkbox"));
gtk_widget_hide (widget);
@@ -472,10 +472,10 @@
}
return method;
-Index: network-manager-applet-1.0.4/src/wireless-security/eap-method-tls.ui
+Index: network-manager-applet-1.0.8/src/wireless-security/eap-method-tls.ui
===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/eap-method-tls.ui
-+++ network-manager-applet-1.0.4/src/wireless-security/eap-method-tls.ui
+--- network-manager-applet-1.0.8.orig/src/wireless-security/eap-method-tls.ui
++++ network-manager-applet-1.0.8/src/wireless-security/eap-method-tls.ui
@@ -11,7 +11,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -609,11 +609,11 @@
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
-Index: network-manager-applet-1.0.4/src/wireless-security/eap-method-ttls.c
+Index: network-manager-applet-1.0.8/src/wireless-security/eap-method-ttls.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/eap-method-ttls.c
-+++ network-manager-applet-1.0.4/src/wireless-security/eap-method-ttls.c
-@@ -35,6 +35,8 @@
+--- network-manager-applet-1.0.8.orig/src/wireless-security/eap-method-ttls.c
++++ network-manager-applet-1.0.8/src/wireless-security/eap-method-ttls.c
+@@ -36,6 +36,8 @@
#define I_NAME_COLUMN 0
#define I_METHOD_COLUMN 1
@@ -622,7 +622,7 @@
struct _EAPMethodTTLS {
EAPMethod parent;
-@@ -107,6 +109,10 @@ add_to_size_group (EAPMethod *parent, Gt
+@@ -114,6 +116,10 @@ add_to_size_group (EAPMethod *parent, Gt
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@@ -633,7 +633,7 @@
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_ca_cert_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
-@@ -131,6 +137,7 @@ fill_connection (EAPMethod *parent, NMCo
+@@ -138,6 +144,7 @@ fill_connection (EAPMethod *parent, NMCo
{
NMSetting8021x *s_8021x;
NMSetting8021xCKFormat format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN;
@@ -641,7 +641,7 @@
GtkWidget *widget;
const char *text;
char *filename;
-@@ -151,13 +158,21 @@ fill_connection (EAPMethod *parent, NMCo
+@@ -158,13 +165,21 @@ fill_connection (EAPMethod *parent, NMCo
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY,
text, NULL);
@@ -667,7 +667,7 @@
}
eap_method_ca_cert_ignore_set (parent, connection, filename,
ca_cert_error);
g_free (filename);
-@@ -358,6 +373,37 @@ update_secrets (EAPMethod *parent, NMCon
+@@ -365,6 +380,37 @@ update_secrets (EAPMethod *parent, NMCon
I_METHOD_COLUMN);
}
@@ -705,7 +705,7 @@
EAPMethodTTLS *
eap_method_ttls_new (WirelessSecurity *ws_parent,
NMConnection *connection,
-@@ -423,6 +469,43 @@ eap_method_ttls_new (WirelessSecurity *w
+@@ -430,6 +476,43 @@ eap_method_ttls_new (WirelessSecurity *w
!filename &&
eap_method_ca_cert_ignore_get (parent, connection));
}
@@ -749,7 +749,7 @@
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_anon_identity_entry"));
if (s_8021x && nm_setting_802_1x_get_anonymous_identity (s_8021x))
gtk_entry_set_text (GTK_ENTRY (widget),
nm_setting_802_1x_get_anonymous_identity (s_8021x));
-@@ -438,12 +521,18 @@ eap_method_ttls_new (WirelessSecurity *w
+@@ -445,12 +528,18 @@ eap_method_ttls_new (WirelessSecurity *w
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_anon_identity_entry"));
gtk_widget_hide (widget);
@@ -768,10 +768,10 @@
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_inner_auth_label"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_inner_auth_combo"));
-Index: network-manager-applet-1.0.4/src/wireless-security/eap-method-ttls.ui
+Index: network-manager-applet-1.0.8/src/wireless-security/eap-method-ttls.ui
===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/eap-method-ttls.ui
-+++ network-manager-applet-1.0.4/src/wireless-security/eap-method-ttls.ui
+--- network-manager-applet-1.0.8.orig/src/wireless-security/eap-method-ttls.ui
++++ network-manager-applet-1.0.8/src/wireless-security/eap-method-ttls.ui
@@ -21,7 +21,7 @@
<object class="GtkTable" id="table10">
<property name="visible">True</property>
@@ -899,11 +899,11 @@
<property name="x_options">GTK_FILL</property>
</packing>
</child>
-Index: network-manager-applet-1.0.4/src/wireless-security/wireless-security.c
+Index: network-manager-applet-1.0.8/src/wireless-security/wireless-security.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/wireless-security.c
-+++ network-manager-applet-1.0.4/src/wireless-security/wireless-security.c
-@@ -517,11 +517,14 @@ ws_802_1x_fill_connection (WirelessSecur
+--- network-manager-applet-1.0.8.orig/src/wireless-security/wireless-security.c
++++ network-manager-applet-1.0.8/src/wireless-security/wireless-security.c
+@@ -533,11 +533,14 @@ ws_802_1x_fill_connection (WirelessSecur
{
GtkWidget *widget;
NMSettingWirelessSecurity *s_wireless_sec;
@@ -919,7 +919,7 @@
/* Get the EAPMethod object */
widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, combo_name));
-@@ -537,6 +540,12 @@ ws_802_1x_fill_connection (WirelessSecur
+@@ -553,6 +556,12 @@ ws_802_1x_fill_connection (WirelessSecur
else
secret_flags = NM_SETTING_SECRET_FLAG_AGENT_OWNED;
@@ -932,7 +932,7 @@
/* Blow away the old wireless security setting by adding a clear one */
s_wireless_sec = (NMSettingWirelessSecurity *)
nm_setting_wireless_security_new ();
nm_connection_add_setting (connection, (NMSetting *) s_wireless_sec);
-@@ -545,8 +554,43 @@ ws_802_1x_fill_connection (WirelessSecur
+@@ -561,8 +570,43 @@ ws_802_1x_fill_connection (WirelessSecur
s_8021x = (NMSetting8021x *) nm_setting_802_1x_new ();
nm_connection_add_setting (connection, (NMSetting *) s_8021x);
@@ -976,10 +976,10 @@
}
void
-Index: network-manager-applet-1.0.4/src/wireless-security/wireless-security.h
+Index: network-manager-applet-1.0.8/src/wireless-security/wireless-security.h
===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/wireless-security.h
-+++ network-manager-applet-1.0.4/src/wireless-security/wireless-security.h
+--- network-manager-applet-1.0.8.orig/src/wireless-security/wireless-security.h
++++ network-manager-applet-1.0.8/src/wireless-security/wireless-security.h
@@ -28,6 +28,9 @@
#include <nm-connection.h>
@@ -990,11 +990,11 @@
typedef struct _WirelessSecurity WirelessSecurity;
typedef void (*WSChangedFunc) (WirelessSecurity *sec, gpointer user_data);
-Index: network-manager-applet-1.0.4/src/libnm-gtk/nm-wifi-dialog.c
+Index: network-manager-applet-1.0.8/src/libnm-gtk/nm-wifi-dialog.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/libnm-gtk/nm-wifi-dialog.c
-+++ network-manager-applet-1.0.4/src/libnm-gtk/nm-wifi-dialog.c
-@@ -77,6 +77,10 @@ typedef struct {
+--- network-manager-applet-1.0.8.orig/src/libnm-gtk/nm-wifi-dialog.c
++++ network-manager-applet-1.0.8/src/libnm-gtk/nm-wifi-dialog.c
+@@ -78,6 +78,10 @@ typedef struct {
GetSecretsInfo *secrets_info;
gboolean disposed;
@@ -1005,7 +1005,7 @@
} NMAWifiDialogPrivate;
enum {
-@@ -110,6 +114,234 @@ nma_wifi_dialog_get_nag_ignored (NMAWifi
+@@ -111,6 +115,234 @@ nma_wifi_dialog_get_nag_ignored (NMAWifi
return TRUE;
}
@@ -1240,7 +1240,7 @@
static void
size_group_clear (GtkSizeGroup *group)
{
-@@ -1162,6 +1394,9 @@ internal_init (NMAWifiDialog *self,
+@@ -1191,6 +1423,9 @@ internal_init (NMAWifiDialog *self,
*/
priv->revalidate_id = g_idle_add (revalidate, self);
@@ -1250,7 +1250,7 @@
return TRUE;
}
-@@ -1223,6 +1458,8 @@ nma_wifi_dialog_get_connection (NMAWifiD
+@@ -1252,6 +1487,8 @@ nma_wifi_dialog_get_connection (NMAWifiD
g_assert_not_reached ();
nm_connection_add_setting (connection, (NMSetting *)
s_wireless);
@@ -1259,10 +1259,10 @@
} else
connection = g_object_ref (priv->connection);
-Index: network-manager-applet-1.0.4/src/libnm-gtk/nm-wifi-dialog.h
+Index: network-manager-applet-1.0.8/src/libnm-gtk/nm-wifi-dialog.h
===================================================================
---- network-manager-applet-1.0.4.orig/src/libnm-gtk/nm-wifi-dialog.h
-+++ network-manager-applet-1.0.4/src/libnm-gtk/nm-wifi-dialog.h
+--- network-manager-applet-1.0.8.orig/src/libnm-gtk/nm-wifi-dialog.h
++++ network-manager-applet-1.0.8/src/libnm-gtk/nm-wifi-dialog.h
@@ -83,6 +83,9 @@ gboolean nma_wifi_dialog_get_nag_ignored
GLIB_DEPRECATED_FOR(nma_wifi_dialog_new_for_hidden)
GtkWidget *nma_wifi_dialog_new_for_other (NMClient *client,
@@ -1273,10 +1273,10 @@
#endif /* NMA_WIFI_DIALOG_H */
-Index: network-manager-applet-1.0.4/src/libnm-gtk/nm-wireless-dialog.c
+Index: network-manager-applet-1.0.8/src/libnm-gtk/nm-wireless-dialog.c
===================================================================
---- network-manager-applet-1.0.4.orig/src/libnm-gtk/nm-wireless-dialog.c
-+++ network-manager-applet-1.0.4/src/libnm-gtk/nm-wireless-dialog.c
+--- network-manager-applet-1.0.8.orig/src/libnm-gtk/nm-wireless-dialog.c
++++ network-manager-applet-1.0.8/src/libnm-gtk/nm-wireless-dialog.c
@@ -64,3 +64,14 @@ nma_wireless_dialog_new_for_create (NMCl
return nma_wifi_dialog_new_for_create (client, settings);
}
@@ -1292,10 +1292,10 @@
+{
+ return nma_wifi_dialog_probe_cert ((NMAWifiDialog *)self);
+}
-Index: network-manager-applet-1.0.4/src/libnm-gtk/nm-wireless-dialog.h
+Index: network-manager-applet-1.0.8/src/libnm-gtk/nm-wireless-dialog.h
===================================================================
---- network-manager-applet-1.0.4.orig/src/libnm-gtk/nm-wireless-dialog.h
-+++ network-manager-applet-1.0.4/src/libnm-gtk/nm-wireless-dialog.h
+--- network-manager-applet-1.0.8.orig/src/libnm-gtk/nm-wireless-dialog.h
++++ network-manager-applet-1.0.8/src/libnm-gtk/nm-wireless-dialog.h
@@ -76,5 +76,11 @@ NMConnection * nma_wireless_dialog_get_c
NMDevice **device,
NMAccessPoint **ap);
