[network-manager-applet: 4/6] all: include "nm-default.h" in every source file

From: Thomas Haller <thaller src gnome org>
To: commits-list gnome org
Cc:
Subject: [network-manager-applet: 4/6] all: include "nm-default.h" in every source file
Date: Tue, 16 Feb 2016 19:27:24 +0000 (UTC)
commit e327c68976145297b0924aae3f995afe580bca46
Author: Thomas Haller <thaller redhat com>
Date:   Tue Feb 16 18:50:52 2016 +0100

    all: include "nm-default.h" in every source file

 src/Makefile.am                                 |    1 +
 src/ap-menu-item.c                              |    2 ++
 src/applet-agent.c                              |    2 ++
 src/applet-device-broadband.c                   |    2 ++
 src/applet-device-bt.c                          |    2 ++
 src/applet-device-ethernet.c                    |    2 ++
 src/applet-device-wifi.c                        |    2 ++
 src/applet-dialogs.c                            |    2 ++
 src/applet-vpn-request.c                        |    2 ++
 src/applet.c                                    |    2 ++
 src/connection-editor/Makefile.am               |    1 +
 src/connection-editor/ce-page.c                 |    2 ++
 src/connection-editor/ce-polkit-button.c        |    2 ++
 src/connection-editor/connection-helpers.c      |    2 ++
 src/connection-editor/ip4-routes-dialog.c       |    2 ++
 src/connection-editor/ip6-routes-dialog.c       |    2 ++
 src/connection-editor/nm-connection-editor.c    |    2 ++
 src/connection-editor/nm-connection-list.c      |    2 ++
 src/connection-editor/page-8021x-security.c     |    2 ++
 src/connection-editor/page-bluetooth.c          |    2 ++
 src/connection-editor/page-bond.c               |    2 ++
 src/connection-editor/page-bridge-port.c        |    2 ++
 src/connection-editor/page-bridge.c             |    2 ++
 src/connection-editor/page-dcb.c                |    2 ++
 src/connection-editor/page-dsl.c                |    2 ++
 src/connection-editor/page-ethernet.c           |    2 ++
 src/connection-editor/page-general.c            |    2 ++
 src/connection-editor/page-infiniband.c         |    2 ++
 src/connection-editor/page-ip4.c                |    2 ++
 src/connection-editor/page-ip6.c                |    2 ++
 src/connection-editor/page-master.c             |    2 ++
 src/connection-editor/page-mobile.c             |    2 ++
 src/connection-editor/page-ppp.c                |    2 ++
 src/connection-editor/page-team-port.c          |    2 ++
 src/connection-editor/page-team.c               |    2 ++
 src/connection-editor/page-vlan.c               |    2 ++
 src/connection-editor/page-vpn.c                |    2 ++
 src/connection-editor/page-wifi-security.c      |    2 ++
 src/connection-editor/page-wifi.c               |    2 ++
 src/connection-editor/ppp-auth-methods-dialog.c |    2 ++
 src/connection-editor/vpn-helpers.c             |    2 ++
 src/ethernet-dialog.c                           |    2 ++
 src/libnm-gtk/Makefile.am                       |    2 ++
 src/libnm-gtk/init.c                            |    2 ++
 src/libnm-gtk/nm-mobile-providers.c             |    2 ++
 src/libnm-gtk/nm-mobile-wizard.c                |    2 ++
 src/libnm-gtk/nm-ui-utils.c                     |    2 ++
 src/libnm-gtk/nm-vpn-password-dialog.c          |    2 ++
 src/libnm-gtk/nm-wifi-dialog.c                  |    2 ++
 src/libnm-gtk/nm-wireless-dialog.c              |    2 ++
 src/libnm-gtk/tests/Makefile.am                 |    1 +
 src/libnm-gtk/tests/test-mobile-providers.c     |    4 ++--
 src/libnma/Makefile.am                          |    2 ++
 src/libnma/init.c                               |    2 ++
 src/libnma/nma-mobile-providers.c               |    2 ++
 src/libnma/nma-mobile-wizard.c                  |    2 ++
 src/libnma/nma-ui-utils.c                       |    2 ++
 src/libnma/nma-vpn-password-dialog.c            |    2 ++
 src/libnma/nma-wifi-dialog.c                    |    2 ++
 src/mb-menu-item.c                              |    2 ++
 src/mobile-helpers.c                            |    2 ++
 src/utils/Makefile.am                           |    6 ++++--
 src/utils/tests/Makefile.am                     |    3 ++-
 src/utils/tests/test-utils.c                    |    2 ++
 src/utils/utils.c                               |    2 ++
 src/wireless-security/Makefile.am               |    2 ++
 src/wireless-security/eap-method-fast.c         |    2 ++
 src/wireless-security/eap-method-leap.c         |    2 ++
 src/wireless-security/eap-method-peap.c         |    2 ++
 src/wireless-security/eap-method-simple.c       |    2 ++
 src/wireless-security/eap-method-tls.c          |    2 ++
 src/wireless-security/eap-method-ttls.c         |    2 ++
 src/wireless-security/eap-method.c              |    2 ++
 src/wireless-security/helpers.c                 |    2 ++
 src/wireless-security/wireless-security.c       |    2 ++
 src/wireless-security/ws-dynamic-wep.c          |    2 ++
 src/wireless-security/ws-leap.c                 |    2 ++
 src/wireless-security/ws-wep-key.c              |    2 ++
 src/wireless-security/ws-wpa-eap.c              |    2 ++
 src/wireless-security/ws-wpa-psk.c              |    2 ++
 80 files changed, 159 insertions(+), 5 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b91259..6578f01 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,7 @@ nm_applet_CPPFLAGS = \
        -DNMALOCALEDIR=\"$(datadir)/locale\"                                    \
        -DG_LOG_DOMAIN=\""nm-applet"\" \
        $(DBUS_GLIB_CFLAGS) \
+       "-I${top_srcdir}/shared/" \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security \
        -I${top_srcdir}/src/libnma
diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
index b5c7a61..e80ad3a 100644
--- a/src/ap-menu-item.c
+++ b/src/ap-menu-item.c
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdio.h>
 #include <glib/gi18n.h>
 #include <string.h>
diff --git a/src/applet-agent.c b/src/applet-agent.c
index 714313b..b8268b4 100644
--- a/src/applet-agent.c
+++ b/src/applet-agent.c
@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 #include <string.h>
 
diff --git a/src/applet-device-broadband.c b/src/applet-device-broadband.c
index 4464b79..f59cfc0 100644
--- a/src/applet-device-broadband.c
+++ b/src/applet-device-broadband.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <ctype.h>
 
 #include <glib/gi18n.h>
diff --git a/src/applet-device-bt.c b/src/applet-device-bt.c
index 3c18440..1f66546 100644
--- a/src/applet-device-bt.c
+++ b/src/applet-device-bt.c
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
diff --git a/src/applet-device-ethernet.c b/src/applet-device-ethernet.c
index 59de051..e1dfaca 100644
--- a/src/applet-device-ethernet.c
+++ b/src/applet-device-ethernet.c
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 79d36a6..3b66c50 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netinet/ether.h>
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index 923c8c9..fb87418 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
diff --git a/src/applet-vpn-request.c b/src/applet-vpn-request.c
index 4ef4e27..541151f 100644
--- a/src/applet-vpn-request.c
+++ b/src/applet-vpn-request.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/applet.c b/src/applet.c
index 73680c4..7ba826b 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -29,6 +29,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <time.h>
 #include <string.h>
 #include <strings.h>
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index 880074a..0d004ed 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -14,6 +14,7 @@ nm_connection_editor_CPPFLAGS = \
        -DDATADIR=\""$(datadir)"\" \
        -DNMALOCALEDIR=\"$(datadir)/locale\" \
        $(DBUS_GLIB_CFLAGS) \
+       "-I${top_srcdir}/shared/" \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security \
        -I${top_srcdir}/src/libnma
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index 1a75db6..9d500e7 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <string.h>
diff --git a/src/connection-editor/ce-polkit-button.c b/src/connection-editor/ce-polkit-button.c
index 2c02040..f3b7bac 100644
--- a/src/connection-editor/ce-polkit-button.c
+++ b/src/connection-editor/ce-polkit-button.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
index 10d0b15..97ef88f 100644
--- a/src/connection-editor/connection-helpers.c
+++ b/src/connection-editor/connection-helpers.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 
 #include "connection-helpers.h"
diff --git a/src/connection-editor/ip4-routes-dialog.c b/src/connection-editor/ip4-routes-dialog.c
index 310b203..a15da8b 100644
--- a/src/connection-editor/ip4-routes-dialog.c
+++ b/src/connection-editor/ip4-routes-dialog.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/connection-editor/ip6-routes-dialog.c b/src/connection-editor/ip6-routes-dialog.c
index 2c830a7..6b28f53 100644
--- a/src/connection-editor/ip6-routes-dialog.c
+++ b/src/connection-editor/ip6-routes-dialog.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index aff0f46..bb8e9ad 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -25,6 +25,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index f23c8cb..cb60b7d 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c
index 0ff13ae..b1a2660 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c
index 5bcded7..37495aa 100644
--- a/src/connection-editor/page-bluetooth.c
+++ b/src/connection-editor/page-bluetooth.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c
index af608d0..fe08bcd 100644
--- a/src/connection-editor/page-bond.c
+++ b/src/connection-editor/page-bond.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/src/connection-editor/page-bridge-port.c b/src/connection-editor/page-bridge-port.c
index 129f73d..0620fb1 100644
--- a/src/connection-editor/page-bridge-port.c
+++ b/src/connection-editor/page-bridge-port.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/page-bridge.c b/src/connection-editor/page-bridge.c
index 1ec84ea..10f6632 100644
--- a/src/connection-editor/page-bridge.c
+++ b/src/connection-editor/page-bridge.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/src/connection-editor/page-dcb.c b/src/connection-editor/page-dcb.c
index 632a287..c760b2b 100644
--- a/src/connection-editor/page-dcb.c
+++ b/src/connection-editor/page-dcb.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
index 7177a06..4dcef6c 100644
--- a/src/connection-editor/page-dsl.c
+++ b/src/connection-editor/page-dsl.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
index 0baf5cc..9bc87bf 100644
--- a/src/connection-editor/page-ethernet.c
+++ b/src/connection-editor/page-ethernet.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <net/ethernet.h>
 
diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c
index 13e8aa2..a94cf80 100644
--- a/src/connection-editor/page-general.c
+++ b/src/connection-editor/page-general.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
index 76ecdb5..f544e4a 100644
--- a/src/connection-editor/page-infiniband.c
+++ b/src/connection-editor/page-infiniband.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index 120a2d2..dc7097d 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index db95b03..de6283d 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c
index 82072a4..2b79007 100644
--- a/src/connection-editor/page-master.c
+++ b/src/connection-editor/page-master.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index 671ece1..add1670 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/page-ppp.c b/src/connection-editor/page-ppp.c
index 1a0363a..60f413e 100644
--- a/src/connection-editor/page-ppp.c
+++ b/src/connection-editor/page-ppp.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/page-team-port.c b/src/connection-editor/page-team-port.c
index dbad57f..8078b56 100644
--- a/src/connection-editor/page-team-port.c
+++ b/src/connection-editor/page-team-port.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c
index 2ddf4d1..0759bab 100644
--- a/src/connection-editor/page-team.c
+++ b/src/connection-editor/page-team.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c
index a9cda2b..39a3692 100644
--- a/src/connection-editor/page-vlan.c
+++ b/src/connection-editor/page-vlan.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <net/ethernet.h>
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index 6e100f6..78593f8 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
index b6fade0..a19553f 100644
--- a/src/connection-editor/page-wifi-security.c
+++ b/src/connection-editor/page-wifi-security.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
index 7b32673..fc550f9 100644
--- a/src/connection-editor/page-wifi.c
+++ b/src/connection-editor/page-wifi.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <math.h>
 
diff --git a/src/connection-editor/ppp-auth-methods-dialog.c b/src/connection-editor/ppp-auth-methods-dialog.c
index ff40000..918a7b3 100644
--- a/src/connection-editor/ppp-auth-methods-dialog.c
+++ b/src/connection-editor/ppp-auth-methods-dialog.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/connection-editor/vpn-helpers.c b/src/connection-editor/vpn-helpers.c
index 4ac9cf4..e4aad6f 100644
--- a/src/connection-editor/vpn-helpers.c
+++ b/src/connection-editor/vpn-helpers.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <glib.h>
 #include <gmodule.h>
diff --git a/src/ethernet-dialog.c b/src/ethernet-dialog.c
index 30114ab..e613d80 100644
--- a/src/ethernet-dialog.c
+++ b/src/ethernet-dialog.c
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 
 #include "ethernet-dialog.h"
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index 18c0b57..85ff97d 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -39,6 +39,8 @@ libnm_gtk_la_CFLAGS = \
        -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
        -DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \
        -DNMALOCALEDIR=\"$(datadir)/locale\" \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
+       "-I${top_srcdir}/shared/" \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security
 
diff --git a/src/libnm-gtk/init.c b/src/libnm-gtk/init.c
index ffc5014..e5aff7c 100644
--- a/src/libnm-gtk/init.c
+++ b/src/libnm-gtk/init.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <libintl.h>
 #include <glib/gi18n-lib.h>
 
diff --git a/src/libnm-gtk/nm-mobile-providers.c b/src/libnm-gtk/nm-mobile-providers.c
index 2cff1d4..532654a 100644
--- a/src/libnm-gtk/nm-mobile-providers.c
+++ b/src/libnm-gtk/nm-mobile-providers.c
@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/libnm-gtk/nm-mobile-wizard.c b/src/libnm-gtk/nm-mobile-wizard.c
index d552ff1..891cfe0 100644
--- a/src/libnm-gtk/nm-mobile-wizard.c
+++ b/src/libnm-gtk/nm-mobile-wizard.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdlib.h>
 
 #include <glib.h>
diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c
index 0dca148..c042e66 100644
--- a/src/libnm-gtk/nm-ui-utils.c
+++ b/src/libnm-gtk/nm-ui-utils.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/src/libnm-gtk/nm-vpn-password-dialog.c b/src/libnm-gtk/nm-vpn-password-dialog.c
index f7f1cc5..9928a44 100644
--- a/src/libnm-gtk/nm-vpn-password-dialog.c
+++ b/src/libnm-gtk/nm-vpn-password-dialog.c
@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
index b5c2599..777aca9 100644
--- a/src/libnm-gtk/nm-wifi-dialog.c
+++ b/src/libnm-gtk/nm-wifi-dialog.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/src/libnm-gtk/nm-wireless-dialog.c b/src/libnm-gtk/nm-wireless-dialog.c
index 74dfd64..aa0aa94 100644
--- a/src/libnm-gtk/nm-wireless-dialog.c
+++ b/src/libnm-gtk/nm-wireless-dialog.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <nm-client.h>
 
 #include "nm-wireless-dialog.h"
diff --git a/src/libnm-gtk/tests/Makefile.am b/src/libnm-gtk/tests/Makefile.am
index cc50e25..12a7ca0 100644
--- a/src/libnm-gtk/tests/Makefile.am
+++ b/src/libnm-gtk/tests/Makefile.am
@@ -8,6 +8,7 @@ test_mobile_providers_SOURCES = \
 test_mobile_providers_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(LIBNM_GLIB_CFLAGS) \
+       "-I${top_srcdir}/shared/" \
        -I$(top_srcdir) \
        -I$(top_srcdir)/src/libnm-gtk \
        -DTEST_DATA_DIR=\""$(abs_top_srcdir)/src/libnm-gtk/tests"\"
diff --git a/src/libnm-gtk/tests/test-mobile-providers.c b/src/libnm-gtk/tests/test-mobile-providers.c
index 310da14..bad9fc5 100644
--- a/src/libnm-gtk/tests/test-mobile-providers.c
+++ b/src/libnm-gtk/tests/test-mobile-providers.c
@@ -15,11 +15,11 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <locale.h>
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-mobile-providers.h"
 
 #if defined TEST_DATA_DIR
diff --git a/src/libnma/Makefile.am b/src/libnma/Makefile.am
index ed196ec..23c9c57 100644
--- a/src/libnma/Makefile.am
+++ b/src/libnma/Makefile.am
@@ -34,6 +34,8 @@ libnma_la_CFLAGS = \
        -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
        -DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \
        -DNMALOCALEDIR=\"$(datadir)/locale\" \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+       "-I${top_srcdir}/shared/" \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security
 
diff --git a/src/libnma/init.c b/src/libnma/init.c
index a120a2b..ff33b55 100644
--- a/src/libnma/init.c
+++ b/src/libnma/init.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <libintl.h>
 #include <glib/gi18n-lib.h>
 
diff --git a/src/libnma/nma-mobile-providers.c b/src/libnma/nma-mobile-providers.c
index 86d9d06..5159852 100644
--- a/src/libnma/nma-mobile-providers.c
+++ b/src/libnma/nma-mobile-providers.c
@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/libnma/nma-mobile-wizard.c b/src/libnma/nma-mobile-wizard.c
index d1daa7c..fbfc538 100644
--- a/src/libnma/nma-mobile-wizard.c
+++ b/src/libnma/nma-mobile-wizard.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdlib.h>
 
 #include <glib.h>
diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
index f538ab9..d26ab22 100644
--- a/src/libnma/nma-ui-utils.c
+++ b/src/libnma/nma-ui-utils.c
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/src/libnma/nma-vpn-password-dialog.c b/src/libnma/nma-vpn-password-dialog.c
index 6de5d2b..e50bc50 100644
--- a/src/libnma/nma-vpn-password-dialog.c
+++ b/src/libnma/nma-vpn-password-dialog.c
@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c
index e85203e..15f65b2 100644
--- a/src/libnma/nma-wifi-dialog.c
+++ b/src/libnma/nma-wifi-dialog.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/src/mb-menu-item.c b/src/mb-menu-item.c
index 7ae5619..5fbe383 100644
--- a/src/mb-menu-item.c
+++ b/src/mb-menu-item.c
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <stdio.h>
 #include <glib/gi18n.h>
 #include <string.h>
diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
index 1ede761..7c3cf18 100644
--- a/src/mobile-helpers.c
+++ b/src/mobile-helpers.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <ctype.h>
 #include <glib/gi18n.h>
 
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 305249e..0f7b4ca 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -12,7 +12,8 @@ libutils_libnm_glib_la_SOURCES = \
 libutils_libnm_glib_la_CPPFLAGS = \
        -DLIBNM_GLIB_BUILD \
        $(GTK_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS)
+       $(LIBNM_GLIB_CFLAGS) \
+       "-I${top_srcdir}/shared/"
 
 libutils_libnm_glib_la_LIBADD = \
        $(GTK_LIBS) \
@@ -25,7 +26,8 @@ libutils_libnm_la_SOURCES = \
 libutils_libnm_la_CPPFLAGS = \
        -DLIBNM_BUILD \
        $(GTK_CFLAGS) \
-       $(LIBNM_CFLAGS)
+       $(LIBNM_CFLAGS) \
+       "-I${top_srcdir}/shared/"
 
 libutils_libnm_la_LIBADD = \
        $(GTK_LIBS) \
diff --git a/src/utils/tests/Makefile.am b/src/utils/tests/Makefile.am
index 61e937a..2acd8ff 100644
--- a/src/utils/tests/Makefile.am
+++ b/src/utils/tests/Makefile.am
@@ -6,7 +6,8 @@ test_utils_CPPFLAGS = \
        -I $(top_srcdir)/src/utils \
        -DLIBNM_BUILD \
        $(GTK_CFLAGS) \
-       $(LIBNM_CFLAGS)
+       $(LIBNM_CFLAGS) \
+       "-I${top_srcdir}/shared/"
 
 test_utils_LDADD = \
        ${top_builddir}/src/utils/libutils-libnm.la \
diff --git a/src/utils/tests/test-utils.c b/src/utils/tests/test-utils.c
index 9578653..e0ecc92 100644
--- a/src/utils/tests/test-utils.c
+++ b/src/utils/tests/test-utils.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib.h>
 #include <string.h>
 
diff --git a/src/utils/utils.c b/src/utils/utils.c
index fe300ba..2dbf8c4 100644
--- a/src/utils/utils.c
+++ b/src/utils/utils.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <netinet/ether.h>
 #include <glib.h>
diff --git a/src/wireless-security/Makefile.am b/src/wireless-security/Makefile.am
index 451c838..2be7aa7 100644
--- a/src/wireless-security/Makefile.am
+++ b/src/wireless-security/Makefile.am
@@ -40,6 +40,7 @@ libwireless_security_libnm_glib_la_CPPFLAGS = \
        -DUIDIR=\""$(uidir)"\" \
        -DLIBNM_GLIB_BUILD \
        $(LIBNM_GLIB_CFLAGS) \
+       "-I${top_srcdir}/shared/" \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/libnma
 
@@ -56,6 +57,7 @@ libwireless_security_libnm_la_CPPFLAGS = \
        -DUIDIR=\""$(uidir)"\" \
        -DLIBNM_BUILD \
        $(LIBNM_CFLAGS) \
+       "-I${top_srcdir}/shared/" \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/libnma
 
diff --git a/src/wireless-security/eap-method-fast.c b/src/wireless-security/eap-method-fast.c
index d9b0d8c..002c5ab 100644
--- a/src/wireless-security/eap-method-fast.c
+++ b/src/wireless-security/eap-method-fast.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/src/wireless-security/eap-method-leap.c b/src/wireless-security/eap-method-leap.c
index de404f6..c0e7190 100644
--- a/src/wireless-security/eap-method-leap.c
+++ b/src/wireless-security/eap-method-leap.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <glib/gi18n.h>
diff --git a/src/wireless-security/eap-method-peap.c b/src/wireless-security/eap-method-peap.c
index c1bb9f9..4d65e44 100644
--- a/src/wireless-security/eap-method-peap.c
+++ b/src/wireless-security/eap-method-peap.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c
index 2a86196..0deea1e 100644
--- a/src/wireless-security/eap-method-simple.c
+++ b/src/wireless-security/eap-method-simple.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <glib/gi18n.h>
diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
index b778f85..a8976b0 100644
--- a/src/wireless-security/eap-method-tls.c
+++ b/src/wireless-security/eap-method-tls.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/src/wireless-security/eap-method-ttls.c b/src/wireless-security/eap-method-ttls.c
index 9a76f78..e01490d 100644
--- a/src/wireless-security/eap-method-ttls.c
+++ b/src/wireless-security/eap-method-ttls.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
index 978e0de..cc92127 100644
--- a/src/wireless-security/eap-method.c
+++ b/src/wireless-security/eap-method.c
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/src/wireless-security/helpers.c b/src/wireless-security/helpers.c
index e7902f2..c4d37c5 100644
--- a/src/wireless-security/helpers.c
+++ b/src/wireless-security/helpers.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include "helpers.h"
 
 void
diff --git a/src/wireless-security/wireless-security.c b/src/wireless-security/wireless-security.c
index f769c37..29a6847 100644
--- a/src/wireless-security/wireless-security.c
+++ b/src/wireless-security/wireless-security.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 
 #include <glib.h>
diff --git a/src/wireless-security/ws-dynamic-wep.c b/src/wireless-security/ws-dynamic-wep.c
index 35f6e19..ec348af 100644
--- a/src/wireless-security/ws-dynamic-wep.c
+++ b/src/wireless-security/ws-dynamic-wep.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/src/wireless-security/ws-leap.c b/src/wireless-security/ws-leap.c
index 662e6e5..bd145f9 100644
--- a/src/wireless-security/ws-leap.c
+++ b/src/wireless-security/ws-leap.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <glib/gi18n.h>
 
diff --git a/src/wireless-security/ws-wep-key.c b/src/wireless-security/ws-wep-key.c
index ce94ddd..eef9121 100644
--- a/src/wireless-security/ws-wep-key.c
+++ b/src/wireless-security/ws-wep-key.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n.h>
diff --git a/src/wireless-security/ws-wpa-eap.c b/src/wireless-security/ws-wpa-eap.c
index b00826b..ddf1009 100644
--- a/src/wireless-security/ws-wpa-eap.c
+++ b/src/wireless-security/ws-wpa-eap.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/src/wireless-security/ws-wpa-psk.c b/src/wireless-security/ws-wpa-psk.c
index 45034f3..5f56036 100644
--- a/src/wireless-security/ws-wpa-psk.c
+++ b/src/wireless-security/ws-wpa-psk.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <glib/gi18n.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]