[NetworkManager] Add forgotten patches
Daniel Williams
dcbw at fedoraproject.org
Fri Mar 25 21:15:23 UTC 2011
commit 86a16be5172c9c5c179826b6e77f99a29baaf121
Author: Dan Williams <dcbw at redhat.com>
Date: Fri Mar 25 16:16:25 2011 -0500
Add forgotten patches
nm-applet-wifi-dialog-ui-fixes.patch | 36 ++++++++++++++++++++++++++++++++++
nm-polkit-permissive.patch | 12 +++++++++++
2 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/nm-applet-wifi-dialog-ui-fixes.patch b/nm-applet-wifi-dialog-ui-fixes.patch
new file mode 100644
index 0000000..d0d29eb
--- /dev/null
+++ b/nm-applet-wifi-dialog-ui-fixes.patch
@@ -0,0 +1,36 @@
+diff --git NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-dialog.c NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-dialog.c
+index 2cd75e0..5ae4764 100644
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-dialog.c
++++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-dialog.c
+@@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self,
+
+ tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),
+ esc_ssid ? esc_ssid : "<unknown>");
+- gtk_window_set_title (GTK_WINDOW (self), _("Wireless Network Authentication Required"));
+ label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+ _("Authentication required by wireless network"),
+ tmp);
+ g_free (esc_ssid);
+ g_free (tmp);
+ } else if (priv->adhoc_create) {
+- gtk_window_set_title (GTK_WINDOW (self), _("Create New Wireless Network"));
+ label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+ _("New wireless network"),
+ _("Enter a name for the wireless network you wish to create."));
+ } else {
+- gtk_window_set_title (GTK_WINDOW (self), _("Connect to Hidden Wireless Network"));
+ label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+ _("Hidden wireless network"),
+ _("Enter the name and security details of the hidden wireless network you wish to connect to."));
+ }
+
++ /* The primary text should always tell the story, not the title. And since
++ * the dialog is always on top, we can skip the taskbar.
++ */
++ gtk_window_set_title (GTK_WINDOW (self), "");
++ gtk_window_set_keep_above (GTK_WINDOW (self), TRUE);
++ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (self), TRUE);
++
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "caption_label"));
+ gtk_label_set_markup (GTK_LABEL (widget), label);
+ g_free (label);
diff --git a/nm-polkit-permissive.patch b/nm-polkit-permissive.patch
new file mode 100644
index 0000000..1ac4062
--- /dev/null
+++ b/nm-polkit-permissive.patch
@@ -0,0 +1,12 @@
+diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in
+--- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive 2011-03-24 14:21:35.100912222 -0500
++++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in 2011-03-24 14:21:49.916726997 -0500
+@@ -95,7 +95,7 @@
+ <_message>System policy prevents modification of network settings for all users</_message>
+ <defaults>
+ <allow_inactive>no</allow_inactive>
+- <allow_active>auth_admin_keep</allow_active>
++ <allow_active>yes</allow_active>
+ </defaults>
+ </action>
+
More information about the scm-commits
mailing list