Hey, here's a patch for SoC branch - to make it to compile and more-or-less working. I say more-or-less because it at least compiles now, the dialogs for add/edit/remove ppp connections seem to work, and when trying to activate a ppp connection, it seems to do something. Not sure if the right thing, as I don't have a modem right now. In addition to the attached patch, I'm proposing to add new files (also attached) and remove dialup-services/Makefile from CVS. Tambet
Attachment:
as-ac-expand.m4
Description: application/m4
nmbtgprsservicedir = $(sysconfdir)/NetworkManager/dialup
nmbtgprsservice_DATA = nm-btgprs-service.name
nmmodemservicedir = $(sysconfdir)/NetworkManager/dialup
nmmodemservice_DATA = nm-modem-service.name
nmpppoeservicedir = $(sysconfdir)/NetworkManager/dialup
nmpppoeservice_DATA = nm-pppoe-service.name
EXTRA_DIST = $(nmbtgprsservice_DATA) \
$(nmmodemservice_DATA) \
$(nmpppoeservice_DATA)
CLEANFILES = *~
Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/NetworkManager/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- autogen.sh 21 Oct 2004 18:22:25 -0000 1.4
+++ autogen.sh 10 Oct 2006 16:25:31 -0000
@@ -13,6 +13,7 @@
exit 1
}
+ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
which gnome-autogen.sh || {
echo "You need to install gnome-common from the GNOME CVS"
Index: configure.in
===================================================================
RCS file: /cvs/gnome/NetworkManager/configure.in,v
retrieving revision 1.138.2.3
diff -u -r1.138.2.3 configure.in
--- configure.in 25 Aug 2006 11:35:52 -0000 1.138.2.3
+++ configure.in 10 Oct 2006 16:25:31 -0000
@@ -278,36 +278,17 @@
AC_DEFINE_UNQUOTED(IP_BINARY_PATH, "$IP_BINARY_PATH", [Define to path of ip binary])
AC_SUBST(IP_BINARY_PATH)
-#### find the actual value for $prefix that we'll end up with
-## (I know this is broken and should be done in the Makefile, but
-## that's a major pain and almost nobody actually seems to care)
-REAL_PREFIX=
-if test "x$prefix" = "xNONE"; then
- REAL_PREFIX=$ac_default_prefix
-else
- REAL_PREFIX=$prefix
-fi
+AS_AC_EXPAND(PREFIX, $prefix)
+AC_SUBST(PREFIX)
-## temporarily change prefix and exec_prefix
-old_prefix=$prefix
-prefix=$REAL_PREFIX
+AS_AC_EXPAND(BINDIR, $bindir)
+AC_SUBST(BINDIR)
-if test "x$exec_prefix" = xNONE ; then
- REAL_EXEC_PREFIX=$REAL_PREFIX
-else
- REAL_EXEC_PREFIX=$exec_prefix
-fi
-old_exec_prefix=$exec_prefix
-exec_prefix=$REAL_EXEC_PREFIX
+AS_AC_EXPAND(LIBDIR, $libdir)
+AC_SUBST(LIBDIR)
-BINDIR_TMP="$bindir"
-EXPANDED_BINDIR=`eval echo $BINDIR_TMP`
-AC_SUBST(EXPANDED_BINDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_BINDIR, "$EXPANDED_BINDIR", [Where the executables are installed])
-
-## put prefix and exec_prefix back
-prefix=$old_prefix
-exec_prefix=$old_exec_prefix
+AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
+AC_SUBST(LIBEXECDIR)
AC_ARG_ENABLE(more-warnings,
AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]),
Index: gnome/applet/Makefile.am
===================================================================
RCS file: /cvs/gnome/NetworkManager/gnome/applet/Makefile.am,v
retrieving revision 1.23.2.1
diff -u -r1.23.2.1 Makefile.am
--- gnome/applet/Makefile.am 19 Aug 2006 15:13:43 -0000 1.23.2.1
+++ gnome/applet/Makefile.am 10 Oct 2006 16:25:32 -0000
@@ -17,7 +17,7 @@
$(LIBGNOMEUI_CFLAGS) \
$(PANEL_APPLET_CFLAGS) \
$(GNOME_KEYRING_CFLAGS) \
- -DICONDIR=\""$(datadir)/pixmaps"\" \
+ -DICONDIR=\""$(datadir)/icons"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
Index: gnome/applet/applet.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/gnome/applet/applet.c,v
retrieving revision 1.123.2.1
diff -u -r1.123.2.1 applet.c
--- gnome/applet/applet.c 19 Aug 2006 15:13:43 -0000 1.123.2.1
+++ gnome/applet/applet.c 10 Oct 2006 16:25:32 -0000
@@ -147,6 +147,9 @@
{
GObjectClass *gobject_class;
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+ ICONDIR);
+
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->constructor = nma_constructor;
}
@@ -580,7 +583,7 @@
#else
msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n"
"%s\n\n%s", title, desc, error_msg);
- nma_show_vpn_failure_dialog (title, msg);
+ nma_show_failure_dialog (title, msg);
#endif
g_free (msg);
}
Index: gnome/dialup-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/NetworkManager/gnome/dialup-properties/Attic/Makefile.am,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 Makefile.am
--- gnome/dialup-properties/Makefile.am 25 Aug 2006 10:56:14 -0000 1.1.2.2
+++ gnome/dialup-properties/Makefile.am 10 Oct 2006 16:25:32 -0000
@@ -26,7 +26,7 @@
$(LIBGNOMEUI_CFLAGS) \
$(DBUS_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -DICONDIR=\""$(datadir)/pixmaps"\" \
+ -DICONDIR=\""$(datadir)/icons"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
Index: src/backends/NetworkManagerArch.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/backends/NetworkManagerArch.c,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 NetworkManagerArch.c
--- src/backends/NetworkManagerArch.c 19 Aug 2006 15:11:28 -0000 1.6.2.1
+++ src/backends/NetworkManagerArch.c 10 Oct 2006 16:25:32 -0000
@@ -48,7 +48,6 @@
#include "nm-device.h"
#include "nm-device-802-3-ethernet.h"
#include "nm-device-802-11-wireless.h"
-#include "NetworkManagerDialupConfig.h"
#include "interface_parser.h"
#include "nm-utils.h"
Index: src/backends/NetworkManagerDebian.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/backends/NetworkManagerDebian.c,v
retrieving revision 1.46.2.1
diff -u -r1.46.2.1 NetworkManagerDebian.c
--- src/backends/NetworkManagerDebian.c 19 Aug 2006 15:11:28 -0000 1.46.2.1
+++ src/backends/NetworkManagerDebian.c 10 Oct 2006 16:25:32 -0000
@@ -37,7 +37,6 @@
#include "nm-device.h"
#include "nm-device-802-3-ethernet.h"
#include "nm-device-802-11-wireless.h"
-#include "NetworkManagerDialupConfig.h"
#include "interface_parser.h"
#include "nm-utils.h"
Index: src/backends/NetworkManagerRedHat.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/backends/NetworkManagerRedHat.c,v
retrieving revision 1.51.2.1
diff -u -r1.51.2.1 NetworkManagerRedHat.c
--- src/backends/NetworkManagerRedHat.c 19 Aug 2006 15:11:28 -0000 1.51.2.1
+++ src/backends/NetworkManagerRedHat.c 10 Oct 2006 16:25:32 -0000
@@ -33,7 +33,6 @@
#include "nm-device.h"
#include "nm-device-802-3-ethernet.h"
#include "nm-device-802-11-wireless.h"
-#include "NetworkManagerDialupConfig.h"
#include "nm-utils.h"
#include "shvar.h"
Index: src/backends/NetworkManagerSuSE.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/backends/NetworkManagerSuSE.c,v
retrieving revision 1.54.2.1
diff -u -r1.54.2.1 NetworkManagerSuSE.c
--- src/backends/NetworkManagerSuSE.c 19 Aug 2006 15:11:29 -0000 1.54.2.1
+++ src/backends/NetworkManagerSuSE.c 10 Oct 2006 16:25:32 -0000
@@ -51,7 +51,6 @@
#include "cipher-wpa-psk-passphrase.h"
#include "nm-device-802-3-ethernet.h"
#include "nm-device-802-11-wireless.h"
-#include "NetworkManagerDialupConfig.h"
#include "nm-utils.h"
#include "shvar.h"
Index: src/dialup/ppp/nm-ppp-service.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/dialup/ppp/Attic/nm-ppp-service.c,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 nm-ppp-service.c
--- src/dialup/ppp/nm-ppp-service.c 25 Aug 2006 11:07:24 -0000 1.1.2.2
+++ src/dialup/ppp/nm-ppp-service.c 10 Oct 2006 16:25:33 -0000
@@ -44,7 +44,7 @@
#include <arpa/inet.h>
#include <ctype.h>
-#include <NetworkManager/NetworkManager.h>
+#include <NetworkManager.h>
#include "nm-ppp-service.h"
#include "nm-utils.h"
Index: src/dialup/ppp/nm-pppd-plugin.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/dialup/ppp/Attic/nm-pppd-plugin.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 nm-pppd-plugin.c
--- src/dialup/ppp/nm-pppd-plugin.c 19 Aug 2006 15:10:03 -0000 1.1.2.1
+++ src/dialup/ppp/nm-pppd-plugin.c 10 Oct 2006 16:25:33 -0000
@@ -36,7 +36,7 @@
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus-glib.h>
-#include <NetworkManager/NetworkManager.h>
+#include <NetworkManager.h>
#include "nm-ppp-service.h"
#include "nm-pppd-plugin.h"