ecd626da1c
- Fix applet icon sizing on start (mclasen) - Fix nm-tool installation (mclasen) - Fix 'state' method call return (#303271) - Fix 40-bit WEP keys (again) - Fix loop when secrets were wrong/invalid - Fix applet crash when clicking Cancel in the password dialog - Ensure NM doesn't get stuck waiting for the supplicant to re-appear if it crashes or goes away - Make VPN properties applet work again - Increase timeout for network password entry
123 lines
4.9 KiB
Diff
123 lines
4.9 KiB
Diff
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 2007-09-24 11:02:11.000000000 -0400
|
|
+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-09-25 03:27:22.000000000 -0400
|
|
@@ -18,10 +18,10 @@ dnl
|
|
dnl This doesn't depend on gnome support, only on gnome-common, autogen already
|
|
dnl uses gnome-autogen
|
|
dnl
|
|
-GNOME_COMMON_INIT
|
|
-GNOME_DEBUG_CHECK
|
|
-GNOME_COMPILE_WARNINGS([maximum])
|
|
-GNOME_MAINTAINER_MODE_DEFINES
|
|
+dnl GNOME_COMMON_INIT
|
|
+dnl GNOME_DEBUG_CHECK
|
|
+dnl GNOME_COMPILE_WARNINGS([maximum])
|
|
+dnl GNOME_MAINTAINER_MODE_DEFINES
|
|
|
|
dnl
|
|
dnl Required headers
|
|
@@ -60,8 +60,6 @@ AC_C_BIGENDIAN
|
|
PKG_CHECK_MODULES(NMA,
|
|
[dbus-glib-1 >= 0.72
|
|
glib-2.0 >= 2.10
|
|
- NetworkManager >= 0.7.0
|
|
- libnm_glib
|
|
gtk+-2.0 >= 2.6
|
|
libglade-2.0
|
|
gconf-2.0
|
|
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am
|
|
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix 2007-09-25 03:33:31.000000000 -0400
|
|
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am 2007-09-25 03:34:10.000000000 -0400
|
|
@@ -1,6 +1,10 @@
|
|
|
|
bin_PROGRAMS = nm-vpn-properties
|
|
|
|
+INCLUDES = -I${top_srcdir}/../include \
|
|
+ -I${top_srcdir}/../libnm-util \
|
|
+ -I${top_srcdir}/../libnm-glib
|
|
+
|
|
nm_vpn_propertiesdir=$(includedir)/NetworkManager
|
|
|
|
nm_vpn_properties_HEADERS = \
|
|
@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \
|
|
|
|
nm_vpn_properties_LDADD = \
|
|
$(NMA_LIBS) \
|
|
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
|
|
+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
|
CLEANFILES = $(server_DATA) *.bak *.gladep *~
|
|
|
|
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 2007-09-19 22:53:14.000000000 -0400
|
|
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-09-25 03:27:22.000000000 -0400
|
|
@@ -1,8 +1,15 @@
|
|
+INCLUDES = -I${top_srcdir}/../include \
|
|
+ -I${top_srcdir}/../libnm-util \
|
|
+ -I${top_srcdir}/../libnm-glib
|
|
+
|
|
noinst_LTLIBRARIES = libgconf-helpers.la
|
|
|
|
libgconf_helpers_la_SOURCES = gconf-helpers.h gconf-helpers.c
|
|
|
|
libgconf_helpers_la_CPPFLAGS = $(NMA_CFLAGS)
|
|
|
|
-libgconf_helpers_la_LIBADD = $(NMA_LIBS)
|
|
+libgconf_helpers_la_LIBADD = $(NMA_LIBS) \
|
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
+
|
|
|
|
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 2007-09-20 07:40:37.000000000 -0400
|
|
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-09-25 03:27:22.000000000 -0400
|
|
@@ -2,6 +2,10 @@ NULL=
|
|
|
|
bin_PROGRAMS = nm-connection-editor
|
|
|
|
+INCLUDES = -I${top_srcdir}/../include \
|
|
+ -I${top_srcdir}/../libnm-util \
|
|
+ -I${top_srcdir}/../libnm-glib
|
|
+
|
|
nm_connection_editor_CPPFLAGS = \
|
|
$(NMA_CFLAGS) \
|
|
-DICONDIR=\""$(datadir)/icons"\" \
|
|
@@ -25,7 +29,9 @@ nm_connection_editor_SOURCES = \
|
|
|
|
nm_connection_editor_LDADD = \
|
|
$(NMA_LIBS) \
|
|
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
|
|
+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
|
gladedir = $(datadir)/nm-applet
|
|
glade_DATA = nm-connection-editor.glade
|
|
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 2007-09-20 07:43:02.000000000 -0400
|
|
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-09-25 03:27:22.000000000 -0400
|
|
@@ -4,6 +4,10 @@ NULL=
|
|
|
|
bin_PROGRAMS = nm-applet
|
|
|
|
+INCLUDES = -I${top_srcdir}/../include \
|
|
+ -I${top_srcdir}/../libnm-util \
|
|
+ -I${top_srcdir}/../libnm-glib
|
|
+
|
|
nm_applet_CPPFLAGS = \
|
|
$(NMA_CFLAGS) \
|
|
-DICONDIR=\""$(datadir)/icons"\" \
|
|
@@ -62,7 +66,9 @@ endif
|
|
|
|
nm_applet_LDADD = \
|
|
$(NMA_LIBS) \
|
|
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
|
|
+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
|
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
|
if WITH_NOTIFY
|
|
nm_applet_LDADD += $(NOTIFY_LIBS)
|