Commit 19c3ea94 authored by Thomas Haller's avatar Thomas Haller

all: make use of new header file "nm-default.h"

parent 9ac57182
......@@ -29,7 +29,7 @@
#include <nm-setting-ip6-config.h>
#include <nm-setting-connection.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-dispatcher-api.h"
#include "nm-utils.h"
......
......@@ -21,7 +21,7 @@
#ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
#define __NETWORKMANAGER_DISPATCHER_UTILS_H__
#include "nm-glib.h"
#include "nm-default.h"
char **
nm_dispatcher_utils_construct_envp (const char *action,
......
......@@ -34,7 +34,7 @@
#include <glib-unix.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-dispatcher-api.h"
#include "nm-dispatcher-utils.h"
......
......@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-core-internal.h"
#include "nm-dispatcher-utils.h"
#include "nm-dispatcher-api.h"
......
......@@ -29,7 +29,7 @@
#include <readline/readline.h>
#include <readline/history.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "common.h"
#include "utils.h"
#include "nm-secret-agent-simple.h"
......
......@@ -29,7 +29,7 @@
#include <readline/readline.h>
#include <readline/history.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "common.h"
#include "utils.h"
......
......@@ -30,8 +30,7 @@
#include <readline/readline.h>
#include <readline/history.h>
#include "nm-glib.h"
#include "gsystem-local-alloc.h"
#include "nm-default.h"
#include "utils.h"
#include "common.h"
#include "settings.h"
......
......@@ -27,7 +27,7 @@
#include <glib/gi18n.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-secret-agent-simple.h"
#include "polkit-agent.h"
#include "utils.h"
......
......@@ -24,7 +24,7 @@
#include <glib/gi18n.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "polkit-agent.h"
#include "utils.h"
#include "general.h"
......
......@@ -35,7 +35,7 @@
#include <glib/gi18n.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "polkit-agent.h"
#include "nmcli.h"
#include "utils.h"
......
......@@ -29,7 +29,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "polkit-agent.h"
#include "nm-polkit-listener.h"
#include "common.h"
......@@ -142,7 +142,7 @@ nmc_start_polkit_agent_start_try (NmCli *nmc)
#else
/* polkit agent is not avalable; implement stub functions. */
#include "nm-glib.h"
#include "nm-default.h"
#include "nmcli.h"
#include "polkit-agent.h"
......
......@@ -24,7 +24,7 @@
#include <glib/gi18n.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "utils.h"
#include "common.h"
#include "settings.h"
......
......@@ -31,7 +31,7 @@
#include <glib/gi18n.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "utils.h"
int
......
......@@ -38,7 +38,7 @@
#include <stdlib.h>
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-polkit-listener.h"
G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, POLKIT_AGENT_TYPE_LISTENER)
......
......@@ -22,7 +22,7 @@
#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
#include <polkitagent/polkitagent.h>
#include "nm-glib.h"
#include "nm-default.h"
G_BEGIN_DECLS
......
......@@ -34,6 +34,7 @@
#include <string.h>
#include <glib/gi18n-lib.h>
#include "nm-default.h"
#include "nm-secret-agent-simple.h"
G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD)
......
......@@ -42,7 +42,7 @@
#include <NetworkManager.h>
#include "nm-glib.h"
#include "nm-default.h"
#define PROGRESS_STEPS 15
#define WAIT_STARTUP_TAG "wait-startup"
......
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-core \
-DG_LOG_DOMAIN=\""nmtui"\" \
$(GLIB_CFLAGS) \
$(NEWT_CFLAGS) \
......
......@@ -21,7 +21,7 @@
#include <newt.h>
#include "nm-glib.h"
#include "nm-default.h"
G_BEGIN_DECLS
......
......@@ -30,7 +30,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-newt-utils.h"
static void
......
......@@ -21,7 +21,7 @@
#include <newt.h>
#include "nm-glib.h"
#include "nm-default.h"
G_BEGIN_DECLS
......
......@@ -30,6 +30,7 @@
#include <glib/gi18n.h>
#include <NetworkManager.h>
#include "nm-default.h"
#include "nm-editor-utils.h"
#if 0
#include "vpn-helpers.h"
......
......@@ -30,7 +30,7 @@
#include <glib/gi18n-lib.h>
#include <nm-utils.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmtui.h"
#include "nm-editor-utils.h"
......
......@@ -19,7 +19,7 @@
#ifndef NMT_MAC_ENTRY_H
#define NMT_MAC_ENTRY_H
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-utils.h"
#include "nmt-newt.h"
......
......@@ -29,7 +29,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-bond.h"
#include "nmt-address-list.h"
......
......@@ -25,7 +25,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-bridge-port.h"
G_DEFINE_TYPE (NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE)
......
......@@ -25,7 +25,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-bridge.h"
#include "nmt-address-list.h"
......
......@@ -25,7 +25,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-dsl.h"
#include "nmt-page-ethernet.h"
#include "nmt-page-ppp.h"
......
......@@ -19,7 +19,7 @@
#ifndef NMT_PAGE_DSL_H
#define NMT_PAGE_DSL_H
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-editor-page-device.h"
G_BEGIN_DECLS
......
......@@ -25,7 +25,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-ethernet.h"
#include "nmt-mac-entry.h"
#include "nmt-mtu-entry.h"
......
......@@ -25,7 +25,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-infiniband.h"
#include "nmt-mtu-entry.h"
......
......@@ -27,7 +27,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-ip4.h"
#include "nmt-ip-entry.h"
#include "nmt-address-list.h"
......
......@@ -27,7 +27,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-ip6.h"
#include "nmt-ip-entry.h"
#include "nmt-address-list.h"
......
......@@ -27,7 +27,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-ppp.h"
#include "nmt-newt-section.h"
#include "nmt-newt-separator.h"
......
......@@ -25,7 +25,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-team-port.h"
G_DEFINE_TYPE (NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE)
......
......@@ -25,7 +25,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-team.h"
#include "nmt-slave-list.h"
......
......@@ -19,7 +19,7 @@
#ifndef NMT_PAGE_TEAM_H
#define NMT_PAGE_TEAM_H
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-editor-page-device.h"
G_BEGIN_DECLS
......
......@@ -25,7 +25,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-editor-bindings.h"
#include "nmt-page-vlan.h"
......
......@@ -31,7 +31,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-page-wifi.h"
#include "nmt-mac-entry.h"
#include "nmt-mtu-entry.h"
......
......@@ -29,7 +29,7 @@
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-route-editor.h"
#include "nmt-route-table.h"
......
......@@ -19,7 +19,7 @@
#ifndef NMT_UTILS_H
#define NMT_UTILS_H
#include "nm-glib.h"
#include "nm-default.h"
G_BEGIN_DECLS
......
......@@ -34,7 +34,7 @@
#include <NetworkManager.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nmt-newt.h"
#include "nm-editor-bindings.h"
......
......@@ -34,7 +34,7 @@
#include <gmodule.h>
#include <glib/gi18n.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "vpn-helpers.h"
#include "nm-macros-internal.h"
......
......@@ -21,7 +21,7 @@
#include <NetworkManager.h>
#include "nm-glib.h"
#include "nm-default.h"
GSList *vpn_get_plugins (void);
......
......@@ -22,7 +22,7 @@
#ifndef __NM_MACROS_INTERNAL_H__
#define __NM_MACROS_INTERNAL_H__
#include "nm-glib.h"
#include "nm-default.h"
/********************************************************/
......
......@@ -89,10 +89,9 @@
#include <string.h>
#include <errno.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-utils.h"
#include "nm-macros-internal.h"
#include "gsystem-local-alloc.h"
#ifdef __NETWORKMANAGER_LOGGING_H__
/* We are running tests under src/. Let's include some files by default.
......
......@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "crypto.h"
#include "nm-errors.h"
......
......@@ -24,7 +24,7 @@
#ifndef __CRYPTO_H__
#define __CRYPTO_H__
#include "nm-glib.h"
#include "nm-default.h"
#define MD5_HASH_LEN 20
#define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC"
......
......@@ -30,7 +30,7 @@
#include <gnutls/x509.h>
#include <gnutls/pkcs12.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "crypto.h"
#include "nm-errors.h"
......
......@@ -35,7 +35,7 @@
#include <ciferfam.h>
#include <p12plcy.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "crypto.h"
#include "nm-errors.h"
......
......@@ -24,13 +24,12 @@
#include <glib/gi18n-lib.h>
#include <string.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-connection.h"
#include "nm-connection-private.h"
#include "nm-utils.h"
#include "nm-setting-private.h"
#include "nm-core-internal.h"
#include "gsystem-local-alloc.h"
/**
* SECTION:nm-connection
......
......@@ -34,7 +34,7 @@
**/
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-connection.h"
#include "nm-core-enum-types.h"
#include "nm-dbus-interface.h"
......@@ -67,7 +67,6 @@
#include "nm-setting.h"
#include "nm-simple-connection.h"
#include "nm-utils.h"
#include "nm-version.h"
#include "nm-vpn-dbus-interface.h"
#define NM_UTILS_CLEAR_CANCELLABLE(c) \
......
......@@ -23,7 +23,7 @@
#include <string.h>
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-core-internal.h"
typedef struct {
......
......@@ -22,7 +22,7 @@
#include <string.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-errors.h"
#include "nm-dbus-interface.h"
#include "nm-vpn-dbus-interface.h"
......
......@@ -24,7 +24,7 @@
#include <sys/types.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-connection.h"
#include "nm-setting-8021x.h"
......
......@@ -30,10 +30,9 @@
#include <string.h>
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"
#include "nm-core-internal.h"
#include "nm-macros-internal.h"
#include "gsystem-local-alloc.h"
#include "nm-keyfile-internal.h"
#include "nm-keyfile-utils.h"
......
......@@ -23,8 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include "nm-glib.h"
#include "gsystem-local-alloc.h"
#include "nm-default.h"
#include "nm-keyfile-utils.h"
#include "nm-keyfile-internal.h"
#include "nm-setting-wired.h"
......
......@@ -30,7 +30,7 @@
#include <string.h>
#include <glib/gi18n-lib.h>
#include "nm-glib.h"
#include "nm-default.h"