diff --git a/.gitignore b/.gitignore index 45449c9..0a769bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/network-manager-applet-1.0.0.git20150122.76569a46.tar.bz2 +SOURCES/network-manager-applet-1.0.6.tar.xz diff --git a/.network-manager-applet.metadata b/.network-manager-applet.metadata index aaee553..3d3ce54 100644 --- a/.network-manager-applet.metadata +++ b/.network-manager-applet.metadata @@ -1 +1 @@ -7a7bea47e0dcab38cea9ef95457086367fe45c92 SOURCES/network-manager-applet-1.0.0.git20150122.76569a46.tar.bz2 +f4678c36487e916a830f59c4bb3088f57ddb6e9d SOURCES/network-manager-applet-1.0.6.tar.xz diff --git a/SOURCES/nm-applet-no-notifications.patch b/SOURCES/nm-applet-no-notifications.patch index c228c20..be6b6bf 100644 --- a/SOURCES/nm-applet-no-notifications.patch +++ b/SOURCES/nm-applet-no-notifications.patch @@ -1,11 +1,13 @@ ---- network-manager-applet-0.9.7.0/org.gnome.nm-applet.gschema.xml.in.no-notifications 2012-08-14 08:59:42.000000000 -0400 -+++ network-manager-applet-0.9.7.0/org.gnome.nm-applet.gschema.xml.in 2012-08-20 14:14:00.148731379 -0400 +diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in +index 9e2887e..4f8c16a 100644 +--- a/org.gnome.nm-applet.gschema.xml.in ++++ b/org.gnome.nm-applet.gschema.xml.in @@ -17,7 +17,7 @@ - <_description>Set this to true to disable notifications when connecting to or disconnecting from a VPN. + Set this to true to disable notifications when connecting to or disconnecting from a VPN. - false + true - <_summary>Suppress networks available notifications - <_description>Set this to true to disable notifications when Wi-Fi networks are available. + Suppress networks available notifications + Set this to true to disable notifications when Wi-Fi networks are available. diff --git a/SOURCES/rh1267326-applet-password-crash.patch b/SOURCES/rh1267326-applet-password-crash.patch new file mode 100644 index 0000000..b27911e --- /dev/null +++ b/SOURCES/rh1267326-applet-password-crash.patch @@ -0,0 +1,125 @@ +From 6ee38dd8fb792a944ea597c9eba21f382d9c4836 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= +Date: Mon, 31 Aug 2015 15:42:13 +0200 +Subject: [PATCH] libnm-gtk: fix a possible crash on widgets destroy (rh + #1254043) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://bugzilla.redhat.com/show_bug.cgi?id=1254043 + +(cherry picked from commit 0d0e84316f5db87b4909f09060c596dfe48a69e7) +Signed-off-by: Jiří Klimeš +--- + src/libnm-gtk/nm-ui-utils.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c +index 9119deb..138bbea 100644 +--- a/src/libnm-gtk/nm-ui-utils.c ++++ b/src/libnm-gtk/nm-ui-utils.c +@@ -730,13 +730,13 @@ typedef struct { + } PopupMenuItemInfo; + + static void +-popup_menu_item_info_destroy (gpointer data) ++popup_menu_item_info_destroy (gpointer data, GClosure *closure) + { + PopupMenuItemInfo *info = (PopupMenuItemInfo *) data; + + if (info->setting) + g_object_unref (info->setting); +- g_slice_free (PopupMenuItemInfo, data); ++ g_slice_free (PopupMenuItemInfo, info); + } + + static void +@@ -824,11 +824,8 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry, + if (with_not_required) + gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[3]); + +- if (setting) +- g_object_ref (setting); +- + info = g_slice_new0 (PopupMenuItemInfo); +- info->setting = setting; ++ info->setting = setting ? g_object_ref (setting) : NULL; + info->password_flags_name = password_flags_name; + info->item_number = ITEM_STORAGE_USER; + info->passwd_entry = passwd_entry; +@@ -838,7 +835,7 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry, + (GClosureNotify) popup_menu_item_info_destroy, 0); + + info = g_slice_new0 (PopupMenuItemInfo); +- info->setting = setting; ++ info->setting = setting ? g_object_ref (setting) : NULL; + info->password_flags_name = password_flags_name; + info->item_number = ITEM_STORAGE_SYSTEM; + info->passwd_entry = passwd_entry; +@@ -848,7 +845,7 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry, + (GClosureNotify) popup_menu_item_info_destroy, 0); + + info = g_slice_new0 (PopupMenuItemInfo); +- info->setting = setting; ++ info->setting = setting ? g_object_ref (setting) : NULL; + info->password_flags_name = password_flags_name; + info->item_number = ITEM_STORAGE_ASK; + info->passwd_entry = passwd_entry; +@@ -860,7 +857,7 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry, + + if (with_not_required) { + info = g_slice_new0 (PopupMenuItemInfo); +- info->setting = setting; ++ info->setting = setting ? g_object_ref (setting) : NULL; + info->password_flags_name = password_flags_name; + info->item_number = ITEM_STORAGE_UNUSED; + info->passwd_entry = passwd_entry; +-- +2.1.0 + +From d5e25cfd45e485de9be23b5c40196462dd770e73 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= +Date: Fri, 11 Sep 2015 23:09:44 +0200 +Subject: [PATCH] wireless-security: fix an initial sensitivity of "Show + password" checkbox +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It also fixes the strange error when clicking "Cancel" in the editor: +(nm-connection-editor:13074): Gtk-CRITICAL **: gtk_event_controller_reset: assertion 'GTK_IS_EVENT_CONTROLLER (controller)' failed + +12773 gtk_event_controller_reset (data->controller); +(gdb) p data +$121 = (EventControllerData *) 0x1448c80 +(gdb) p *data +$122 = {controller = 0x0, evmask_notify_id = 22028, grab_notify_id = 22029, sequence_state_changed_id = 22030} + +It was invoked by +Breakpoint 1, destroy (parent=0x103c600) at eap-method-ttls.c:46 +48 if (method->size_group) +eap_method_unref (method=0x103c600) at eap-method.c:196 +199 g_object_unref (method->ui_widget); + +(cherry picked from commit 9aa77ea2ca2b0699f8a86e5c7c2a5c92a7256f48) +Signed-off-by: Jiří Klimeš +--- + src/wireless-security/eap-method-simple.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c +index 557bc74..bffe179 100644 +--- a/src/wireless-security/eap-method-simple.c ++++ b/src/wireless-security/eap-method-simple.c +@@ -235,6 +235,7 @@ set_userpass_ui (EAPMethodSimple *method) + gtk_entry_set_text (method->password_entry, ""); + + gtk_toggle_button_set_active (method->show_password, method->ws_parent->show_password); ++ password_storage_changed (NULL, NULL, method); + } + + static void +-- +2.1.0 + diff --git a/SOURCES/rh1267330-password-storage-icons-tooltips.patch b/SOURCES/rh1267330-password-storage-icons-tooltips.patch new file mode 100644 index 0000000..b34c42b --- /dev/null +++ b/SOURCES/rh1267330-password-storage-icons-tooltips.patch @@ -0,0 +1,109 @@ +From a927e31d01361fe710908cf43f405b4a1899d827 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Tue, 8 Sep 2015 20:39:26 +0200 +Subject: [PATCH] libnma: fix wrong mnemonics in tooltips for password entries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The mnemonics of radio buttons *inside* the pop-up menu don't work +with respect to the whole window. They only work, if you already +opened the pop-up menu, and then press the mnemonic key. +But since you cannot open the pop-up menu with a shortcut, +this becomes moot and the user has to click anyway. + +But more importantly, we are using the same string as tooltip +for the icon, which wrongly showed the underscore of the mnemonic. +Fix that by just removing the the mnemonics. + +https://bugzilla.gnome.org/show_bug.cgi?id=754726 + +Fixes: 50b9650cc205a84dfe7082eb92e95ea2aaf554e8 +(cherry picked from commit d888f571e5de9570c62b8ec557d8219e64ec45ba) +Signed-off-by: Jiří Klimeš +--- + src/libnm-gtk/nm-ui-utils.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c +index 138bbea..2e8c191 100644 +--- a/src/libnm-gtk/nm-ui-utils.c ++++ b/src/libnm-gtk/nm-ui-utils.c +@@ -617,10 +617,10 @@ static const char *icon_name_table[ITEM_STORAGE_MAX + 1] = { + [ITEM_STORAGE_UNUSED] = "edit-clear", + }; + static const char *icon_desc_table[ITEM_STORAGE_MAX + 1] = { +- [ITEM_STORAGE_USER] = N_("Store the password only for this _user"), +- [ITEM_STORAGE_SYSTEM] = N_("Store the password for _all users"), +- [ITEM_STORAGE_ASK] = N_("As_k for this password every time"), +- [ITEM_STORAGE_UNUSED] = N_("The password is _not required"), ++ [ITEM_STORAGE_USER] = N_("Store the password only for this user"), ++ [ITEM_STORAGE_SYSTEM] = N_("Store the password for all users"), ++ [ITEM_STORAGE_ASK] = N_("Ask for this password every time"), ++ [ITEM_STORAGE_UNUSED] = N_("The password is not required"), + }; + + static void +@@ -811,12 +811,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry, + g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE)); + g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required)); + group = NULL; +- item[0] = gtk_radio_menu_item_new_with_mnemonic (group, icon_desc_table[0]); ++ item[0] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[0]); + group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0])); +- item[1] = gtk_radio_menu_item_new_with_mnemonic (group, icon_desc_table[1]); +- item[2] = gtk_radio_menu_item_new_with_mnemonic (group, icon_desc_table[2]); ++ item[1] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[1]); ++ item[2] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[2]); + if (with_not_required) +- item[3] = gtk_radio_menu_item_new_with_mnemonic (group, icon_desc_table[3]); ++ item[3] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[3]); + + gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]); + gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]); +-- +2.1.0 + +From 77a97f52da18e8edc3515fe3a769ef81c887baf2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= +Date: Fri, 11 Sep 2015 13:23:07 +0200 +Subject: [PATCH] libnma/libnm-gtk: use symbolic icons for password store menu + (bgo #754726) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Gnome prefers using symbolic icons to have uniform look and feel. + +https://github.com/GNOME/gnome-icon-theme-symbolic + +https://bugzilla.gnome.org/show_bug.cgi?id=754726 + +(cherry picked from commit acc53bdf55beef61ff8236d33515066dde715e82) +Signed-off-by: Jiří Klimeš +--- + src/libnm-gtk/nm-ui-utils.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c +index 90b3b4c..08bd32a 100644 +--- a/src/libnm-gtk/nm-ui-utils.c ++++ b/src/libnm-gtk/nm-ui-utils.c +@@ -611,10 +611,10 @@ typedef enum { + } MenuItem; + + static const char *icon_name_table[ITEM_STORAGE_MAX + 1] = { +- [ITEM_STORAGE_USER] = "document-save", +- [ITEM_STORAGE_SYSTEM] = "document-save-as", +- [ITEM_STORAGE_ASK] = "dialog-question", +- [ITEM_STORAGE_UNUSED] = "edit-clear", ++ [ITEM_STORAGE_USER] = "user-info-symbolic", ++ [ITEM_STORAGE_SYSTEM] = "system-users-symbolic", ++ [ITEM_STORAGE_ASK] = "dialog-question-symbolic", ++ [ITEM_STORAGE_UNUSED] = "edit-clear-all-symbolic", + }; + static const char *icon_desc_table[ITEM_STORAGE_MAX + 1] = { + [ITEM_STORAGE_USER] = N_("Store the password only for this user"), +-- +2.1.0 + diff --git a/SPECS/network-manager-applet.spec b/SPECS/network-manager-applet.spec index 26ddd2b..a8f635e 100644 --- a/SPECS/network-manager-applet.spec +++ b/SPECS/network-manager-applet.spec @@ -5,24 +5,26 @@ %define nm_version 1:1.0.0 %define obsoletes_ver 1:0.9.7 -%define snapshot .git20150122 -%define git_sha .76569a46 -%define realversion 1.0.0 +%define snapshot %{nil} +%define git_sha %{nil} +%define realversion 1.0.6 Name: network-manager-applet Summary: A network control and status applet for NetworkManager -Version: 1.0.0 +Version: %{realversion} Release: 2%{snapshot}%{git_sha}%{?dist} Group: Applications/System License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Obsoletes: NetworkManager-gnome < %{obsoletes_ver} -Source: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/%{name}-%{realversion}%{snapshot}%{git_sha}.tar.bz2 +Source: https://download.gnome.org/sources/network-manager-applet/1.0/%{name}-%{realversion}%{snapshot}%{git_sha}.tar.xz Patch0: nm-applet-no-notifications.patch Patch1: nm-applet-wifi-dialog-ui-fixes.patch Patch2: applet-ignore-deprecated.patch Patch3: 0001-Revert-applet-don-t-check-for-gnome-shell-bgo-707953.patch +Patch4: rh1267326-applet-password-crash.patch +Patch5: rh1267330-password-storage-icons-tooltips.patch Requires: NetworkManager >= %{nm_version} Requires: NetworkManager-glib >= %{nm_version} @@ -49,10 +51,6 @@ BuildRequires: libnotify-devel >= 0.4 BuildRequires: automake autoconf intltool libtool BuildRequires: gtk-doc BuildRequires: desktop-file-utils -# No bluetooth on s390 -%ifnarch s390 s390x -BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1 -%endif BuildRequires: iso-codes-devel BuildRequires: libgudev1-devel >= 147 BuildRequires: libsecret-devel >= 0.12 @@ -108,6 +106,8 @@ nm-applet, nm-connection-editor, and the GNOME control center. %patch1 -p1 -b .applet-wifi-ui %patch2 -p1 -b .no-deprecated %patch3 -p1 -b .revert-shell-watcher-removal +%patch4 -p1 -b .rh1267326-applet-password-crash +%patch5 -p1 -b .rh1267330-password-storage-icons-tooltips %build autoreconf -i -f @@ -127,7 +127,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties %find_lang nm-applet cat nm-applet.lang >> %{name}.lang -rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # validate .desktop and autostart files @@ -203,11 +202,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/nm-no-connection.* %{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml +%{_datadir}/appdata/org.gnome.nm-connection-editor.appdata.xml %{_mandir}/man1/nm-connection-editor* %dir %{_datadir}/gnome-vpn-properties -%ifnarch s390 s390x -%{_libdir}/gnome-bluetooth/plugins/* -%endif %files -n libnm-gtk %defattr(-,root,root,0755) @@ -225,6 +222,33 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/gir-1.0/NMGtk-1.0.gir %changelog +* Wed Sep 30 2015 Jiří Klimeš - 1.0.6-2 + - libnm-gtk: fix a possible crash on widgets destroy (rh #1267326) + - libnm-gtk: use symbolic icons for password store menu (rh #1267330) + +* Tue Jul 14 2015 Lubomir Rintel - 1.0.6-1 +- Align with the 1.0.6 upstream release: +- editor: add support for setting MTU on team connections (rh #1255927) +- editor: offer bond connections in vlan slave picker (rh #1255735) + +* Tue Jul 14 2015 Lubomir Rintel - 1.0.4-1 +- Align with the upstream release + +* Wed Jun 17 2015 Jiří Klimeš - 1.0.3-2.git20150617.a0b0166 +- New snapshot: +- editor: let users edit connection.interface-name property (rh #1139536) + +* Mon Jun 15 2015 Lubomir Rintel - 1.0.3-1.git20160615.28a0e28 +- New snapshot: +- applet: make new auto connections only available for current user (rh #1176042) +- editor: allow forcing always-on-top windows for installer (rh #1097883) +- editor: allow changing bond MTU (rh #1177582) +- editor: use ifname instead of UUID in slaves' master property (rh #1083186) +- editor: allow adding Bluetooth connections (rh #1229471) + +* Tue May 19 2015 Debarshi Ray - 1.0.0-3.git20150122.76569a46 +- Drop gnome-bluetooth BR because it does not work with newer versions (rh #1174547) + * Thu Jan 22 2015 Dan Williams - 1.0.0-2.git20150122.76569a46 - editor: fix IPoIB editing support (rh #1182560)