- Ensure that mobile broadband cards are powered up before trying to use
them - Hostname changing support (rh #441453) - Fix mobile broadband secret requests to happen less often - Better handling of default devices and default routes - Better information in tooltips and notifications - Various UI cleanups; hide widgets that aren't used (rh #465397, rh #465395) - Accept different separators for DNS servers and searches - Make applet's icon accurately reflect signal strength of the current AP
This commit is contained in:
Daniel Williams
parent
c6f296b687
commit
c9bde83e4c
@ -114,3 +114,5 @@ NetworkManager-0.7.0.svn3927.tar.gz
|
||||
nm-applet-0.7.0.svn837.tar.gz
|
||||
NetworkManager-0.7.0.svn3930.tar.gz
|
||||
nm-applet-0.7.0.svn838.tar.gz
|
||||
NetworkManager-0.7.0.svn4174.tar.gz
|
||||
nm-applet-0.7.0.svn939.tar.gz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
|
||||
--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2008-06-17 13:51:13.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-07-18 11:52:29.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-10-12 08:25:08.000000000 -0400
|
||||
@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
|
||||
PKG_CHECK_MODULES(NMA,
|
||||
[dbus-glib-1 >= 0.72
|
||||
@ -13,8 +13,8 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManag
|
||||
libglade-2.0
|
||||
gmodule-export-2.0
|
||||
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
|
||||
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-07-03 07:08:55.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-07-18 11:52:29.000000000 -0400
|
||||
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-08-11 13:40:26.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-10-12 08:25:08.000000000 -0400
|
||||
@@ -2,6 +2,10 @@ NULL=
|
||||
|
||||
bin_PROGRAMS = nm-connection-editor
|
||||
@ -26,7 +26,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.
|
||||
nm_connection_editor_CPPFLAGS = \
|
||||
$(NMA_CFLAGS) \
|
||||
-DICONDIR=\""$(datadir)/icons"\" \
|
||||
@@ -60,7 +64,10 @@ nm_connection_editor_LDADD = \
|
||||
@@ -65,7 +69,10 @@ nm_connection_editor_LDADD = \
|
||||
${top_builddir}/src/wireless-security/libwireless-security.la \
|
||||
${top_builddir}/src/utils/libutils.la \
|
||||
$(NMA_LIBS) \
|
||||
@ -40,7 +40,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.
|
||||
glade_DATA = \
|
||||
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
|
||||
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-07-18 11:52:29.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-10-12 08:25:08.000000000 -0400
|
||||
@@ -1,3 +1,7 @@
|
||||
+INCLUDES = -I${top_srcdir}/../include \
|
||||
+ -I${top_srcdir}/../libnm-util \
|
||||
@ -60,7 +60,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buil
|
||||
|
||||
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
|
||||
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2008-07-03 08:48:24.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-07-18 11:52:29.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-10-12 08:25:08.000000000 -0400
|
||||
@@ -4,6 +4,10 @@ NULL=
|
||||
|
||||
bin_PROGRAMS = nm-applet
|
||||
@ -85,7 +85,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkMa
|
||||
glade_DATA = applet.glade keyring.png
|
||||
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
|
||||
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-07-18 11:52:29.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-10-12 08:25:09.000000000 -0400
|
||||
@@ -1,3 +1,7 @@
|
||||
+INCLUDES = -I${top_srcdir}/../include \
|
||||
+ -I${top_srcdir}/../libnm-util \
|
||||
@ -105,7 +105,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix Net
|
||||
+
|
||||
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am
|
||||
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-07-18 11:52:29.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-10-12 08:25:09.000000000 -0400
|
||||
@@ -1,5 +1,9 @@
|
||||
noinst_LTLIBRARIES = libwireless-security.la
|
||||
|
||||
|
||||
@ -9,14 +9,14 @@ ExcludeArch: s390 s390x
|
||||
%define libnl_version 1.1
|
||||
%define ppp_version 2.2.4
|
||||
|
||||
%define snapshot svn4022
|
||||
%define applet_snapshot svn870
|
||||
%define snapshot svn4174
|
||||
%define applet_snapshot svn939
|
||||
|
||||
Name: NetworkManager
|
||||
Summary: Network connection manager and user applications
|
||||
Epoch: 1
|
||||
Version: 0.7.0
|
||||
Release: 0.11.%{snapshot}.4%{?dist}
|
||||
Release: 0.11.%{snapshot}%{?dist}
|
||||
Group: System Environment/Base
|
||||
License: GPLv2+
|
||||
URL: http://www.gnome.org/projects/NetworkManager/
|
||||
@ -24,12 +24,7 @@ Source: %{name}-%{version}.%{snapshot}.tar.gz
|
||||
Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
|
||||
Source2: nm-system-settings.conf
|
||||
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
|
||||
Patch4: serial-debug.patch
|
||||
Patch5: explain-dns1-dns2.patch
|
||||
Patch6: wpa-adhoc-fix.patch
|
||||
Patch7: crypto-init.patch
|
||||
Patch8: nm-vpn-fixes-r900-r901.patch
|
||||
Patch9: nm-param-spec-compare.patch
|
||||
Patch2: explain-dns1-dns2.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
PreReq: chkconfig
|
||||
@ -46,12 +41,9 @@ Requires: avahi-autoipd
|
||||
Requires: dnsmasq
|
||||
Obsoletes: dhcdbd
|
||||
|
||||
# Due to VPN auth-dialog changes in applet r662
|
||||
# Due to using prefixes instead of netmasks in NM > r3812
|
||||
# Due to consolidation of vpn + vpn-properties settings in NM >= r3927
|
||||
# Due to UUID changes in NM >= 4013
|
||||
Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4022
|
||||
Conflicts: NetworkManager-openvpn < 1:0.7.0-15.svn4022
|
||||
Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4174
|
||||
Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4174
|
||||
Conflicts: NetworkManager-openvpn < 1:0.7.0-16.svn4174
|
||||
|
||||
BuildRequires: dbus-devel >= %{dbus_version}
|
||||
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
||||
@ -148,12 +140,7 @@ NetworkManager functionality from applications that use glib.
|
||||
# unpack the applet
|
||||
tar -xzf %{SOURCE1}
|
||||
%patch1 -p1 -b .buildfix
|
||||
%patch4 -p1 -b .serial-debug
|
||||
%patch5 -p1 -b .explain-dns1-dns2
|
||||
%patch6 -p1 -b .wpa-adhoc-fix
|
||||
%patch7 -p1 -b .crypto-init
|
||||
%patch8 -p1 -b .vpn-fixes
|
||||
%patch9 -p1 -b .paramspec-compare
|
||||
%patch2 -p1 -b .explain-dns1-dns2
|
||||
|
||||
%build
|
||||
autoreconf -i
|
||||
@ -281,6 +268,7 @@ fi
|
||||
%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
|
||||
%{_bindir}/nm-applet
|
||||
%{_bindir}/nm-connection-editor
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/nm-applet/
|
||||
%{_datadir}/icons/hicolor/16x16/apps/*.png
|
||||
%{_datadir}/icons/hicolor/22x22/apps/*.png
|
||||
@ -305,9 +293,19 @@ fi
|
||||
%{_libdir}/libnm_glib_vpn.so
|
||||
%{_libdir}/libnm-util.so
|
||||
%dir %{_datadir}/gtk-doc/html/libnm-glib
|
||||
%{_datadir}/gtk-doc/html/libnm-glib/
|
||||
%{_datadir}/gtk-doc/html/libnm-glib/*
|
||||
|
||||
%changelog
|
||||
* Sat Oct 11 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4174
|
||||
- Ensure that mobile broadband cards are powered up before trying to use them
|
||||
- Hostname changing support (rh #441453)
|
||||
- Fix mobile broadband secret requests to happen less often
|
||||
- Better handling of default devices and default routes
|
||||
- Better information in tooltips and notifications
|
||||
- Various UI cleanups; hide widgets that aren't used (rh #465397, rh #465395)
|
||||
- Accept different separators for DNS servers and searches
|
||||
- Make applet's icon accurately reflect signal strength of the current AP
|
||||
|
||||
* Wed Oct 1 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022.4
|
||||
- Fix connection comparison that could cause changes to get overwritten (rh #464417)
|
||||
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
diff -up NetworkManager-0.7.0/libnm-util/crypto_nss.c.crypto-init NetworkManager-0.7.0/libnm-util/crypto_nss.c
|
||||
--- NetworkManager-0.7.0/libnm-util/crypto_nss.c.crypto-init 2008-08-22 12:14:12.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/libnm-util/crypto_nss.c 2008-09-11 16:22:29.000000000 -0400
|
||||
@@ -29,27 +29,39 @@
|
||||
#include <pk11pub.h>
|
||||
#include <pkcs11t.h>
|
||||
#include <cert.h>
|
||||
+#include <prerror.h>
|
||||
|
||||
#include "crypto.h"
|
||||
|
||||
-static guint32 refcount = 0;
|
||||
+static gboolean initialized = FALSE;
|
||||
|
||||
gboolean
|
||||
crypto_init (GError **error)
|
||||
{
|
||||
- if (refcount == 0) {
|
||||
- PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 1);
|
||||
- NSS_NoDB_Init (NULL);
|
||||
+ SECStatus ret;
|
||||
+
|
||||
+ if (initialized)
|
||||
+ return TRUE;
|
||||
+
|
||||
+ PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 1);
|
||||
+ ret = NSS_NoDB_Init (NULL);
|
||||
+ if (ret != SECSuccess) {
|
||||
+ PR_Cleanup ();
|
||||
+ g_set_error (error, NM_CRYPTO_ERROR,
|
||||
+ 0,
|
||||
+ _("Failed to initialize the crypto engine: %d."),
|
||||
+ PR_GetError ());
|
||||
+ return FALSE;
|
||||
}
|
||||
- refcount++;
|
||||
+
|
||||
+ initialized = TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
crypto_deinit (void)
|
||||
{
|
||||
- refcount--;
|
||||
- if (refcount == 0) {
|
||||
+ if (initialized) {
|
||||
NSS_Shutdown ();
|
||||
PR_Cleanup ();
|
||||
}
|
||||
diff -up NetworkManager-0.7.0/libnm-util/nm-utils.c.crypto-init NetworkManager-0.7.0/libnm-util/nm-utils.c
|
||||
--- NetworkManager-0.7.0/libnm-util/nm-utils.c.crypto-init 2008-08-22 12:14:12.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/libnm-util/nm-utils.c 2008-09-11 16:19:25.000000000 -0400
|
||||
@@ -1152,7 +1152,6 @@ nm_utils_uuid_generate_from_string (cons
|
||||
|
||||
out:
|
||||
g_free (uuid);
|
||||
- crypto_deinit ();
|
||||
return buf;
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 NetworkManager-0.7.0/src/named-manager/nm-named-manager.c
|
||||
--- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 2008-08-27 13:20:27.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c 2008-08-27 16:02:31.000000000 -0400
|
||||
@@ -236,7 +236,7 @@ update_resolv_conf (const char *iface,
|
||||
--- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 2008-09-15 10:33:29.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c 2008-10-12 08:25:48.000000000 -0400
|
||||
@@ -243,7 +243,7 @@ write_resolv_conf (FILE *f, const char *
|
||||
g_free (tmp_str);
|
||||
}
|
||||
|
||||
@ -9,8 +9,8 @@ diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-
|
||||
+ if (nameservers && g_strv_length (nameservers)) {
|
||||
GString *str;
|
||||
int num;
|
||||
int i;
|
||||
@@ -259,6 +259,14 @@ update_resolv_conf (const char *iface,
|
||||
|
||||
@@ -265,6 +265,14 @@ write_resolv_conf (FILE *f, const char *
|
||||
}
|
||||
|
||||
nameservers_str = g_string_free (str, FALSE);
|
||||
@ -24,4 +24,4 @@ diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-
|
||||
+ "# DOMAIN=lab.foo.com bar.foo.com\n");
|
||||
}
|
||||
|
||||
if (fprintf (f, "%s%s%s\n",
|
||||
if (fprintf (f, "%s%s%s",
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
2008-10-01 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
Fix setting value comparison issue that caused some settings to look the
|
||||
same when they were really different (rh #464417)
|
||||
|
||||
* libnm-util/nm-param-spec-specialized.c
|
||||
- (type_is_fixed_size): return fundamental size of the fixed type too
|
||||
- (nm_gvalues_compare_collection): use the fundamental fixed type size
|
||||
in the comparison so that the _entire_ fixed type collection gets
|
||||
compared rather than just the first 'len1' bytes
|
||||
|
||||
diff -up NetworkManager-0.7.0/libnm-util/nm-param-spec-specialized.c.compare-fix NetworkManager-0.7.0/libnm-util/nm-param-spec-specialized.c
|
||||
--- NetworkManager-0.7.0/libnm-util/nm-param-spec-specialized.c.compare-fix 2008-10-01 17:41:41.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/libnm-util/nm-param-spec-specialized.c 2008-10-01 17:42:05.000000000 -0400
|
||||
@@ -39,20 +39,41 @@ struct _NMParamSpecSpecialized {
|
||||
static gint nm_gvalues_compare (const GValue *value1, const GValue *value2);
|
||||
|
||||
static gboolean
|
||||
-type_is_fixed_size (GType type)
|
||||
+type_is_fixed_size (GType type, gsize *tsize)
|
||||
{
|
||||
switch (type) {
|
||||
case G_TYPE_CHAR:
|
||||
+ if (tsize) *tsize = sizeof (char);
|
||||
+ return TRUE;
|
||||
case G_TYPE_UCHAR:
|
||||
+ if (tsize) *tsize = sizeof (guchar);
|
||||
+ return TRUE;
|
||||
case G_TYPE_BOOLEAN:
|
||||
+ if (tsize) *tsize = sizeof (gboolean);
|
||||
+ return TRUE;
|
||||
case G_TYPE_LONG:
|
||||
+ if (tsize) *tsize = sizeof (glong);
|
||||
+ return TRUE;
|
||||
case G_TYPE_ULONG:
|
||||
+ if (tsize) *tsize = sizeof (gulong);
|
||||
+ return TRUE;
|
||||
case G_TYPE_INT:
|
||||
+ if (tsize) *tsize = sizeof (gint);
|
||||
+ return TRUE;
|
||||
case G_TYPE_UINT:
|
||||
+ if (tsize) *tsize = sizeof (guint);
|
||||
+ return TRUE;
|
||||
case G_TYPE_INT64:
|
||||
+ if (tsize) *tsize = sizeof (gint64);
|
||||
+ return TRUE;
|
||||
case G_TYPE_UINT64:
|
||||
+ if (tsize) *tsize = sizeof (guint64);
|
||||
+ return TRUE;
|
||||
case G_TYPE_FLOAT:
|
||||
+ if (tsize) *tsize = sizeof (gfloat);
|
||||
+ return TRUE;
|
||||
case G_TYPE_DOUBLE:
|
||||
+ if (tsize) *tsize = sizeof (gdouble);
|
||||
return TRUE;
|
||||
default:
|
||||
return FALSE;
|
||||
@@ -232,8 +253,9 @@ nm_gvalues_compare_collection (const GVa
|
||||
guint len1;
|
||||
guint len2;
|
||||
GType value_type = dbus_g_type_get_collection_specialization (G_VALUE_TYPE (value1));
|
||||
+ gsize element_size = 0;
|
||||
|
||||
- if (type_is_fixed_size (value_type)) {
|
||||
+ if (type_is_fixed_size (value_type, &element_size)) {
|
||||
gpointer data1 = NULL;
|
||||
gpointer data2 = NULL;
|
||||
|
||||
@@ -243,7 +265,7 @@ nm_gvalues_compare_collection (const GVa
|
||||
if (len1 != len2)
|
||||
ret = len1 < len2 ? -1 : len1 > len2;
|
||||
else
|
||||
- ret = memcmp (data1, data2, len1);
|
||||
+ ret = memcmp (data1, data2, len1 * element_size);
|
||||
} else {
|
||||
GSList *list1 = NULL;
|
||||
GSList *list2 = NULL;
|
||||
@@ -372,8 +394,7 @@ nm_gvalues_compare (const GValue *value1
|
||||
if (type1 != type2)
|
||||
return type1 < type2 ? -1 : type1 > type2;
|
||||
|
||||
-
|
||||
- if (type_is_fixed_size (type1))
|
||||
+ if (type_is_fixed_size (type1, NULL))
|
||||
ret = nm_gvalues_compare_fixed (value1, value2);
|
||||
else if (type1 == G_TYPE_STRING)
|
||||
ret = nm_gvalues_compare_string (value1, value2);
|
||||
@ -1,88 +0,0 @@
|
||||
2008-09-24 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/gconf-helpers/gconf-upgrade.c
|
||||
- (nm_gconf_migrate_0_7_vpn_properties): don't set empty values in GConf
|
||||
- (move_one_vpn_string_bool, move_one_vpn_string_string): fix stray
|
||||
semicolon that caused values to not get converted and removed
|
||||
(second part of fix for bgo #553465)
|
||||
|
||||
2008-09-24 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/gconf-helpers/gconf-helpers.c
|
||||
- (nm_gconf_get_stringhash_helper, write_properties_stringhash): do not
|
||||
read or write empty values (partial fix for bgo #553465)
|
||||
|
||||
|
||||
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-helpers.c.vpn-fixes NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-helpers.c
|
||||
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-helpers.c.vpn-fixes 2008-08-22 00:04:31.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-helpers.c 2008-09-30 16:36:47.000000000 -0400
|
||||
@@ -447,9 +447,11 @@ nm_gconf_get_stringhash_helper (GConfCli
|
||||
} else {
|
||||
GConfValue *gc_val = gconf_entry_get_value (entry);
|
||||
|
||||
- if (gc_val && gconf_value_get_string (gc_val)) {
|
||||
- g_hash_table_insert (*value, gconf_unescape_key (gc_key, -1),
|
||||
- g_strdup (gconf_value_get_string (gc_val)));
|
||||
+ if (gc_val) {
|
||||
+ const char *gc_str = gconf_value_get_string (gc_val);
|
||||
+
|
||||
+ if (gc_str && strlen (gc_str))
|
||||
+ g_hash_table_insert (*value, gconf_unescape_key (gc_key, -1), g_strdup (gc_str));
|
||||
}
|
||||
}
|
||||
gconf_entry_free (entry);
|
||||
@@ -764,10 +766,14 @@ write_properties_stringhash (gpointer ke
|
||||
WritePropertiesInfo *info = (WritePropertiesInfo *) user_data;
|
||||
char *esc_key;
|
||||
char *full_key;
|
||||
+ const char *str_value = (const char *) value;
|
||||
+
|
||||
+ if (!str_value || !strlen (str_value))
|
||||
+ return;
|
||||
|
||||
esc_key = gconf_escape_key ((char *) key, -1);
|
||||
full_key = g_strconcat (info->path, "/", esc_key, NULL);
|
||||
- gconf_client_set_string (info->client, full_key, (char *) value, NULL);
|
||||
+ gconf_client_set_string (info->client, full_key, (char *) str_value, NULL);
|
||||
g_free (esc_key);
|
||||
g_free (full_key);
|
||||
}
|
||||
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c.vpn-fixes NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c
|
||||
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c.vpn-fixes 2008-08-25 23:05:16.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c 2008-09-30 16:36:47.000000000 -0400
|
||||
@@ -1197,10 +1197,13 @@ nm_gconf_migrate_0_7_vpn_properties (GCo
|
||||
|
||||
switch (entry->value->type) {
|
||||
case GCONF_VALUE_STRING:
|
||||
- nm_gconf_set_string_helper (client, (const char *) iter->data,
|
||||
- key_name,
|
||||
- NM_SETTING_VPN_SETTING_NAME,
|
||||
- gconf_value_get_string (entry->value));
|
||||
+ tmp = (char *) gconf_value_get_string (entry->value);
|
||||
+ if (tmp && strlen (tmp)) {
|
||||
+ nm_gconf_set_string_helper (client, (const char *) iter->data,
|
||||
+ key_name,
|
||||
+ NM_SETTING_VPN_SETTING_NAME,
|
||||
+ gconf_value_get_string (entry->value));
|
||||
+ }
|
||||
break;
|
||||
case GCONF_VALUE_INT:
|
||||
tmp = g_strdup_printf ("%d", gconf_value_get_int (entry->value));
|
||||
@@ -1247,7 +1250,7 @@ move_one_vpn_string_bool (GConfClient *c
|
||||
if (!nm_gconf_get_string_helper (client, path,
|
||||
old_key,
|
||||
NM_SETTING_VPN_SETTING_NAME,
|
||||
- &value));
|
||||
+ &value))
|
||||
return;
|
||||
|
||||
if (value && !strcmp (value, "yes")) {
|
||||
@@ -1279,7 +1282,7 @@ move_one_vpn_string_string (GConfClient
|
||||
if (!nm_gconf_get_string_helper (client, path,
|
||||
old_key,
|
||||
NM_SETTING_VPN_SETTING_NAME,
|
||||
- &value));
|
||||
+ &value))
|
||||
return;
|
||||
|
||||
if (value && strlen (value)) {
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up NetworkManager-0.7.0/src/nm-serial-device.c.serial-debug NetworkManager-0.7.0/src/nm-serial-device.c
|
||||
--- NetworkManager-0.7.0/src/nm-serial-device.c.serial-debug 2008-07-15 07:59:32.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/src/nm-serial-device.c 2008-07-18 11:52:29.000000000 -0400
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "nm-utils.h"
|
||||
#include "nm-serial-device-glue.h"
|
||||
|
||||
-/* #define NM_DEBUG_SERIAL 1 */
|
||||
+#define NM_DEBUG_SERIAL 1
|
||||
|
||||
#define SERIAL_BUF_SIZE 2048
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
4634ada3bfe879592eeda006273e5126 NetworkManager-0.7.0.svn4022.tar.gz
|
||||
ea879a8b628afce457e8f3c6b5be409b nm-applet-0.7.0.svn870.tar.gz
|
||||
e68a22872c2eabfb28f5a9678ec048c0 NetworkManager-0.7.0.svn4174.tar.gz
|
||||
74161daaa20a15661c62cf8df58740c2 nm-applet-0.7.0.svn939.tar.gz
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c
|
||||
--- NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo 2008-09-04 13:33:24.000000000 -0400
|
||||
+++ NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c 2008-09-04 13:33:32.000000000 -0400
|
||||
@@ -66,7 +66,7 @@ static const struct validate_entry valid
|
||||
const char * pairwise_allowed[] = { "CCMP", "TKIP", "NONE", NULL };
|
||||
const char * group_allowed[] = { "CCMP", "TKIP", "WEP104", "WEP40", NULL };
|
||||
const char * proto_allowed[] = { "WPA", "RSN", NULL };
|
||||
-const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X",
|
||||
+const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", "WPA-NONE",
|
||||
"NONE", NULL };
|
||||
const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL };
|
||||
const char * eap_allowed[] = { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",
|
||||
Loading…
Reference in New Issue
Block a user