Backport fix for fallout from libnm port

This commit is contained in:
Florian Müllner 2018-05-09 17:00:24 +02:00
parent 11366f8161
commit a7d4db4086
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From c0a453f64f4c725e520830b2cdba8a608acc94e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 9 May 2018 16:17:17 +0200
Subject: [PATCH] networkAgent: Fix fallout from libnm port
While the libnm-glib version of the function returns a GByteArray*
that gjs can directly cast to the required gutf8*, the libnm function
returns GBytes* from which we need to explicitly fetch the data.
https://gitlab.gnome.org/GNOME/gnome-shell/issues/136
---
js/ui/components/networkAgent.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index 9050b8a50..5bd648a73 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -660,7 +660,7 @@ var NetworkAgent = new Lang.Class({
switch (connectionType) {
case '802-11-wireless':
let wirelessSetting = connection.get_setting_wireless();
- let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid());
+ let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
title = _("Authentication required by wireless network");
body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
break;
--
2.16.2

View File

@ -1,6 +1,6 @@
Name: gnome-shell
Version: 3.29.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Window management and application launching for GNOME
Group: User Interface/Desktops
@ -17,6 +17,8 @@ Patch1: gnome-shell-favourite-apps-firefox.patch
# key - GGO#240, RHBZ #1569211, backported from upstream master
Patch2: 0001-keyboardManager-Preserve-current-keymap-across-reloa.patch
Patch3: 0001-networkAgent-Fix-fallout-from-libnm-port.patch
%define gnome_bluetooth_version 1:3.9.0
%define gobject_introspection_version 1.45.4
%define gjs_version 1.51.90
@ -189,6 +191,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
%{_mandir}/man1/%{name}.1.gz
%changelog
* Wed May 09 2018 Florian Müllner <fmuellner@redhat.com> - 3.29.1-3
- Fix automatic connection to wireless networks without stored secrets
* Sun Apr 29 2018 Adam Williamson <awilliam@redhat.com> - 3.29.1-2
- Backport fix for password entry modifier key issues (#1569211)