55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
|
Index: configure.in
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvs/gnome/evolution/configure.in,v
|
||
|
|
retrieving revision 1.881
|
||
|
|
diff -u -p -w -r1.881 configure.in
|
||
|
|
--- configure.in 13 Feb 2006 16:18:43 -0000 1.881
|
||
|
|
+++ configure.in 16 Feb 2006 10:04:58 -0000
|
||
|
|
@@ -1203,22 +1203,16 @@ dnl --- evolution (shell) flags
|
||
|
|
|
||
|
|
NM_SUPPORT_PACKAGES=""
|
||
|
|
+NM_SUPPORT_GLIB="no"
|
||
|
|
|
||
|
|
-PKG_CHECK_MODULES(NM, dbus-glib-1 libnm_glib, NM_SUPPORT_GLIB="yes", NM_SUPPORT_GLIB="no")
|
||
|
|
-if test "x$NM_SUPPORT_GLIB" = "xyes"; then
|
||
|
|
- AC_DEFINE(NM_SUPPORT_GLIB, 1, [network manager available])
|
||
|
|
- NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1 libnm_glib"
|
||
|
|
-else
|
||
|
|
PKG_CHECK_MODULES(NM, dbus-glib-1, NM_SUPPORT="yes", NM_SUPPORT="no")
|
||
|
|
- AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [ nm_header="yes" ] )
|
||
|
|
- if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then
|
||
|
|
+ if test "x$NM_SUPPORT" = "xyes"; then
|
||
|
|
AC_DEFINE(NM_SUPPORT, 1, [network manager available])
|
||
|
|
NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1"
|
||
|
|
else
|
||
|
|
- NM_SUPPORT=no
|
||
|
|
- fi
|
||
|
|
+ NM_SUPPORT="no"
|
||
|
|
fi
|
||
|
|
|
||
|
|
-AM_CONDITIONAL(NM_SUPPORT_GLIB, test x$NM_SUPPORT_GLIB = xyes)
|
||
|
|
+AM_CONDITIONAL(NM_SUPPORT_GLIB, test x$NM_SUPPORT_GLIB = xyes)
|
||
|
|
AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes)
|
||
|
|
|
||
|
|
|
||
|
|
Index: shell/e-shell-nm.c
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvs/gnome/evolution/shell/e-shell-nm.c,v
|
||
|
|
retrieving revision 1.1
|
||
|
|
diff -u -p -w -r1.1 e-shell-nm.c
|
||
|
|
--- shell/e-shell-nm.c 22 Dec 2005 02:12:34 -0000 1.1
|
||
|
|
+++ shell/e-shell-nm.c 16 Feb 2006 10:04:58 -0000
|
||
|
|
@@ -31,7 +31,11 @@
|
||
|
|
#include <dbus/dbus.h>
|
||
|
|
#include <dbus/dbus-glib-lowlevel.h>
|
||
|
|
#include <dbus/dbus-glib.h>
|
||
|
|
-#include <NetworkManager/NetworkManager.h>
|
||
|
|
+
|
||
|
|
+#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
|
||
|
|
+#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
|
||
|
|
+#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
|
||
|
|
+
|
||
|
|
|
||
|
|
int shell_dbus_initialize (EShellWindow *window);
|
||
|
|
|