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

Update to 0.9.7.0 snapshot

Browse Source
This commit is contained in:
Dan Winship 2012-08-21 14:36:15 -04:00
parent 4f56be3e92
commit 47b4f940fd
5 changed files with 27 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/network-manager-applet-0.9.4.1.git20120521.tar.bz2
/network-manager-applet-0.9.5.95.git20120713.tar.bz2
/network-manager-applet-0.9.5.96.tar.bz2
/network-manager-applet-0.9.7.0.git20120820.tar.bz2

17
network-manager-applet.spec
View File

@ -2,16 +2,16 @@
%define glib2_version 2.26.0
%define dbus_version 1.4
%define dbus_glib_version 0.86
%define nm_version 1:0.9.5.95
%define obsoletes_ver 1:0.9.5
%define nm_version 1:0.9.7.0
%define obsoletes_ver 1:0.9.5.96
%define snapshot %{nil}
%define realversion 0.9.5.96
%define snapshot .git20120820
%define realversion 0.9.7.0
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: 0.9.5.96
Release: 2%{snapshot}%{?dist}
Version: 0.9.7.0
Release: 1%{snapshot}%{?dist}
Group: Applications/System
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@ -169,7 +169,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/nm-applet
%{_libexecdir}/nm-applet-migration-tool
%{_datadir}/applications/nm-applet.desktop
%{_datadir}/nm-applet/wired-8021x.ui
%{_datadir}/nm-applet/8021x.ui
%{_datadir}/nm-applet/info.ui
%{_datadir}/nm-applet/gsm-unlock.ui
%{_datadir}/nm-applet/keyring.png
@ -219,6 +219,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so
%changelog
* Tue Aug 21 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-1.git20120820
- Update to 0.9.7.0 snapshot
* Tue Aug 14 2012 Daniel Drake <dsd@laptop.org> - 0.9.5.96-2
- Rebuild for libgnome-bluetooth.so.11

23
nm-applet-no-notifications.patch
View File

@ -1,22 +1,5 @@
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
index 71b6a29..1a41d0e 100644
--- network-manager-applet-0.9.5.96/org.gnome.nm-applet.gschema.xml.in
+++ network-manager-applet-0.9.5.96/org.gnome.nm-applet.gschema.xml.in
@@ -2,12 +2,12 @@
<schemalist gettext-domain="nm-applet">
<schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/">
<key name="disable-connected-notifications" type="b">
- <default>false</default>
+ <default>true</default>
<_summary>Disable connected notifications</_summary>
<_description>Set this to true to disable notifications when connecting to a network.</_description>
</key>
<key name="disable-disconnected-notifications" type="b">
- <default>false</default>
+ <default>true</default>
<_summary>Disable disconnected notifications</_summary>
<_description>Set this to true to disable notifications when disconnecting from a network.</_description>
</key>
--- 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
@@ -17,7 +17,7 @@
<_description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</_description>
</key>
@ -24,5 +7,5 @@ index 71b6a29..1a41d0e 100644
- <default>false</default>
+ <default>true</default>
<_summary>Suppress networks available notifications</_summary>
<_description>Set this to true to disable notifications when wireless networks are available.</_description>
<_description>Set this to true to disable notifications when Wi-Fi networks are available.</_description>
</key>

26
nm-applet-wifi-dialog-ui-fixes.patch
View File

@ -1,27 +1,25 @@
diff --git network-manager-applet-0.9.5.96/src/libnm-gtk/nm-wireless-dialog.c network-manager-applet-0.9.5.96/src/libnm-gtk/nm-wireless-dialog.c
index 2cd75e0..5ae4764 100644
--- network-manager-applet-0.9.5.96/src/libnm-gtk/nm-wireless-dialog.c
+++ network-manager-applet-0.9.5.96/src/libnm-gtk/nm-wireless-dialog.c
@@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self,
--- network-manager-applet-0.9.7.0/src/libnm-gtk/nm-wifi-dialog.c.applet-wifi-ui 2012-08-14 08:59:42.000000000 -0400
+++ network-manager-applet-0.9.7.0/src/libnm-gtk/nm-wifi-dialog.c 2012-08-20 14:17:10.059729528 -0400
@@ -1140,24 +1140,28 @@
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network '%s'."),
esc_ssid ? esc_ssid : "<unknown>");
- gtk_window_set_title (GTK_WINDOW (self), _("Wireless Network Authentication Required"));
- gtk_window_set_title (GTK_WINDOW (self), _("Wi-Fi Network Authentication Required"));
label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
_("Authentication required by wireless network"),
_("Authentication required by Wi-Fi 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"));
- gtk_window_set_title (GTK_WINDOW (self), _("Create New Wi-Fi 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."));
_("New Wi-Fi network"),
_("Enter a name for the Wi-Fi network you wish to create."));
} else {
- gtk_window_set_title (GTK_WINDOW (self), _("Connect to Hidden Wireless Network"));
- gtk_window_set_title (GTK_WINDOW (self), _("Connect to Hidden Wi-Fi 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."));
_("Hidden Wi-Fi network"),
_("Enter the name and security details of the hidden Wi-Fi network you wish to connect to."));
}
+ /* The primary text should always tell the story, not the title. And since

2
sources
View File

@ -1 +1 @@
27d9d0663aadf64a8f449cb88afdc7a5 network-manager-applet-0.9.5.96.tar.bz2
2c952377e41b048e456f133799cea895 network-manager-applet-0.9.7.0.git20120820.tar.bz2