Michael Biebl wrote:
Dan Williams schrieb:On Wed, 2008-01-02 at 05:37 +0100, Michael Biebl wrote:3.) 03-nm-applet-make-clean-fixes.patch Remove autogenerated applet-marshal.[ch] on make clean. Required to pass "make distcheck". Please review and apply.All committed, thanks!Thanks a lot. Sorry for bothering you again, but looking at 3.) a second time, it seems a cleaner solution is, to use automake's BUILT_SOURCES consistently everywhere in NM and n-m-a. Because then it's unnecessary to declare explicit build dependencies. They are generated automatically, so the _OBJECTS: $(built_sources) lines become superfluous. I also cleaned up some stray and unused BUILT_SOURCES in src/dhcp-manager/Makefile.am and src/supplicant-manager/Makefile.am Setting -fPIC in libnm-util/Makefile.am is unnecessary, too. It's automatically set for libtool libraries. Please find the attached two patches for that.
Hi Dan,could you please review this new patches for trunk again and apply if appropriate?
I also have some patches for the stable 0.6 branch which mostly bring the stable branch in sync with trunk:
1.) readme_format.patch (same as the one for trunk) 2.) man_page_sh_name.patch Add missing sh name stanza (already in trunk) 3.) man_page_section.patchAfter applying 2.), this patch fixes the sections (1->8) of NetworkManager(Dispatcher) (already in trunk).
Please also do a cd man svn mv NetworkManager.1.in NetworkManager.8.in svn mv NetworkManagerDispatcher.1.in NetworkManagerDispatcher.8.in 4.) no_gnome_disable_deprecated.patch That's required to allow nm-vpn-properties to compile with gtk-2.12. (already in trunk network-manager-applet) Remains the most controversial patch 5.) rfkill.patchI already brought this topic up: hal changed the signature killswitch dbus arguments from uint to int in hal_0.5.10. You modified my original patch to first try with uint, then with int (commit 3160). Unfortunately this doesn't work, as dbus will issue an assert with hal_0.5.10 as the status int variable has the wrong type. We could try to mess around with two status variables (int and uint), but this is ugly imho. As we already require a very recent libnl, which only up-to-date distros ship, I simply remove the support for hal < 0.5.10 and bumped the build dependencies in configure.in accordingly.
Please review and apply, MichaelP.S: What do you think about releasing a 0.6.6 version? If so I could try to bug the Ubuntu NetworkManager maintainers. Maybe they have some interesting patches that should be commited upstream.
-- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
Index: README =================================================================== --- README (Revision 3190) +++ README (Arbeitskopie) @@ -20,7 +20,8 @@ For wireless networking support, NetworkManager keeps a list of wireless networks, the preferred list. Preferred Networks are wireless networks that the user has explicitly made NetworkManager associate with at some previous -time. So if the user walks into a Starbucks and explicitly asks NetworkManager to associate with that Starbucks network, NetworkManager will remember the +time. So if the user walks into a Starbucks and explicitly asks NetworkManager +to associate with that Starbucks network, NetworkManager will remember the Starbucks network information from that point on. Upon returning to that Starbucks, NetworkManager will attempt to associate _automatically_ with the Starbucks network since it is now in the Preferred Networks list. The point of
Index: man/nm-tool.1.in =================================================================== RCS file: /cvs/gnome/NetworkManager/man/nm-tool.1.in,v retrieving revision 1.1 diff -u -3 -p -r1.1 nm-tool.1.in --- man/nm-tool.1.in 1 Feb 2006 18:14:15 -0000 1.1 +++ man/nm-tool.1.in 30 Nov 2006 19:33:39 -0000 @@ -3,6 +3,7 @@ .\" Copyright (C) 2005 Robert Love .\" .TH NM-TOOL "1" +.SH NAME nm-tool \- utility to report NetworkManager state .SH SYNOPSIS .B nm-tool
Index: configure.in =================================================================== --- configure.in (Revision 3217) +++ configure.in (Arbeitskopie) @@ -341,8 +341,8 @@ initscript/Arch/networkmanager initscript/Arch/networkmanager-dispatcher man/Makefile -man/NetworkManager.1 -man/NetworkManagerDispatcher.1 +man/NetworkManager.8 +man/NetworkManagerDispatcher.8 man/nm-tool.1 po/Makefile.in NetworkManager.pc Index: man/Makefile.am =================================================================== --- man/Makefile.am (Revision 3217) +++ man/Makefile.am (Arbeitskopie) @@ -1,10 +1,10 @@ man_MANS = \ - NetworkManager.1 \ - NetworkManagerDispatcher.1 \ + NetworkManager.8 \ + NetworkManagerDispatcher.8 \ nm-tool.1 EXTRA_DIST = \ $(man_MANS) \ - NetworkManager.1.in \ - NetworkManagerDispatcher.1.in \ + NetworkManager.8.in \ + NetworkManagerDispatcher.8.in \ nm-tool.1.in
Index: gnome/vpn-properties/Makefile.am
===================================================================
--- gnome/vpn-properties/Makefile.am (Revision 3217)
+++ gnome/vpn-properties/Makefile.am (Arbeitskopie)
@@ -26,7 +26,6 @@
-DGLADEDIR=\""$(gladedir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" \
$(NULL)
Index: configure.in
===================================================================
--- configure.in (Revision 3217)
+++ configure.in (Arbeitskopie)
@@ -142,7 +142,7 @@
PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
-PKG_CHECK_MODULES(HAL, hal >= 0.5.0)
+PKG_CHECK_MODULES(HAL, hal >= 0.5.10)
if test x"$with_gnome" != xno; then
PKG_CHECK_MODULES(GTK, gtk+-2.0)
Index: src/NetworkManager.c
===================================================================
--- src/NetworkManager.c (Revision 3217)
+++ src/NetworkManager.c (Arbeitskopie)
@@ -364,16 +364,14 @@
goto out;
}
- if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) {
- if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) {
- if (!ks_err_message || strcmp (ks_err_message, err.message)) {
- nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message);
- g_free (ks_err_message);
- ks_err_message = g_strdup (err.message);
- }
- dbus_error_free (&err);
- goto out;
+ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) {
+ if (!ks_err_message || strcmp (ks_err_message, err.message)) {
+ nm_info ("Error getting killswitch power arguments (second try): %s - %s", err.name, err.message);
+ g_free (ks_err_message);
+ ks_err_message = g_strdup (err.message);
}
+ dbus_error_free (&err);
+ goto out;
}
if (status == 0)
Attachment:
signature.asc
Description: OpenPGP digital signature