diff options
Diffstat (limited to 'clients/tui')
60 files changed, 70 insertions, 90 deletions
diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c index 4fba1daf..5341c76a 100644 --- a/clients/tui/newt/nmt-newt-button-box.c +++ b/clients/tui/newt/nmt-newt-button-box.c @@ -29,7 +29,7 @@ * within each of the two sections. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-button.c b/clients/tui/newt/nmt-newt-button.c index 00dbcd79..c797e222 100644 --- a/clients/tui/newt/nmt-newt-button.c +++ b/clients/tui/newt/nmt-newt-button.c @@ -23,7 +23,7 @@ * #NmtNewtButton implements a button widget. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-button.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/newt/nmt-newt-checkbox.c b/clients/tui/newt/nmt-newt-checkbox.c index 69d9920a..af7724b2 100644 --- a/clients/tui/newt/nmt-newt-checkbox.c +++ b/clients/tui/newt/nmt-newt-checkbox.c @@ -23,7 +23,7 @@ * #NmtNewtCheckbox implements a checkbox widget. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-checkbox.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/newt/nmt-newt-component.c b/clients/tui/newt/nmt-newt-component.c index 98f6df63..034d6d2d 100644 --- a/clients/tui/newt/nmt-newt-component.c +++ b/clients/tui/newt/nmt-newt-component.c @@ -24,7 +24,7 @@ * wrap a (single) #newtComponent. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-component.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c index 03f677fb..927f187e 100644 --- a/clients/tui/newt/nmt-newt-container.c +++ b/clients/tui/newt/nmt-newt-container.c @@ -26,7 +26,7 @@ * #NmtNewtGrid is the most generic container type. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c index 416b4b79..b79f056a 100644 --- a/clients/tui/newt/nmt-newt-entry-numeric.c +++ b/clients/tui/newt/nmt-newt-entry-numeric.c @@ -26,7 +26,7 @@ * #NmtNewtEntryValidator functions, so you should not set your own. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c index 7c92d00a..2715a738 100644 --- a/clients/tui/newt/nmt-newt-entry.c +++ b/clients/tui/newt/nmt-newt-entry.c @@ -26,7 +26,7 @@ * See also #NmtNewtEntryNumeric, for numeric-only entries. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c index ce401e25..835c1aba 100644 --- a/clients/tui/newt/nmt-newt-form.c +++ b/clients/tui/newt/nmt-newt-form.c @@ -24,7 +24,7 @@ * "form" (aka dialog) to the user. */ -#include "config.h" +#include "nm-default.h" #include <fcntl.h> #include <string.h> diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c index ac967334..4333e0dc 100644 --- a/clients/tui/newt/nmt-newt-grid.c +++ b/clients/tui/newt/nmt-newt-grid.c @@ -40,7 +40,7 @@ * must be implemented by the container... */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-hacks.c b/clients/tui/newt/nmt-newt-hacks.c index 2d9b1725..5f69643a 100644 --- a/clients/tui/newt/nmt-newt-hacks.c +++ b/clients/tui/newt/nmt-newt-hacks.c @@ -24,7 +24,7 @@ * functions that were added after 0.52.15. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-hacks.h" diff --git a/clients/tui/newt/nmt-newt-hacks.h b/clients/tui/newt/nmt-newt-hacks.h index ba8464af..d4eb3fd2 100644 --- a/clients/tui/newt/nmt-newt-hacks.h +++ b/clients/tui/newt/nmt-newt-hacks.h @@ -19,8 +19,6 @@ #ifndef NMT_NEWT_HACKS_H #define NMT_NEWT_HACKS_H -#include "config.h" - #include <newt.h> #ifndef HAVE_NEWTCOMPONENTGETSIZE diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c index 9c4df8ed..f9aed8a3 100644 --- a/clients/tui/newt/nmt-newt-label.c +++ b/clients/tui/newt/nmt-newt-label.c @@ -25,7 +25,7 @@ * See also #NmtNewtTextbox, for multiline. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-listbox.c b/clients/tui/newt/nmt-newt-listbox.c index e450df91..15a89b0b 100644 --- a/clients/tui/newt/nmt-newt-listbox.c +++ b/clients/tui/newt/nmt-newt-listbox.c @@ -31,7 +31,7 @@ * presses Return on a selection. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-listbox.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c index f7813063..e171e153 100644 --- a/clients/tui/newt/nmt-newt-popup.c +++ b/clients/tui/newt/nmt-newt-popup.c @@ -26,7 +26,7 @@ * #NmtNewtForm containing an #NmtNewtListbox to select from. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-popup.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c index 1a5035fc..38152c96 100644 --- a/clients/tui/newt/nmt-newt-section.c +++ b/clients/tui/newt/nmt-newt-section.c @@ -35,7 +35,7 @@ * extent of the section. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-separator.c b/clients/tui/newt/nmt-newt-separator.c index 07deb1af..0317069a 100644 --- a/clients/tui/newt/nmt-newt-separator.c +++ b/clients/tui/newt/nmt-newt-separator.c @@ -25,7 +25,7 @@ * between widgets in containers that don't implement padding. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-separator.h" diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c index d94bdebf..3abf00b1 100644 --- a/clients/tui/newt/nmt-newt-stack.c +++ b/clients/tui/newt/nmt-newt-stack.c @@ -29,7 +29,7 @@ * children. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c index 3d297160..73794f5e 100644 --- a/clients/tui/newt/nmt-newt-textbox.c +++ b/clients/tui/newt/nmt-newt-textbox.c @@ -24,7 +24,7 @@ * word-wrapping. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-toggle-button.c b/clients/tui/newt/nmt-newt-toggle-button.c index ec4d9aca..5397bfec 100644 --- a/clients/tui/newt/nmt-newt-toggle-button.c +++ b/clients/tui/newt/nmt-newt-toggle-button.c @@ -23,7 +23,7 @@ * #NmtNewtToggleButton implements a two-state toggle button. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-toggle-button.h" diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c index 841144d8..a8541829 100644 --- a/clients/tui/newt/nmt-newt-utils.c +++ b/clients/tui/newt/nmt-newt-utils.c @@ -21,14 +21,13 @@ * @short_description: Utility functions */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <stdarg.h> #include <unistd.h> #include <sys/wait.h> -#include "nm-default.h" #include "nmt-newt-utils.h" static void diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c index 24c94db9..5602c062 100644 --- a/clients/tui/newt/nmt-newt-widget.c +++ b/clients/tui/newt/nmt-newt-widget.c @@ -34,7 +34,7 @@ * FIXME: need RTL support */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-widget.h" #include "nmt-newt-form.h" diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c index a21ed666..3753aaa9 100644 --- a/clients/tui/nm-editor-bindings.c +++ b/clients/tui/nm-editor-bindings.c @@ -25,7 +25,7 @@ * shared between nmtui, nm-connection-editor, and gnome-control-center. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 026ef231..e582d41f 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -25,11 +25,10 @@ * nm-connection-editor, and gnome-control-center. */ -#include "config.h" +#include "nm-default.h" -#include <NetworkManager.h> +#include "NetworkManager.h" -#include "nm-default.h" #include "nm-editor-utils.h" #if 0 #include "nm-vpn-helpers.h" diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c index 3faf3442..53990d6a 100644 --- a/clients/tui/nmt-address-list.c +++ b/clients/tui/nmt-address-list.c @@ -28,7 +28,7 @@ * functions. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c index c21cc5be..0aecd387 100644 --- a/clients/tui/nmt-connect-connection-list.c +++ b/clients/tui/nmt-connect-connection-list.c @@ -24,11 +24,11 @@ * access points displayed by "nmtui connect". */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmtui.h" #include "nmt-connect-connection-list.h" diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c index 2760b149..86e92ca5 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -34,13 +34,13 @@ * to implement that then we should make it just an #NmtNewtEntry. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <sys/socket.h> #include <linux/if_arp.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmtui.h" #include "nmt-device-entry.h" diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c index 72e8c706..a1a59e01 100644 --- a/clients/tui/nmt-edit-connection-list.c +++ b/clients/tui/nmt-edit-connection-list.c @@ -24,7 +24,7 @@ * "nmtui edit". */ -#include "config.h" +#include "nm-default.h" #include "nmtui.h" #include "nmtui-edit.h" diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c index 118bf01d..a57e780b 100644 --- a/clients/tui/nmt-editor-grid.c +++ b/clients/tui/nmt-editor-grid.c @@ -37,7 +37,7 @@ * section border into account as well. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/nmt-editor-page-device.c b/clients/tui/nmt-editor-page-device.c index 0a9b18e0..d303604a 100644 --- a/clients/tui/nmt-editor-page-device.c +++ b/clients/tui/nmt-editor-page-device.c @@ -28,7 +28,7 @@ * an actual page type. */ -#include "config.h" +#include "nm-default.h" #include "nmt-editor-page-device.h" diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c index f2afc8c7..44abe273 100644 --- a/clients/tui/nmt-editor-page.c +++ b/clients/tui/nmt-editor-page.c @@ -24,7 +24,7 @@ * A "page" is a set of related #NmtEditorSections. */ -#include "config.h" +#include "nm-default.h" #include "nmt-editor-page.h" diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c index b9a3ae83..e7e51913 100644 --- a/clients/tui/nmt-editor-section.c +++ b/clients/tui/nmt-editor-section.c @@ -23,7 +23,7 @@ * #NmtEditorSection is the abstract base class for #NmtEditor sections. */ -#include "config.h" +#include "nm-default.h" #include "nmt-editor-section.h" #include "nmt-newt-toggle-button.h" diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index aaa73cbe..12f35b56 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -23,13 +23,12 @@ * #NmtEditor is the top-level form for editing a connection. */ -#include "config.h" +#include "nm-default.h" #include "nmt-editor.h" -#include <nm-utils.h> +#include "nm-utils.h" -#include "nm-default.h" #include "nmtui.h" #include "nm-editor-utils.h" diff --git a/clients/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c index d31a1f46..8d8f888f 100644 --- a/clients/tui/nmt-ip-entry.c +++ b/clients/tui/nmt-ip-entry.c @@ -27,7 +27,7 @@ * contains a valid IP address. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index 6501f09a..d0f07e12 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -26,11 +26,11 @@ * on whether it currently contains a valid hardware address. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmt-mac-entry.h" diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c index 9f11af0a..3909c836 100644 --- a/clients/tui/nmt-mtu-entry.c +++ b/clients/tui/nmt-mtu-entry.c @@ -30,7 +30,7 @@ * indicating the units used by the entry. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index ecc9aefc..259ecfc1 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -25,9 +25,8 @@ * can't just use #GBinding. */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-bond.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c index fdf44039..47e584a1 100644 --- a/clients/tui/nmt-page-bridge-port.c +++ b/clients/tui/nmt-page-bridge-port.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Bridge ports */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-bridge-port.h" G_DEFINE_TYPE (NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE) diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c index e9b0e66d..b5eb9ec8 100644 --- a/clients/tui/nmt-page-bridge.c +++ b/clients/tui/nmt-page-bridge.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Bridge connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-bridge.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c index 2346b496..cd8175b9 100644 --- a/clients/tui/nmt-page-dsl.c +++ b/clients/tui/nmt-page-dsl.c @@ -21,9 +21,8 @@ * @short_description: The editor page for DSL connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-dsl.h" #include "nmt-page-ethernet.h" #include "nmt-page-ppp.h" diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c index fed81f1c..dfe2e440 100644 --- a/clients/tui/nmt-page-ethernet.c +++ b/clients/tui/nmt-page-ethernet.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Ethernet connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-ethernet.h" #include "nmt-mac-entry.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c index e10c5a7a..91445f75 100644 --- a/clients/tui/nmt-page-infiniband.c +++ b/clients/tui/nmt-page-infiniband.c @@ -21,9 +21,8 @@ * @short_description: The editor page for InfiniBand connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-infiniband.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c index 2cc4f6af..deb0f509 100644 --- a/clients/tui/nmt-page-ip4.c +++ b/clients/tui/nmt-page-ip4.c @@ -21,11 +21,10 @@ * @short_description: The editor page for IP4 configuration */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nmt-page-ip4.h" #include "nmt-ip-entry.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c index e547122b..14802ace 100644 --- a/clients/tui/nmt-page-ip6.c +++ b/clients/tui/nmt-page-ip6.c @@ -21,11 +21,10 @@ * @short_description: The editor page for IP6 configuration */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nmt-page-ip6.h" #include "nmt-ip-entry.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c index 662ebd9c..64f4b9b8 100644 --- a/clients/tui/nmt-page-ppp.c +++ b/clients/tui/nmt-page-ppp.c @@ -21,11 +21,10 @@ * @short_description: The editor page for PPP configuration */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nmt-page-ppp.h" #include "nmt-newt-section.h" #include "nmt-newt-separator.h" diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c index 797c1cf1..af2221ad 100644 --- a/clients/tui/nmt-page-team-port.c +++ b/clients/tui/nmt-page-team-port.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Team ports. */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-team-port.h" G_DEFINE_TYPE (NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE) diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c index 572941b6..d7c4c425 100644 --- a/clients/tui/nmt-page-team.c +++ b/clients/tui/nmt-page-team.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Team connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-team.h" #include "nmt-slave-list.h" diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c index d392c552..c63b1904 100644 --- a/clients/tui/nmt-page-vlan.c +++ b/clients/tui/nmt-page-vlan.c @@ -21,9 +21,8 @@ * @short_description: The editor page for VLAN connections */ -#include "config.h" - #include "nm-default.h" + #include "nm-editor-bindings.h" #include "nmt-page-vlan.h" @@ -108,7 +107,7 @@ nmt_page_vlan_constructed (GObject *object) G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); nmt_editor_grid_append (grid, NULL, widget, NULL); - widget = id_entry = nmt_newt_entry_numeric_new (8, 0, 4095); + widget = id_entry = nmt_newt_entry_numeric_new (8, 0, 4094); g_object_bind_property (s_vlan, NM_SETTING_VLAN_ID, widget, "text", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c index c4b085ea..cd9b60e1 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -25,11 +25,10 @@ * properties. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nmt-page-wifi.h" #include "nmt-mac-entry.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c index 8eca7dc0..fb9567e6 100644 --- a/clients/tui/nmt-password-dialog.c +++ b/clients/tui/nmt-password-dialog.c @@ -24,7 +24,7 @@ * secrets when activating a connection. */ -#include "config.h" +#include "nm-default.h" #include "nmt-password-dialog.h" #include "nm-secret-agent-simple.h" diff --git a/clients/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c index cba64935..013d9695 100644 --- a/clients/tui/nmt-password-fields.c +++ b/clients/tui/nmt-password-fields.c @@ -25,7 +25,7 @@ * "Show password" checkbox that toggles whether the password is visible. */ -#include "config.h" +#include "nm-default.h" #include "nmt-password-fields.h" diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c index dc4d118b..964e3ff4 100644 --- a/clients/tui/nmt-route-editor.c +++ b/clients/tui/nmt-route-editor.c @@ -25,9 +25,8 @@ * wide to fit into the main window. */ -#include "config.h" - #include "nm-default.h" + #include "nmt-route-editor.h" #include "nmt-route-table.h" diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c index 1cc99940..f7c75e0a 100644 --- a/clients/tui/nmt-route-entry.c +++ b/clients/tui/nmt-route-entry.c @@ -26,13 +26,13 @@ * This is used as a building block by #NmtRouteTable. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> #include <stdlib.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmt-route-entry.h" #include "nmt-ip-entry.h" diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c index 0731acb6..7005e8ad 100644 --- a/clients/tui/nmt-route-table.c +++ b/clients/tui/nmt-route-table.c @@ -24,13 +24,13 @@ * and buttons to add and remove entries. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> #include <stdlib.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmt-route-table.h" #include "nmt-route-entry.h" diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c index 5a9b7482..a8c31e05 100644 --- a/clients/tui/nmt-slave-list.c +++ b/clients/tui/nmt-slave-list.c @@ -24,9 +24,9 @@ * slaves of a connection. */ -#include "config.h" +#include "nm-default.h" -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmt-slave-list.h" diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c index f2bf70db..a8c1c5f0 100644 --- a/clients/tui/nmt-utils.c +++ b/clients/tui/nmt-utils.c @@ -21,7 +21,7 @@ * @short_description: Miscellaneous nmtui-specific utilities */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c index b314e146..2fd5af02 100644 --- a/clients/tui/nmt-widget-list.c +++ b/clients/tui/nmt-widget-list.c @@ -30,7 +30,7 @@ * FIXME: The way this works is sort of weird. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 9d705bf1..46e33617 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -24,7 +24,7 @@ * including presenting a password dialog if necessary. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c index 258b798a..c7efd856 100644 --- a/clients/tui/nmtui-edit.c +++ b/clients/tui/nmtui-edit.c @@ -23,11 +23,11 @@ * nmtui-edit implements editing #NMConnections. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmtui.h" #include "nmtui-edit.h" diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c index f77a918b..ada2393f 100644 --- a/clients/tui/nmtui-hostname.c +++ b/clients/tui/nmtui-hostname.c @@ -23,7 +23,7 @@ * nmtui-hostname implements the "set hostname" functionality */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt.h" diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index 20e7d02b..47ba5bf5 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -24,15 +24,14 @@ * nmtui_edit(), and nmtui_hostname(). */ -#include "config.h" +#include "nm-default.h" #include <locale.h> #include <stdlib.h> #include <string.h> -#include <NetworkManager.h> +#include "NetworkManager.h" -#include "nm-default.h" #include "nmt-newt.h" #include "nm-editor-bindings.h" |