Update to latest git snapshot (git20140424 SHA:9ba9c3e)

This commit is contained in:
Jiří Klimeš 2014-04-24 10:48:33 +02:00
parent 5cc21f72b7
commit 164ced3934
4 changed files with 15 additions and 10 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@
/network-manager-applet-0.9.9.0.git20131028.tar.bz2
/network-manager-applet-0.9.9.0.git20140121.07a8138.tar.bz2
/network-manager-applet-0.9.9.0.git20140123.5d4f17e.tar.bz2
/network-manager-applet-0.9.9.0.git20140424.9ba9c3e.tar.bz2

View File

@ -5,14 +5,14 @@
%define nm_version 1:0.9.9.0-26
%define obsoletes_ver 1:0.9.7
%define snapshot .git20140123
%define git_sha .5d4f17e
%define snapshot .git20140424
%define git_sha .9ba9c3e
%define realversion 0.9.9.0
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: 0.9.9.0
Release: 9%{snapshot}%{?dist}
Release: 10%{snapshot}%{?dist}
Group: Applications/System
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@ -215,6 +215,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/gir-1.0/NMGtk-1.0.gir
%changelog
* Thu Apr 24 2014 Jiří Klimeš <jklimes@redhat.com> - 0.9.9.0-10.git20140424
- update to latest git snapshot (git20140424 sha:9ba9c3e)
* Mon Mar 24 2014 Dan Winship <danw@redhat.com> - 0.9.9.0-9.git20140123
- Add ModemManager-glib-devel to BuildRequires

View File

@ -1,6 +1,6 @@
--- 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 @@
--- network-manager-applet-0.9.9.0/src/libnm-gtk/nm-wifi-dialog.c 2014-03-27 12:25:15.000000000 +0100
+++ network-manager-applet-0.9.9.0/src/libnm-gtk/nm-wifi-dialog.c.foo 2014-04-24 11:11:26.531662179 +0200
@@ -1134,25 +1134,29 @@
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network '%s'."),
esc_ssid ? esc_ssid : "<unknown>");
@ -10,17 +10,18 @@
tmp);
g_free (esc_ssid);
g_free (tmp);
} else if (priv->adhoc_create) {
} else if (priv->operation == OP_CREATE_ADHOC) {
- 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 Wi-Fi network"),
_("Enter a name for the Wi-Fi network you wish to create."));
} else {
} else if (priv->operation == OP_CONNECT_HIDDEN) {
- 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 Wi-Fi network"),
_("Enter the name and security details of the hidden Wi-Fi network you wish to connect to."));
}
} else
g_assert_not_reached ();
+ /* The primary text should always tell the story, not the title. And since
+ * the dialog is always on top, we can skip the taskbar.

View File

@ -1 +1 @@
9cc0e383c216d4bc31622a0cfb53aaa7 network-manager-applet-0.9.9.0.git20140123.5d4f17e.tar.bz2
c0ff67d50b2cb09eb16e4c964451dc1c network-manager-applet-0.9.9.0.git20140424.9ba9c3e.tar.bz2