rpms/network-manager-applet
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.8.20 release

Browse Source
This commit is contained in:
Beniamino Galvani 2019-02-08 17:20:45 +01:00
parent 522ed904c9
commit ac4ee81c12
5 changed files with 9 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -44,3 +44,4 @@
/network-manager-applet-1.8.14.tar.xz
/network-manager-applet-1.8.16.tar.xz
/network-manager-applet-1.8.18.tar.xz
/network-manager-applet-1.8.20.tar.xz

226
0002-no-show-all.patch
View File

@ -1,226 +0,0 @@
From 41a2fc54b0210199b1f3a95d3f52006250b02f9a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 13 Sep 2018 21:28:36 +0200
Subject: [PATCH 1/3] Revert "8021x-security: don't show_all() the widgets"
This reverts commit 546539e3c9fe40ab71ed3d62312e9768df661371.
(cherry picked from commit 9b5c5eed6aa68eae373d948375adbbc3fabcea27)
---
src/connection-editor/page-8021x-security.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c
index 874384ae..bbe614bb 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -88,6 +88,7 @@ finish_setup (CEPage8021xSecurity *self, gpointer user_data)
gtk_box_pack_start (GTK_BOX (parent->page), GTK_WIDGET (priv->enabled), FALSE, TRUE, 12);
gtk_box_pack_start (GTK_BOX (parent->page), priv->security_widget, TRUE, TRUE, 0);
+ gtk_widget_show_all (parent->page);
}
CEPage *
--
2.17.1
From c242511f0899f2a0481e51eff55403ecd265ce0d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 13 Sep 2018 21:28:38 +0200
Subject: [PATCH 2/3] Revert "editor/vpn: don't show_all() the widgets"
This reverts commit ba8df364841f9435579b5234e11ebf68bdc14c53.
(cherry picked from commit 2f6caff910304a58168961e1d2aa5259a9bf5e0f)
---
src/connection-editor/page-vpn.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index 667340d1..da99f7b3 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -75,6 +75,7 @@ finish_setup (CEPageVpn *self, gpointer user_data)
return;
}
g_object_ref_sink (parent->page);
+ gtk_widget_show_all (parent->page);
}
CEPage *
--
2.17.1
From 20909706e30bbd4af5dce35eaee2091c256fcb7b Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 13 Sep 2018 21:28:40 +0200
Subject: [PATCH 3/3] Revert "libnma: drop use of GtkWidget.no-show-all
property"
This reverts commit 07d900c0b3a52ee7aefc2f24e62914d40113b24b.
(cherry picked from commit f56334c307f22255d0e01fa3e003ddb49f287e2c)
---
src/libnma/nma-file-cert-chooser.c | 7 +++++++
src/libnma/nma-mobile-wizard.ui | 2 +-
src/libnma/nma-vpn-password-dialog.ui | 18 +++++++++++-------
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/libnma/nma-file-cert-chooser.c b/src/libnma/nma-file-cert-chooser.c
index e263bb9a..ad239af4 100644
--- a/src/libnma/nma-file-cert-chooser.c
+++ b/src/libnma/nma-file-cert-chooser.c
@@ -307,6 +307,7 @@ init (NMACertChooser *cert_chooser)
gtk_widget_set_hexpand (priv->key_button, TRUE);
gtk_widget_set_sensitive (priv->key_button, FALSE);
gtk_widget_show (priv->key_button);
+ gtk_widget_set_no_show_all (priv->key_button, TRUE);
g_signal_connect (priv->key_button, "selection-changed",
G_CALLBACK (key_changed_cb), cert_chooser);
@@ -317,6 +318,7 @@ init (NMACertChooser *cert_chooser)
gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_button_label, 0, 0, 1, 1);
gtk_widget_set_sensitive (priv->key_button_label, FALSE);
gtk_widget_show (priv->key_button_label);
+ gtk_widget_set_no_show_all (priv->key_button_label, TRUE);
/* The key password entry */
gtk_grid_insert_row (GTK_GRID (cert_chooser), 1);
@@ -327,6 +329,7 @@ init (NMACertChooser *cert_chooser)
gtk_widget_set_hexpand (priv->key_password, TRUE);
gtk_widget_set_sensitive (priv->key_password, FALSE);
gtk_widget_show (priv->key_password);
+ gtk_widget_set_no_show_all (priv->key_password, TRUE);
g_signal_connect (priv->key_password, "changed",
G_CALLBACK (key_password_changed_cb), cert_chooser);
@@ -337,12 +340,14 @@ init (NMACertChooser *cert_chooser)
gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_password_label, 0, 1, 1, 1);
gtk_widget_set_sensitive (priv->key_password_label, FALSE);
gtk_widget_show (priv->key_password_label);
+ gtk_widget_set_no_show_all (priv->key_password_label, TRUE);
/* Show password */
gtk_grid_insert_row (GTK_GRID (cert_chooser), 2);
priv->show_password = gtk_check_button_new_with_mnemonic ("Sho_w password");
gtk_grid_attach (GTK_GRID (cert_chooser), priv->show_password, 1, 2, 1, 1);
gtk_widget_show (priv->show_password);
+ gtk_widget_set_no_show_all (priv->show_password, TRUE);
g_signal_connect (priv->show_password, "toggled",
G_CALLBACK (show_toggled_cb), cert_chooser);
@@ -358,6 +363,7 @@ init (NMACertChooser *cert_chooser)
gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button, 1, 0, 1, 1);
gtk_widget_set_hexpand (priv->cert_button, TRUE);
gtk_widget_show (priv->cert_button);
+ gtk_widget_set_no_show_all (priv->cert_button, TRUE);
/* For some reason, GTK+ calls set_current_filter (..., NULL) from
* gtkfilechooserdefault.c::show_and_select_files_finished_loading() on our
@@ -375,6 +381,7 @@ init (NMACertChooser *cert_chooser)
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_button_label), priv->cert_button);
gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button_label, 0, 0, 1, 1);
gtk_widget_show (priv->cert_button_label);
+ gtk_widget_set_no_show_all (priv->cert_button_label, TRUE);
}
const NMACertChooserVtable nma_cert_chooser_vtable_file = {
diff --git a/src/libnma/nma-mobile-wizard.ui b/src/libnma/nma-mobile-wizard.ui
index 07b31fe9..6cef85f7 100644
--- a/src/libnma/nma-mobile-wizard.ui
+++ b/src/libnma/nma-mobile-wizard.ui
@@ -608,9 +608,9 @@ If you are unsure of your plan please ask your provider for your plan’s APN.</
</child>
<child>
<object class="GtkLabel" id="confirm_connect_after_label">
- <property name="visible">False</property>
<property name="width_request">500</property>
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="valign">end</property>
<property name="vexpand">True</property>
<property name="label" translatable="yes">A connection will now be made to your mobile broadband provider using the settings you selected. If the connection fails or you cannot access network resources, double-check your settings. To modify your mobile broadband connection settings, choose “Network Connections” from the System → Preferences menu.</property>
diff --git a/src/libnma/nma-vpn-password-dialog.ui b/src/libnma/nma-vpn-password-dialog.ui
index b611bec2..bcbac83c 100644
--- a/src/libnma/nma-vpn-password-dialog.ui
+++ b/src/libnma/nma-vpn-password-dialog.ui
@@ -86,8 +86,8 @@
</child>
<child>
<object class="GtkEntry" id="password_entry_tertiary">
- <property name="visible">False</property>
<property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
<property name="visibility">False</property>
<property name="width_chars">20</property>
<signal name="activate" handler="gtk_window_activate_default" swapped="yes"/>
@@ -99,8 +99,9 @@
</child>
<child>
<object class="GtkEntry" id="password_entry_secondary">
- <property name="visible">False</property>
+ <property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
<property name="visibility">False</property>
<property name="width_chars">20</property>
<signal name="activate" handler="gtk_window_activate_default" swapped="yes"/>
@@ -112,8 +113,9 @@
</child>
<child>
<object class="GtkEntry" id="password_entry">
- <property name="visible">False</property>
+ <property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
<property name="visibility">False</property>
<property name="width_chars">20</property>
<signal name="activate" handler="gtk_window_activate_default" swapped="yes"/>
@@ -125,8 +127,8 @@
</child>
<child>
<object class="GtkLabel" id="password_label_tertiary">
- <property name="visible">False</property>
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="label" translatable="yes">_Tertiary Password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">password_entry_tertiary</property>
@@ -139,8 +141,9 @@
</child>
<child>
<object class="GtkLabel" id="password_label_secondary">
- <property name="visible">False</property>
+ <property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="label" translatable="yes">_Secondary Password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">password_entry_secondary</property>
@@ -153,8 +156,9 @@
</child>
<child>
<object class="GtkLabel" id="password_label">
- <property name="visible">False</property>
+ <property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="label" translatable="yes">_Password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">password_entry</property>
@@ -167,8 +171,8 @@
</child>
<child>
<object class="GtkLabel" id="message_label">
- <property name="visible">False</property>
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="halign">start</property>
<property name="margin_bottom">12</property>
<property name="hexpand">True</property>
--
2.17.1

149
0003-wifi-dialog-fixes.patch
View File

@ -1,149 +0,0 @@
From 381bf2e84fbd5728dbe967a1ab4efda95654a3e4 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Sat, 12 Jan 2019 21:43:21 +0100
Subject: [PATCH 1/2] wifi-dialog: remember the specific_connection construct
parameter
The specific_connection parameter is passed to
connection_combo_init(), which stores the connection in
priv->connection. When the user changes device, device_combo_changed()
calls again connection_combo_init() passing a NULL argument and so the
specific connection gets lost.
Store the specific_connection in the dialog private data and use it
when the connection combo is re-initialized.
https://bugzilla.redhat.com/show_bug.cgi?id=1665653
(cherry picked from commit 348cc284bf3497dcef6394e8438a9c4a8411852e)
---
src/libnma/nma-wifi-dialog.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c
index 3ac5fd68..8d05e585 100644
--- a/src/libnma/nma-wifi-dialog.c
+++ b/src/libnma/nma-wifi-dialog.c
@@ -48,6 +48,7 @@ typedef struct {
GtkBuilder *builder;
+ NMConnection *specific_connection;
NMConnection *connection;
NMDevice *device;
NMAccessPoint *ap;
@@ -421,7 +422,7 @@ alphabetize_connections (NMConnection *a, NMConnection *b)
}
static gboolean
-connection_combo_init (NMAWifiDialog *self, NMConnection *connection)
+connection_combo_init (NMAWifiDialog *self)
{
NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GtkListStore *store;
@@ -439,8 +440,8 @@ connection_combo_init (NMAWifiDialog *self, NMConnection *connection)
store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_OBJECT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
priv->connection_model = GTK_TREE_MODEL (store);
- if (connection) {
- s_con = nm_connection_get_setting_connection (connection);
+ if (priv->specific_connection) {
+ s_con = nm_connection_get_setting_connection (priv->specific_connection);
g_assert (s_con);
id = nm_setting_connection_get_id (s_con);
if (id == NULL) {
@@ -454,7 +455,7 @@ connection_combo_init (NMAWifiDialog *self, NMConnection *connection)
gtk_list_store_append (store, &tree_iter);
gtk_list_store_set (store, &tree_iter,
C_NAME_COLUMN, id,
- C_CON_COLUMN, connection, -1);
+ C_CON_COLUMN, priv->specific_connection, -1);
} else {
GSList *to_add = NULL, *iter;
const GPtrArray *connections;
@@ -551,7 +552,7 @@ connection_combo_init (NMAWifiDialog *self, NMConnection *connection)
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (connection_combo_changed), self);
- if (connection || !num_added) {
+ if (priv->specific_connection || !num_added) {
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->builder, "connection_label")));
gtk_widget_hide (widget);
}
@@ -579,7 +580,7 @@ device_combo_changed (GtkWidget *combo,
g_object_unref (priv->device);
gtk_tree_model_get (model, &iter, D_DEV_COLUMN, &priv->device, -1);
- if (!connection_combo_init (self, NULL)) {
+ if (!connection_combo_init (self)) {
g_warning ("Couldn't change connection combo box.");
return;
}
@@ -1053,6 +1054,9 @@ internal_init (NMAWifiDialog *self,
else
icon_name = "network-wireless";
+ if (specific_connection)
+ priv->specific_connection = g_object_ref (specific_connection);
+
gtk_window_set_icon_name (GTK_WINDOW (self), icon_name);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "image1"));
gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_DIALOG);
@@ -1104,7 +1108,7 @@ internal_init (NMAWifiDialog *self,
return FALSE;
}
- if (!connection_combo_init (self, specific_connection)) {
+ if (!connection_combo_init (self)) {
g_warning ("Couldn't set up connection combo box.");
return FALSE;
}
@@ -1401,6 +1405,7 @@ dispose (GObject *object)
g_clear_object (&priv->group);
+ g_clear_object (&priv->specific_connection);
g_clear_object (&priv->connection);
g_clear_object (&priv->device);
--
2.20.1
From b972be7df89f127bc64342f221b7a31197eff8bf Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Sat, 12 Jan 2019 22:35:10 +0100
Subject: [PATCH 2/2] wifi-dialog: fix connection combo signals
We need to connect to "changed" signal only when the widget is
displayed. Also, connection_combo_init() can be called multiple times
and so we need to clear previous handlers registration or the
function can be called multiple times.
(cherry picked from commit cf176a76898e6e06a1524f3f98bfcfdf842747f6)
---
src/libnma/nma-wifi-dialog.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c
index 8d05e585..6b68e601 100644
--- a/src/libnma/nma-wifi-dialog.c
+++ b/src/libnma/nma-wifi-dialog.c
@@ -550,11 +550,14 @@ connection_combo_init (NMAWifiDialog *self)
NULL);
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
- g_signal_connect (G_OBJECT (widget), "changed",
- G_CALLBACK (connection_combo_changed), self);
+
+ g_signal_handlers_disconnect_by_func (widget, connection_combo_changed, self);
if (priv->specific_connection || !num_added) {
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->builder, "connection_label")));
gtk_widget_hide (widget);
+ } else {
+ g_signal_connect (widget, "changed",
+ G_CALLBACK (connection_combo_changed), self);
}
if (gtk_tree_model_get_iter_first (priv->connection_model, &tree_iter))
gtk_tree_model_get (priv->connection_model, &tree_iter, C_CON_COLUMN, &priv->connection, -1);
--
2.20.1

13
network-manager-applet.spec
View File

@ -3,9 +3,9 @@
%global nm_version 1:1.1.0
%global obsoletes_ver 1:0.9.7
%global rpm_version 1.8.18
%global real_version 1.8.18
%global release_version 3
%global rpm_version 1.8.20
%global real_version 1.8.20
%global release_version 1
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
@ -18,15 +18,13 @@
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: %{rpm_version}
Release: %{release_version}%{?dist}.1
Release: %{release_version}%{?dist}
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
Patch1: 0001-nm-applet-no-notifications.patch
Patch2: 0002-no-show-all.patch
Patch3: 0003-wifi-dialog-fixes.patch
Requires: NetworkManager >= %{nm_version}
Requires: libnotify >= 0.4.3
@ -212,6 +210,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%changelog
* Fri Feb 08 2019 Beniamino Galvani <bgalvani@redhat.com> - 1.8.20-1
- Update to 1.8.20 release
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.18-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (network-manager-applet-1.8.18.tar.xz) = 4871d95f3260beb8c3207e5ec8e25437b3d01758afc3bfe7d877774b21a05f4523449ee32e4cff27c082fefef88fed01db718d2227d6896c3c9b85d09cee927b
SHA512 (network-manager-applet-1.8.20.tar.xz) = 5020aefe1803ad3b59562478e793737b52a3e5fd294470cfb430c73937cdbc0be6ecba5f3f8e8dbcc5bb5ac293df2866ecc919dd5019a3e681a434078d235a41