50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
=== modified file 'configure.in'
|
|
--- configure.in 2007-12-18 20:23:31 +0000
|
|
+++ configure.in 2007-12-18 20:28:43 +0000
|
|
@@ -1456,23 +1456,17 @@
|
|
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)
|
|
|
|
|
|
|
|
=== modified file 'shell/e-shell-nm.c'
|
|
--- shell/e-shell-nm.c 2007-12-18 20:23:31 +0000
|
|
+++ shell/e-shell-nm.c 2007-12-18 20:28:43 +0000
|
|
@@ -33,7 +33,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"
|
|
+
|
|
|
|
typedef enum _ShellLineStatus {
|
|
E_SHELL_LINE_DOWN,
|
|
|