diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-08-17 18:19:00 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-08-17 19:51:17 +0200 |
| commit | 0bdcab100ca5fd86ec8ab0f9ccc3645b47835437 (patch) | |
| tree | 50865418973a9ad98def8a7d3e2528e0c9ff98f3 | |
| parent | 40d5749ec1c9d9aed746115dcf50d9bf1fbad131 (diff) | |
| download | NetworkManager-0bdcab100ca5fd86ec8ab0f9ccc3645b47835437.tar.gz | |
all: cleanup includes in header files
- don't include "nm-default.h" in header files. Every source file must
include as first header "nm-default.h", thus our headers get the
default include already implicitly.
- we don't support compiling NetworkManager itself with a C++ compiler. Remove
G_BEGIN_DECLS/G_END_DECLS from internal headers. We do however support
users of libnm to use C++, thus they stay in public headers.
(cherry picked from commit f19aff89095ca192b8b2e37534b7a899aecd82f9)
163 files changed, 32 insertions, 558 deletions
diff --git a/callouts/nm-dispatcher-utils.h b/callouts/nm-dispatcher-utils.h index 034898e4b1..6a10d4c311 100644 --- a/callouts/nm-dispatcher-utils.h +++ b/callouts/nm-dispatcher-utils.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__ #define __NETWORKMANAGER_DISPATCHER_UTILS_H__ -#include "nm-default.h" - char ** nm_dispatcher_utils_construct_envp (const char *action, GVariant *connection_dict, diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 9bfa05fade..8bc8828b41 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -19,7 +19,6 @@ * Copyright 2010 - 2015 Red Hat, Inc. */ -/* Generated configuration file */ #include "nm-default.h" #include <stdio.h> diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index 8b56e9534a..086851de9b 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -126,7 +126,6 @@ nmc_start_polkit_agent_start_try (NmCli *nmc) #else /* polkit agent is not avalable; implement stub functions. */ -#include "nm-default.h" #include "nmcli.h" #include "polkit-agent.h" diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 361a98aafd..ff98276ab0 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -17,8 +17,6 @@ * Copyright 2010 - 2015 Red Hat, Inc. */ -/* Generated configuration file */ - #include "nm-default.h" #include <stdio.h> diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h index 22c436c17c..a8256460fd 100644 --- a/clients/common/nm-polkit-listener.h +++ b/clients/common/nm-polkit-listener.h @@ -22,10 +22,6 @@ #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE #include <polkitagent/polkitagent.h> -#include "nm-default.h" - -G_BEGIN_DECLS - #define NM_TYPE_POLKIT_LISTENER (nm_polkit_listener_get_type ()) #define NM_POLKIT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_POLKIT_LISTENER, NMPolkitListener)) #define NM_POLKIT_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_POLKIT_LISTENER, NMPolkitListenerClass)) @@ -99,6 +95,4 @@ void nm_polkit_listener_set_show_error_callback (NMPolkitListener *self, void nm_polkit_listener_set_completed_callback (NMPolkitListener *self, NMPolkitListenerOnCompletedFunc completed_callback); -G_END_DECLS - #endif /* __NM_POLKIT_LISTENER_H__ */ diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h index d2c58822a0..ba819ae362 100644 --- a/clients/common/nm-secret-agent-simple.h +++ b/clients/common/nm-secret-agent-simple.h @@ -22,8 +22,6 @@ #include <NetworkManager.h> #include <nm-secret-agent-old.h> -G_BEGIN_DECLS - #define NM_TYPE_SECRET_AGENT_SIMPLE (nm_secret_agent_simple_get_type ()) #define NM_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple)) #define NM_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass)) @@ -59,6 +57,4 @@ void nm_secret_agent_simple_response (NMSecretAgentSimpl void nm_secret_agent_simple_enable (NMSecretAgentSimple *self, const char *path); -G_END_DECLS - #endif /* __NM_SECRET_AGENT_SIMPLE_H__ */ diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h index 873753b614..9c23f37c5d 100644 --- a/clients/common/nm-vpn-helpers.h +++ b/clients/common/nm-vpn-helpers.h @@ -21,8 +21,6 @@ #include <NetworkManager.h> -#include "nm-default.h" - struct { const char *name; const char *ui_name; diff --git a/clients/tui/newt/nmt-newt-button-box.h b/clients/tui/newt/nmt-newt-button-box.h index 970588a4d0..dec2c34753 100644 --- a/clients/tui/newt/nmt-newt-button-box.h +++ b/clients/tui/newt/nmt-newt-button-box.h @@ -21,8 +21,6 @@ #include "nmt-newt-grid.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_BUTTON_BOX (nmt_newt_button_box_get_type ()) #define NMT_NEWT_BUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_BUTTON_BOX, NmtNewtButtonBox)) #define NMT_NEWT_BUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_BUTTON_BOX, NmtNewtButtonBoxClass)) @@ -60,6 +58,4 @@ void nmt_newt_button_box_add_widget_end (NmtNewtButtonBox *bbox, NmtNewtWidget *widget); -G_END_DECLS - #endif /* NMT_NEWT_BUTTON_BOX_H */ diff --git a/clients/tui/newt/nmt-newt-button.h b/clients/tui/newt/nmt-newt-button.h index 52e95c5d13..646d005314 100644 --- a/clients/tui/newt/nmt-newt-button.h +++ b/clients/tui/newt/nmt-newt-button.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_BUTTON (nmt_newt_button_get_type ()) #define NMT_NEWT_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_BUTTON, NmtNewtButton)) #define NMT_NEWT_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_BUTTON, NmtNewtButtonClass)) @@ -48,6 +46,4 @@ void nmt_newt_button_set_label (NmtNewtButton *button, const char *label); const char *nmt_newt_button_get_label (NmtNewtButton *button); -G_END_DECLS - #endif /* NMT_NEWT_BUTTON_H */ diff --git a/clients/tui/newt/nmt-newt-checkbox.h b/clients/tui/newt/nmt-newt-checkbox.h index c277386b18..e46e3ec2dd 100644 --- a/clients/tui/newt/nmt-newt-checkbox.h +++ b/clients/tui/newt/nmt-newt-checkbox.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_CHECKBOX (nmt_newt_checkbox_get_type ()) #define NMT_NEWT_CHECKBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_CHECKBOX, NmtNewtCheckbox)) #define NMT_NEWT_CHECKBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_CHECKBOX, NmtNewtCheckboxClass)) @@ -48,6 +46,4 @@ void nmt_newt_checkbox_set_active (NmtNewtCheckbox *checkbox, gboolean active); gboolean nmt_newt_checkbox_get_active (NmtNewtCheckbox *checkbox); -G_END_DECLS - #endif /* NMT_NEWT_CHECKBOX_H */ diff --git a/clients/tui/newt/nmt-newt-component.h b/clients/tui/newt/nmt-newt-component.h index 2ffa018e1a..bf8f2bb8d8 100644 --- a/clients/tui/newt/nmt-newt-component.h +++ b/clients/tui/newt/nmt-newt-component.h @@ -21,8 +21,6 @@ #include "nmt-newt-widget.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_COMPONENT (nmt_newt_component_get_type ()) #define NMT_NEWT_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_COMPONENT, NmtNewtComponent)) #define NMT_NEWT_COMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_COMPONENT, NmtNewtComponentClass)) @@ -52,6 +50,4 @@ gboolean nmt_newt_component_get_sensitive (NmtNewtComponent *component); void nmt_newt_component_set_sensitive (NmtNewtComponent *component, gboolean sensitive); -G_END_DECLS - #endif /* NMT_NEWT_COMPONENT_H */ diff --git a/clients/tui/newt/nmt-newt-container.h b/clients/tui/newt/nmt-newt-container.h index 6f182925d5..32d6abccda 100644 --- a/clients/tui/newt/nmt-newt-container.h +++ b/clients/tui/newt/nmt-newt-container.h @@ -21,8 +21,6 @@ #include "nmt-newt-widget.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_CONTAINER (nmt_newt_container_get_type ()) #define NMT_NEWT_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_CONTAINER, NmtNewtContainer)) #define NMT_NEWT_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_CONTAINER, NmtNewtContainerClass)) @@ -56,6 +54,4 @@ void nmt_newt_container_remove (NmtNewtContainer *container, GSList *nmt_newt_container_get_children (NmtNewtContainer *container); -G_END_DECLS - #endif /* NMT_NEWT_CONTAINER_H */ diff --git a/clients/tui/newt/nmt-newt-entry-numeric.h b/clients/tui/newt/nmt-newt-entry-numeric.h index 43ac34490a..00e1973963 100644 --- a/clients/tui/newt/nmt-newt-entry-numeric.h +++ b/clients/tui/newt/nmt-newt-entry-numeric.h @@ -21,8 +21,6 @@ #include "nmt-newt-entry.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_ENTRY_NUMERIC (nmt_newt_entry_numeric_get_type ()) #define NMT_NEWT_ENTRY_NUMERIC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_ENTRY_NUMERIC, NmtNewtEntryNumeric)) #define NMT_NEWT_ENTRY_NUMERIC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_ENTRY_NUMERIC, NmtNewtEntryNumericClass)) @@ -46,6 +44,4 @@ NmtNewtWidget *nmt_newt_entry_numeric_new (int width, int min, int max); -G_END_DECLS - #endif /* NMT_NEWT_ENTRY_NUMERIC_H */ diff --git a/clients/tui/newt/nmt-newt-entry.h b/clients/tui/newt/nmt-newt-entry.h index 8df0b13701..36bd9d5199 100644 --- a/clients/tui/newt/nmt-newt-entry.h +++ b/clients/tui/newt/nmt-newt-entry.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_ENTRY (nmt_newt_entry_get_type ()) #define NMT_NEWT_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_ENTRY, NmtNewtEntry)) #define NMT_NEWT_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_ENTRY, NmtNewtEntryClass)) @@ -69,6 +67,4 @@ void nmt_newt_entry_set_width (NmtNewtEntry *entry, int width); int nmt_newt_entry_get_width (NmtNewtEntry *entry); -G_END_DECLS - #endif /* NMT_NEWT_ENTRY_H */ diff --git a/clients/tui/newt/nmt-newt-form.h b/clients/tui/newt/nmt-newt-form.h index be95eb68ad..2cae5b5e48 100644 --- a/clients/tui/newt/nmt-newt-form.h +++ b/clients/tui/newt/nmt-newt-form.h @@ -21,8 +21,6 @@ #include "nmt-newt-container.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_FORM (nmt_newt_form_get_type ()) #define NMT_NEWT_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_FORM, NmtNewtForm)) #define NMT_NEWT_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_FORM, NmtNewtFormClass)) @@ -61,6 +59,4 @@ void nmt_newt_form_quit (NmtNewtForm *form); void nmt_newt_form_set_focus (NmtNewtForm *form, NmtNewtWidget *widget); -G_END_DECLS - #endif /* NMT_NEWT_FORM_H */ diff --git a/clients/tui/newt/nmt-newt-grid.h b/clients/tui/newt/nmt-newt-grid.h index f36a38ee8f..11bfdec392 100644 --- a/clients/tui/newt/nmt-newt-grid.h +++ b/clients/tui/newt/nmt-newt-grid.h @@ -21,8 +21,6 @@ #include "nmt-newt-container.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_GRID (nmt_newt_grid_get_type ()) #define NMT_NEWT_GRID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_GRID, NmtNewtGrid)) #define NMT_NEWT_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_GRID, NmtNewtGridClass)) @@ -67,6 +65,4 @@ void nmt_newt_grid_set_flags (NmtNewtGrid *grid, NmtNewtWidget *widget, NmtNewtGridFlags flags); -G_END_DECLS - #endif /* NMT_NEWT_GRID_H */ diff --git a/clients/tui/newt/nmt-newt-label.h b/clients/tui/newt/nmt-newt-label.h index a4e0dcca5c..ef894d9164 100644 --- a/clients/tui/newt/nmt-newt-label.h +++ b/clients/tui/newt/nmt-newt-label.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_LABEL (nmt_newt_label_get_type ()) #define NMT_NEWT_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_LABEL, NmtNewtLabel)) #define NMT_NEWT_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_LABEL, NmtNewtLabelClass)) @@ -61,6 +59,4 @@ void nmt_newt_label_set_highlight (NmtNewtLabel *label, gboolean highlight); gboolean nmt_newt_label_get_highlight (NmtNewtLabel *label); -G_END_DECLS - #endif /* NMT_NEWT_LABEL_H */ diff --git a/clients/tui/newt/nmt-newt-listbox.h b/clients/tui/newt/nmt-newt-listbox.h index c18c9f8e65..eba17a7c8d 100644 --- a/clients/tui/newt/nmt-newt-listbox.h +++ b/clients/tui/newt/nmt-newt-listbox.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_LISTBOX (nmt_newt_listbox_get_type ()) #define NMT_NEWT_LISTBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_LISTBOX, NmtNewtListbox)) #define NMT_NEWT_LISTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_LISTBOX, NmtNewtListboxClass)) @@ -66,6 +64,4 @@ void nmt_newt_listbox_set_active_key (NmtNewtListbox *listbox, int nmt_newt_listbox_get_active (NmtNewtListbox *listbox); gpointer nmt_newt_listbox_get_active_key (NmtNewtListbox *listbox); -G_END_DECLS - #endif /* NMT_NEWT_LISTBOX_H */ diff --git a/clients/tui/newt/nmt-newt-popup.h b/clients/tui/newt/nmt-newt-popup.h index 643ea2d8c4..be2bc34c07 100644 --- a/clients/tui/newt/nmt-newt-popup.h +++ b/clients/tui/newt/nmt-newt-popup.h @@ -21,8 +21,6 @@ #include "nmt-newt-button.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_POPUP (nmt_newt_popup_get_type ()) #define NMT_NEWT_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_POPUP, NmtNewtPopup)) #define NMT_NEWT_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_POPUP, NmtNewtPopupClass)) @@ -57,6 +55,4 @@ const char *nmt_newt_popup_get_active_id (NmtNewtPopup *popup); void nmt_newt_popup_set_active_id (NmtNewtPopup *popup, const char *active_id); -G_END_DECLS - #endif /* NMT_NEWT_POPUP_H */ diff --git a/clients/tui/newt/nmt-newt-section.h b/clients/tui/newt/nmt-newt-section.h index 6bf59ebbbd..569e86e59e 100644 --- a/clients/tui/newt/nmt-newt-section.h +++ b/clients/tui/newt/nmt-newt-section.h @@ -21,8 +21,6 @@ #include "nmt-newt-container.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_SECTION (nmt_newt_section_get_type ()) #define NMT_NEWT_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_SECTION, NmtNewtSection)) #define NMT_NEWT_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_SECTION, NmtNewtSectionClass)) @@ -52,6 +50,4 @@ void nmt_newt_section_set_body (NmtNewtSection *section, NmtNewtWidget *body); NmtNewtWidget *nmt_newt_section_get_body (NmtNewtSection *section); -G_END_DECLS - #endif /* NMT_NEWT_SECTION_H */ diff --git a/clients/tui/newt/nmt-newt-separator.h b/clients/tui/newt/nmt-newt-separator.h index 3f4183d588..715030992f 100644 --- a/clients/tui/newt/nmt-newt-separator.h +++ b/clients/tui/newt/nmt-newt-separator.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_SEPARATOR (nmt_newt_separator_get_type ()) #define NMT_NEWT_SEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_SEPARATOR, NmtNewtSeparator)) #define NMT_NEWT_SEPARATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_SEPARATOR, NmtNewtSeparatorClass)) @@ -44,6 +42,4 @@ GType nmt_newt_separator_get_type (void); NmtNewtWidget *nmt_newt_separator_new (void); -G_END_DECLS - #endif /* NMT_NEWT_SEPARATOR_H */ diff --git a/clients/tui/newt/nmt-newt-stack.h b/clients/tui/newt/nmt-newt-stack.h index 09afe4baf6..c9bb5a077f 100644 --- a/clients/tui/newt/nmt-newt-stack.h +++ b/clients/tui/newt/nmt-newt-stack.h @@ -21,8 +21,6 @@ #include "nmt-newt-container.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_STACK (nmt_newt_stack_get_type ()) #define NMT_NEWT_STACK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_STACK, NmtNewtStack)) #define NMT_NEWT_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_STACK, NmtNewtStackClass)) @@ -56,6 +54,4 @@ void nmt_newt_stack_set_active_id (NmtNewtStack *stack, const char *id); const char * nmt_newt_stack_get_active_id (NmtNewtStack *stack); -G_END_DECLS - #endif /* NMT_NEWT_STACK_H */ diff --git a/clients/tui/newt/nmt-newt-textbox.h b/clients/tui/newt/nmt-newt-textbox.h index b3743aea05..31a159e2ea 100644 --- a/clients/tui/newt/nmt-newt-textbox.h +++ b/clients/tui/newt/nmt-newt-textbox.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_TEXTBOX (nmt_newt_textbox_get_type ()) #define NMT_NEWT_TEXTBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_TEXTBOX, NmtNewtTextbox)) #define NMT_NEWT_TEXTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_TEXTBOX, NmtNewtTextboxClass)) @@ -54,6 +52,4 @@ void nmt_newt_textbox_set_text (NmtNewtTextbox *textbox, const char *text); const char *nmt_newt_textbox_get_text (NmtNewtTextbox *textbox); -G_END_DECLS - #endif /* NMT_NEWT_TEXTBOX_H */ diff --git a/clients/tui/newt/nmt-newt-toggle-button.h b/clients/tui/newt/nmt-newt-toggle-button.h index e54c6d3fa1..69c0b7d134 100644 --- a/clients/tui/newt/nmt-newt-toggle-button.h +++ b/clients/tui/newt/nmt-newt-toggle-button.h @@ -21,8 +21,6 @@ #include "nmt-newt-button.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_TOGGLE_BUTTON (nmt_newt_toggle_button_get_type ()) #define NMT_NEWT_TOGGLE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_TOGGLE_BUTTON, NmtNewtToggleButton)) #define NMT_NEWT_TOGGLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_TOGGLE_BUTTON, NmtNewtToggleButtonClass)) @@ -49,6 +47,4 @@ gboolean nmt_newt_toggle_button_get_active (NmtNewtToggleButton *button); void nmt_newt_toggle_button_set_active (NmtNewtToggleButton *button, gboolean active); -G_END_DECLS - #endif /* NMT_NEWT_TOGGLE_BUTTON_H */ diff --git a/clients/tui/newt/nmt-newt-types.h b/clients/tui/newt/nmt-newt-types.h index 4ea0a7b8c7..af550ca055 100644 --- a/clients/tui/newt/nmt-newt-types.h +++ b/clients/tui/newt/nmt-newt-types.h @@ -21,10 +21,6 @@ #include <newt.h> -#include "nm-default.h" - -G_BEGIN_DECLS - typedef struct _NmtNewtButton NmtNewtButton; typedef struct _NmtNewtButtonBox NmtNewtButtonBox; typedef struct _NmtNewtCheckbox NmtNewtCheckbox; @@ -45,6 +41,4 @@ typedef struct _NmtNewtTextbox NmtNewtTextbox; typedef struct _NmtNewtToggleButton NmtNewtToggleButton; typedef struct _NmtNewtWidget NmtNewtWidget; -G_END_DECLS - #endif /* NMT_NEWT_COMPONENT_H */ diff --git a/clients/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h index 430c2ec1db..49d717d2e4 100644 --- a/clients/tui/newt/nmt-newt-utils.h +++ b/clients/tui/newt/nmt-newt-utils.h @@ -21,10 +21,6 @@ #include <newt.h> -#include "nm-default.h" - -G_BEGIN_DECLS - void nmt_newt_init (void); void nmt_newt_finished (void); @@ -49,6 +45,4 @@ int nmt_newt_choice_dialog (const char *button1, char *nmt_newt_edit_string (const char *data); -G_END_DECLS - #endif /* NMT_NEWT_UTILS_H */ diff --git a/clients/tui/newt/nmt-newt-widget.h b/clients/tui/newt/nmt-newt-widget.h index a526a674c3..34ce943c2d 100644 --- a/clients/tui/newt/nmt-newt-widget.h +++ b/clients/tui/newt/nmt-newt-widget.h @@ -21,8 +21,6 @@ #include "nmt-newt-types.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_WIDGET (nmt_newt_widget_get_type ()) #define NMT_NEWT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_WIDGET, NmtNewtWidget)) #define NMT_NEWT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_WIDGET, NmtNewtWidgetClass)) @@ -113,6 +111,4 @@ void nmt_newt_widget_needs_rebuild (NmtNewtWidget *widget); void nmt_newt_widget_set_valid (NmtNewtWidget *widget, gboolean valid); -G_END_DECLS - #endif /* NMT_NEWT_WIDGET_H */ diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h index c4ed95d53e..fd4fcd30cf 100644 --- a/clients/tui/nm-editor-bindings.h +++ b/clients/tui/nm-editor-bindings.h @@ -21,8 +21,6 @@ #include <NetworkManager.h> -G_BEGIN_DECLS - void nm_editor_bindings_init (void); void nm_editor_bind_ip_addresses_with_prefix_to_strv (int family, @@ -71,6 +69,4 @@ void nm_editor_bind_wireless_security_wep_key (NMSettingWirelessSecurity void nm_editor_bind_vlan_name (NMSettingVlan *s_vlan, NMSettingConnection *s_con); -G_END_DECLS - #endif /* NM_EDITOR_BINDINGS_H */ diff --git a/clients/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h index 5e402ce715..15a16cd269 100644 --- a/clients/tui/nm-editor-utils.h +++ b/clients/tui/nm-editor-utils.h @@ -21,8 +21,6 @@ #include <NetworkManager.h> -G_BEGIN_DECLS - typedef struct { const char *name; GType setting_type; @@ -38,6 +36,4 @@ NMConnection *nm_editor_utils_create_connection (GType type, NMConnection *master, NMClient *client); -G_END_DECLS - #endif /* NM_EDITOR_UTILS_H */ diff --git a/clients/tui/nmt-address-list.h b/clients/tui/nmt-address-list.h index df7a4f7962..f82f218186 100644 --- a/clients/tui/nmt-address-list.h +++ b/clients/tui/nmt-address-list.h @@ -21,8 +21,6 @@ #include "nmt-widget-list.h" -G_BEGIN_DECLS - #define NMT_TYPE_ADDRESS_LIST (nmt_address_list_get_type ()) #define NMT_ADDRESS_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_ADDRESS_LIST, NmtAddressList)) #define NMT_ADDRESS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_ADDRESS_LIST, NmtAddressListClass)) @@ -52,6 +50,4 @@ typedef enum { NmtNewtWidget *nmt_address_list_new (NmtAddressListType list_type); -G_END_DECLS - #endif /* NMT_ADDRESS_LIST_H */ diff --git a/clients/tui/nmt-connect-connection-list.h b/clients/tui/nmt-connect-connection-list.h index d47900437d..bf4721b9c5 100644 --- a/clients/tui/nmt-connect-connection-list.h +++ b/clients/tui/nmt-connect-connection-list.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_CONNECT_CONNECTION_LIST (nmt_connect_connection_list_get_type ()) #define NMT_CONNECT_CONNECTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_CONNECT_CONNECTION_LIST, NmtConnectConnectionList)) #define NMT_CONNECT_CONNECTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_CONNECT_CONNECTION_LIST, NmtConnectConnectionListClass)) @@ -56,6 +54,4 @@ gboolean nmt_connect_connection_list_get_selection (NmtConnectConnectionList * NMObject **specific_object, NMActiveConnection **active); -G_END_DECLS - #endif /* NMT_CONNECT_CONNECTION_LIST_H */ diff --git a/clients/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h index 05d5d40f7d..4945e7c2a5 100644 --- a/clients/tui/nmt-device-entry.h +++ b/clients/tui/nmt-device-entry.h @@ -23,8 +23,6 @@ #include <NetworkManager.h> -G_BEGIN_DECLS - #define NMT_TYPE_DEVICE_ENTRY (nmt_device_entry_get_type ()) #define NMT_DEVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_DEVICE_ENTRY, NmtDeviceEntry)) #define NMT_DEVICE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_DEVICE_ENTRY, NmtDeviceEntryClass)) @@ -55,6 +53,4 @@ void nmt_device_entry_set_device_filter (NmtDeviceEntry *deventry, NmtDeviceEntryDeviceFilter filter, gpointer user_data); -G_END_DECLS - #endif /* NMT_DEVICE_ENTRY_H */ diff --git a/clients/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h index c31c0a8cb5..fd492bce73 100644 --- a/clients/tui/nmt-edit-connection-list.h +++ b/clients/tui/nmt-edit-connection-list.h @@ -23,8 +23,6 @@ #include <NetworkManager.h> -G_BEGIN_DECLS - #define NMT_TYPE_EDIT_CONNECTION_LIST (nmt_edit_connection_list_get_type ()) #define NMT_EDIT_CONNECTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDIT_CONNECTION_LIST, NmtEditConnectionList)) #define NMT_EDIT_CONNECTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDIT_CONNECTION_LIST, NmtEditConnectionListClass)) @@ -54,6 +52,4 @@ typedef gboolean (*NmtEditConnectionListFilter) (NmtEditConnectionList *list, NMConnection *connection, gpointer user_data); -G_END_DECLS - #endif /* NMT_EDIT_CONNECTION_LIST_H */ diff --git a/clients/tui/nmt-editor-grid.h b/clients/tui/nmt-editor-grid.h index 2ae01d71d5..4867689611 100644 --- a/clients/tui/nmt-editor-grid.h +++ b/clients/tui/nmt-editor-grid.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR_GRID (nmt_editor_grid_get_type ()) #define NMT_EDITOR_GRID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_GRID, NmtEditorGrid)) #define NMT_EDITOR_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_GRID, NmtEditorGridClass)) @@ -57,6 +55,4 @@ void nmt_editor_grid_set_row_flags (NmtEditorGrid *grid, NmtNewtWidget *widget, NmtEditorGridRowFlags flags); -G_END_DECLS - #endif /* NMT_EDITOR_GRID_H */ diff --git a/clients/tui/nmt-editor-page-device.h b/clients/tui/nmt-editor-page-device.h index f911602cc8..75aecd017e 100644 --- a/clients/tui/nmt-editor-page-device.h +++ b/clients/tui/nmt-editor-page-device.h @@ -22,8 +22,6 @@ #include "nmt-editor-page.h" #include "nmt-device-entry.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR_PAGE_DEVICE (nmt_editor_page_device_get_type ()) #define NMT_EDITOR_PAGE_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_PAGE_DEVICE, NmtEditorPageDevice)) #define NMT_EDITOR_PAGE_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_PAGE_DEVICE, NmtEditorPageDeviceClass)) @@ -45,6 +43,4 @@ GType nmt_editor_page_device_get_type (void); NmtDeviceEntry *nmt_editor_page_device_get_device_entry (NmtEditorPageDevice *page); -G_END_DECLS - #endif /* NMT_EDITOR_PAGE_DEVICE_H */ diff --git a/clients/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h index bbc0d9e351..8da5ea9f51 100644 --- a/clients/tui/nmt-editor-page.h +++ b/clients/tui/nmt-editor-page.h @@ -24,8 +24,6 @@ #include "nmt-editor-grid.h" #include "nmt-editor-section.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR_PAGE (nmt_editor_page_get_type ()) #define NMT_EDITOR_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_PAGE, NmtEditorPage)) #define NMT_EDITOR_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_PAGE, NmtEditorPageClass)) @@ -53,6 +51,4 @@ GSList *nmt_editor_page_get_sections (NmtEditorPage *page); void nmt_editor_page_add_section (NmtEditorPage *page, NmtEditorSection *section); -G_END_DECLS - #endif /* NMT_EDITOR_PAGE_H */ diff --git a/clients/tui/nmt-editor-section.h b/clients/tui/nmt-editor-section.h index 67410c7174..3c2537be04 100644 --- a/clients/tui/nmt-editor-section.h +++ b/clients/tui/nmt-editor-section.h @@ -22,8 +22,6 @@ #include "nmt-newt-section.h" #include "nmt-editor-grid.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR_SECTION (nmt_editor_section_get_type ()) #define NMT_EDITOR_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_SECTION, NmtEditorSection)) #define NMT_EDITOR_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_SECTION, NmtEditorSectionClass)) @@ -51,6 +49,4 @@ const char *nmt_editor_section_get_title (NmtEditorSection *sectio NmtNewtWidget *nmt_editor_section_get_header_widget (NmtEditorSection *section); NmtEditorGrid *nmt_editor_section_get_body (NmtEditorSection *section); -G_END_DECLS - #endif /* NMT_EDITOR_SECTION_H */ diff --git a/clients/tui/nmt-editor.h b/clients/tui/nmt-editor.h index db10b82a18..b000f64e4e 100644 --- a/clients/tui/nmt-editor.h +++ b/clients/tui/nmt-editor.h @@ -23,8 +23,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR (nmt_editor_get_type ()) #define NMT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR, NmtEditor)) #define NMT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR, NmtEditorClass)) @@ -46,6 +44,4 @@ GType nmt_editor_get_type (void); NmtNewtForm *nmt_editor_new (NMConnection *connection); -G_END_DECLS - #endif /* NMT_EDITOR_H */ diff --git a/clients/tui/nmt-ip-entry.h b/clients/tui/nmt-ip-entry.h index ceb355efcf..2338a87359 100644 --- a/clients/tui/nmt-ip-entry.h +++ b/clients/tui/nmt-ip-entry.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_IP_ENTRY (nmt_ip_entry_get_type ()) #define NMT_IP_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_IP_ENTRY, NmtIPEntry)) #define NMT_IP_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_IP_ENTRY, NmtIPEntryClass)) @@ -47,6 +45,4 @@ NmtNewtWidget *nmt_ip_entry_new (int width, gboolean prefix, gboolean optional); -G_END_DECLS - #endif /* NMT_IP_ENTRY_H */ diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h index b318911767..68d9a208c2 100644 --- a/clients/tui/nmt-mac-entry.h +++ b/clients/tui/nmt-mac-entry.h @@ -19,12 +19,9 @@ #ifndef NMT_MAC_ENTRY_H #define NMT_MAC_ENTRY_H -#include "nm-default.h" #include "nm-utils.h" #include "nmt-newt.h" -G_BEGIN_DECLS - typedef enum { /*< skip >*/ NMT_MAC_ENTRY_TYPE_MAC, NMT_MAC_ENTRY_TYPE_CLONED, @@ -53,6 +50,4 @@ NmtNewtWidget *nmt_mac_entry_new (int width, int mac_length, NmtMacEntryType type); -G_END_DECLS - #endif /* NMT_MAC_ENTRY_H */ diff --git a/clients/tui/nmt-mtu-entry.h b/clients/tui/nmt-mtu-entry.h index dfe416d0e7..b7b2cf46c0 100644 --- a/clients/tui/nmt-mtu-entry.h +++ b/clients/tui/nmt-mtu-entry.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_MTU_ENTRY (nmt_mtu_entry_get_type ()) #define NMT_MTU_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_MTU_ENTRY, NmtMtuEntry)) #define NMT_MTU_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_MTU_ENTRY, NmtMtuEntryClass)) @@ -44,6 +42,4 @@ GType nmt_mtu_entry_get_type (void); NmtNewtWidget *nmt_mtu_entry_new (void); -G_END_DECLS - #endif /* NMT_MTU_ENTRY_H */ diff --git a/clients/tui/nmt-page-bond.h b/clients/tui/nmt-page-bond.h index b77477db28..d9b071efc4 100644 --- a/clients/tui/nmt-page-bond.h +++ b/clients/tui/nmt-page-bond.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_BOND (nmt_page_bond_get_type ()) #define NMT_PAGE_BOND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_BOND, NmtPageBond)) #define NMT_PAGE_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_BOND, NmtPageBondClass)) @@ -45,6 +43,4 @@ GType nmt_page_bond_get_type (void); NmtEditorPage *nmt_page_bond_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_BOND_H */ diff --git a/clients/tui/nmt-page-bridge-port.h b/clients/tui/nmt-page-bridge-port.h index c566dbc095..95689fff72 100644 --- a/clients/tui/nmt-page-bridge-port.h +++ b/clients/tui/nmt-page-bridge-port.h @@ -21,8 +21,6 @@ #include "nmt-editor-page.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_BRIDGE_PORT (nmt_page_bridge_port_get_type ()) #define NMT_PAGE_BRIDGE_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_BRIDGE_PORT, NmtPageBridgePort)) #define NMT_PAGE_BRIDGE_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_BRIDGE_PORT, NmtPageBridgePortClass)) @@ -44,6 +42,4 @@ GType nmt_page_bridge_port_get_type (void); NmtEditorPage *nmt_page_bridge_port_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_BRIDGE_PORT_H */ diff --git a/clients/tui/nmt-page-bridge.h b/clients/tui/nmt-page-bridge.h index 60cbdea23f..21d850afb8 100644 --- a/clients/tui/nmt-page-bridge.h +++ b/clients/tui/nmt-page-bridge.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_BRIDGE (nmt_page_bridge_get_type ()) #define NMT_PAGE_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_BRIDGE, NmtPageBridge)) #define NMT_PAGE_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_BRIDGE, NmtPageBridgeClass)) @@ -45,6 +43,4 @@ GType nmt_page_bridge_get_type (void); NmtEditorPage *nmt_page_bridge_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_BRIDGE_H */ diff --git a/clients/tui/nmt-page-dsl.h b/clients/tui/nmt-page-dsl.h index dc84ca072c..aa436e716b 100644 --- a/clients/tui/nmt-page-dsl.h +++ b/clients/tui/nmt-page-dsl.h @@ -19,11 +19,8 @@ #ifndef NMT_PAGE_DSL_H #define NMT_PAGE_DSL_H -#include "nm-default.h" #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_DSL (nmt_page_dsl_get_type ()) #define NMT_PAGE_DSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_DSL, NmtPageDsl)) #define NMT_PAGE_DSL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_DSL, NmtPageDslClass)) @@ -46,6 +43,4 @@ GType nmt_page_dsl_get_type (void); NmtEditorPage *nmt_page_dsl_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_DSL_H */ diff --git a/clients/tui/nmt-page-ethernet.h b/clients/tui/nmt-page-ethernet.h index bdf3d67731..56d917e1ef 100644 --- a/clients/tui/nmt-page-ethernet.h +++ b/clients/tui/nmt-page-ethernet.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_ETHERNET (nmt_page_ethernet_get_type ()) #define NMT_PAGE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_ETHERNET, NmtPageEthernet)) #define NMT_PAGE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_ETHERNET, NmtPageEthernetClass)) @@ -45,6 +43,4 @@ GType nmt_page_ethernet_get_type (void); NmtEditorPage *nmt_page_ethernet_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_ETHERNET_H */ diff --git a/clients/tui/nmt-page-infiniband.h b/clients/tui/nmt-page-infiniband.h index f51e0874ec..e2e0fbbcb4 100644 --- a/clients/tui/nmt-page-infiniband.h +++ b/clients/tui/nmt-page-infiniband.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_INFINIBAND (nmt_page_infiniband_get_type ()) #define NMT_PAGE_INFINIBAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_INFINIBAND, NmtPageInfiniband)) #define NMT_PAGE_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_INFINIBAND, NmtPageInfinibandClass)) @@ -45,6 +43,4 @@ GType nmt_page_infiniband_get_type (void); NmtEditorPage *nmt_page_infiniband_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_INFINIBAND_H */ diff --git a/clients/tui/nmt-page-ip4.h b/clients/tui/nmt-page-ip4.h index e3c5a00345..f120e57d70 100644 --- a/clients/tui/nmt-page-ip4.h +++ b/clients/tui/nmt-page-ip4.h @@ -21,8 +21,6 @@ #include "nmt-editor-page.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_IP4 (nmt_page_ip4_get_type ()) #define NMT_PAGE_IP4(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_IP4, NmtPageIP4)) #define NMT_PAGE_IP4_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_IP4, NmtPageIP4Class)) @@ -44,6 +42,4 @@ GType nmt_page_ip4_get_type (void); NmtEditorPage *nmt_page_ip4_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_IP4_H */ diff --git a/clients/tui/nmt-page-ip6.h b/clients/tui/nmt-page-ip6.h index 498261e16c..3a471447ca 100644 --- a/clients/tui/nmt-page-ip6.h +++ b/clients/tui/nmt-page-ip6.h @@ -21,8 +21,6 @@ #include "nmt-editor-page.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_IP6 (nmt_page_ip6_get_type ()) #define NMT_PAGE_IP6(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_IP6, NmtPageIP6)) #define NMT_PAGE_IP6_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_IP6, NmtPageIP6Class)) @@ -44,6 +42,4 @@ GType nmt_page_ip6_get_type (void); NmtEditorPage *nmt_page_ip6_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_IP6_H */ diff --git a/clients/tui/nmt-page-ppp.h b/clients/tui/nmt-page-ppp.h index 79103232f0..634323d468 100644 --- a/clients/tui/nmt-page-ppp.h +++ b/clients/tui/nmt-page-ppp.h @@ -21,8 +21,6 @@ #include "nmt-editor-page.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_PPP (nmt_page_ppp_get_type ()) #define NMT_PAGE_PPP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_PPP, NmtPagePpp)) #define NMT_PAGE_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_PPP, NmtPagePppClass)) @@ -44,6 +42,4 @@ GType nmt_page_ppp_get_type (void); NmtEditorPage *nmt_page_ppp_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_PPP_H */ diff --git a/clients/tui/nmt-page-team-port.h b/clients/tui/nmt-page-team-port.h index 2d8fa12183..75c4284962 100644 --- a/clients/tui/nmt-page-team-port.h +++ b/clients/tui/nmt-page-team-port.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_TEAM_PORT (nmt_page_team_port_get_type ()) #define NMT_PAGE_TEAM_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_TEAM_PORT, NmtPageTeamPort)) #define NMT_PAGE_TEAM_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_TEAM_PORT, NmtPageTeamPortClass)) @@ -44,6 +42,4 @@ GType nmt_page_team_port_get_type (void); NmtEditorPage *nmt_page_team_port_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_TEAM_PORT_H */ diff --git a/clients/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h index 994b63d327..a04c2a95ff 100644 --- a/clients/tui/nmt-page-team.h +++ b/clients/tui/nmt-page-team.h @@ -19,11 +19,8 @@ #ifndef NMT_PAGE_TEAM_H #define NMT_PAGE_TEAM_H -#include "nm-default.h" #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_TEAM (nmt_page_team_get_type ()) #define NMT_PAGE_TEAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_TEAM, NmtPageTeam)) #define NMT_PAGE_TEAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_TEAM, NmtPageTeamClass)) @@ -46,6 +43,4 @@ GType nmt_page_team_get_type (void); NmtEditorPage *nmt_page_team_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_TEAM_H */ diff --git a/clients/tui/nmt-page-vlan.h b/clients/tui/nmt-page-vlan.h index db7c40981b..043c3bc03b 100644 --- a/clients/tui/nmt-page-vlan.h +++ b/clients/tui/nmt-page-vlan.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_VLAN (nmt_page_vlan_get_type ()) #define NMT_PAGE_VLAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_VLAN, NmtPageVlan)) #define NMT_PAGE_VLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_VLAN, NmtPageVlanClass)) @@ -45,6 +43,4 @@ GType nmt_page_vlan_get_type (void); NmtEditorPage *nmt_page_vlan_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_VLAN_H */ diff --git a/clients/tui/nmt-page-wifi.h b/clients/tui/nmt-page-wifi.h index 7ce5058462..ed16bdc5c5 100644 --- a/clients/tui/nmt-page-wifi.h +++ b/clients/tui/nmt-page-wifi.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_WIFI (nmt_page_wifi_get_type ()) #define NMT_PAGE_WIFI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_WIFI, NmtPageWifi)) #define NMT_PAGE_WIFI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_WIFI, NmtPageWifiClass)) @@ -45,6 +43,4 @@ GType nmt_page_wifi_get_type (void); NmtEditorPage *nmt_page_wifi_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_WIFI_H */ diff --git a/clients/tui/nmt-password-dialog.h b/clients/tui/nmt-password-dialog.h index 36c9f51e19..efdab7ec59 100644 --- a/clients/tui/nmt-password-dialog.h +++ b/clients/tui/nmt-password-dialog.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_PASSWORD_DIALOG (nmt_password_dialog_get_type ()) #define NMT_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PASSWORD_DIALOG, NmtPasswordDialog)) #define NMT_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PASSWORD_DIALOG, NmtPasswordDialogClass)) @@ -52,6 +50,4 @@ gboolean nmt_password_dialog_succeeded (NmtPasswordDialog *dialog); const char *nmt_password_dialog_get_request_id (NmtPasswordDialog *dialog); GPtrArray *nmt_password_dialog_get_secrets (NmtPasswordDialog *dialog); -G_END_DECLS - #endif /* NMT_PASSWORD_DIALOG_H */ diff --git a/clients/tui/nmt-password-fields.h b/clients/tui/nmt-password-fields.h index 2ef830aa24..6a6017ba71 100644 --- a/clients/tui/nmt-password-fields.h +++ b/clients/tui/nmt-password-fields.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_PASSWORD_FIELDS (nmt_password_fields_get_type ()) #define NMT_PASSWORD_FIELDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PASSWORD_FIELDS, NmtPasswordFields)) #define NMT_PASSWORD_FIELDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PASSWORD_FIELDS, NmtPasswordFieldsClass)) @@ -50,6 +48,4 @@ typedef enum { NmtNewtWidget *nmt_password_fields_new (int width, NmtPasswordFieldsExtras extras); -G_END_DECLS - #endif /* NMT_PASSWORD_FIELDS_H */ diff --git a/clients/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h index 9882c71389..febcb402f2 100644 --- a/clients/tui/nmt-route-editor.h +++ b/clients/tui/nmt-route-editor.h @@ -23,8 +23,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_ROUTE_EDITOR (nmt_route_editor_get_type ()) #define NMT_ROUTE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_ROUTE_EDITOR, NmtRouteEditor)) #define NMT_ROUTE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_ROUTE_EDITOR, NmtRouteEditorClass)) @@ -46,6 +44,4 @@ GType nmt_route_editor_get_type (void); NmtNewtForm *nmt_route_editor_new (NMSetting *setting); -G_END_DECLS - #endif /* NMT_ROUTE_EDITOR_H */ diff --git a/clients/tui/nmt-route-entry.h b/clients/tui/nmt-route-entry.h index d37b14cd5b..fa76fa7b77 100644 --- a/clients/tui/nmt-route-entry.h +++ b/clients/tui/nmt-route-entry.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_ROUTE_ENTRY (nmt_route_entry_get_type ()) #define NMT_ROUTE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_ROUTE_ENTRY, NmtRouteEntry)) #define NMT_ROUTE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_ROUTE_ENTRY, NmtRouteEntryClass)) @@ -46,6 +44,4 @@ NmtNewtWidget *nmt_route_entry_new (int family, int ip_entry_width, int metric_entry_width); -G_END_DECLS - #endif /* NMT_ROUTE_ENTRY_H */ diff --git a/clients/tui/nmt-route-table.h b/clients/tui/nmt-route-table.h index 217bf40da0..1aa92e6bd7 100644 --- a/clients/tui/nmt-route-table.h +++ b/clients/tui/nmt-route-table.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_ROUTE_TABLE (nmt_route_table_get_type ()) #define NMT_ROUTE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_ROUTE_TABLE, NmtRouteTable)) #define NMT_ROUTE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_ROUTE_TABLE, NmtRouteTableClass)) @@ -44,6 +42,4 @@ GType nmt_route_table_get_type (void); NmtNewtWidget *nmt_route_table_new (int family); -G_END_DECLS - #endif /* NMT_ROUTE_TABLE_H */ diff --git a/clients/tui/nmt-slave-list.h b/clients/tui/nmt-slave-list.h index d10cd3a73a..e0d836c733 100644 --- a/clients/tui/nmt-slave-list.h +++ b/clients/tui/nmt-slave-list.h @@ -22,8 +22,6 @@ #include "nmt-edit-connection-list.h" #include "nmtui-edit.h" -G_BEGIN_DECLS - #define NMT_TYPE_SLAVE_LIST (nmt_slave_list_get_type ()) #define NMT_SLAVE_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_SLAVE_LIST, NmtSlaveList)) #define NMT_SLAVE_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_SLAVE_LIST, NmtSlaveListClass)) @@ -47,6 +45,4 @@ NmtNewtWidget *nmt_slave_list_new (NMConnection *master, NmtAddConnectionTypeFilter type_filter, gpointer type_filter_data); -G_END_DECLS - #endif /* NMT_SLAVE_LIST_H */ diff --git a/clients/tui/nmt-utils.h b/clients/tui/nmt-utils.h index 5531dbeb62..067c6512eb 100644 --- a/clients/tui/nmt-utils.h +++ b/clients/tui/nmt-utils.h @@ -19,10 +19,6 @@ #ifndef NMT_UTILS_H #define NMT_UTILS_H -#include "nm-default.h" - -G_BEGIN_DECLS - typedef struct { gpointer private[3]; } NmtSyncOp; @@ -41,6 +37,4 @@ void nmt_sync_op_complete_pointer (NmtSyncOp *op, gpointer result, GError *error); -G_END_DECLS - #endif /* NMT_UTILS_H */ diff --git a/clients/tui/nmt-widget-list.h b/clients/tui/nmt-widget-list.h index 7dbeb21588..b7bf0151e6 100644 --- a/clients/tui/nmt-widget-list.h +++ b/clients/tui/nmt-widget-list.h @@ -21,8 +21,6 @@ #include "nmt-newt-grid.h" -G_BEGIN_DECLS - #define NMT_TYPE_WIDGET_LIST (nmt_widget_list_get_type ()) #define NMT_WIDGET_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_WIDGET_LIST, NmtWidgetList)) #define NMT_WIDGET_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_WIDGET_LIST, NmtWidgetListClass)) @@ -64,6 +62,4 @@ int nmt_widget_list_get_length (NmtWidgetList *list); void nmt_widget_list_set_length (NmtWidgetList *list, int length); -G_END_DECLS - #endif /* NMT_WIDGET_LIST_H */ diff --git a/clients/tui/nmtui-connect.h b/clients/tui/nmtui-connect.h index 89cb3916da..569d191a57 100644 --- a/clients/tui/nmtui-connect.h +++ b/clients/tui/nmtui-connect.h @@ -19,10 +19,6 @@ #ifndef NMTUI_CONNECT_H #define NMTUI_CONNECT_H -G_BEGIN_DECLS - NmtNewtForm *nmtui_connect (gboolean is_top, int argc, char **argv); -G_END_DECLS - #endif /* NMTUI_CONNECT_H */ diff --git a/clients/tui/nmtui-edit.h b/clients/tui/nmtui-edit.h index 459011e10b..041e78598e 100644 --- a/clients/tui/nmtui-edit.h +++ b/clients/tui/nmtui-edit.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - typedef gboolean (*NmtAddConnectionTypeFilter) (GType connection_type, gpointer user_data); @@ -39,6 +37,4 @@ void nmt_edit_connection (NMConnection *connection); void nmt_remove_connection (NMRemoteConnection *connection); -G_END_DECLS - #endif /* NMTUI_EDIT_H */ diff --git a/clients/tui/nmtui-hostname.h b/clients/tui/nmtui-hostname.h index 1af711f9bb..772d9a725b 100644 --- a/clients/tui/nmtui-hostname.h +++ b/clients/tui/nmtui-hostname.h @@ -19,10 +19,6 @@ #ifndef NMTUI_HOSTNAME_H #define NMTUI_HOSTNAME_H -G_BEGIN_DECLS - NmtNewtForm *nmtui_hostname (gboolean is_top, int argc, char **argv); -G_END_DECLS - #endif /* NMTUI_HOSTNAME_H */ diff --git a/clients/tui/nmtui.h b/clients/tui/nmtui.h index aada9719f7..53c20cb47e 100644 --- a/clients/tui/nmtui.h +++ b/clients/tui/nmtui.h @@ -21,12 +21,8 @@ #include <NetworkManager.h> -G_BEGIN_DECLS - extern NMClient *nm_client; void nmtui_quit (void); -G_END_DECLS - #endif /* NMTUI_H */ diff --git a/libnm-core/crypto.h b/libnm-core/crypto.h index c77ada5a7f..8c4cfefe22 100644 --- a/libnm-core/crypto.h +++ b/libnm-core/crypto.h @@ -24,8 +24,6 @@ #ifndef __CRYPTO_H__ #define __CRYPTO_H__ -#include "nm-default.h" - #define MD5_HASH_LEN 20 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC" #define CIPHER_DES_CBC "DES-CBC" diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index e3c5bcc3dd..94e473d3c6 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -34,7 +34,6 @@ **/ -#include "nm-default.h" #include "nm-connection.h" #include "nm-core-enum-types.h" #include "nm-setting-8021x.h" diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h index 7873aa7cdb..41bec0cf8a 100644 --- a/libnm-core/nm-keyfile-internal.h +++ b/libnm-core/nm-keyfile-internal.h @@ -24,7 +24,6 @@ #include <sys/types.h> -#include "nm-default.h" #include "nm-connection.h" #include "nm-setting-8021x.h" diff --git a/libnm-core/nm-property-compare.h b/libnm-core/nm-property-compare.h index 3f10581807..b859989f80 100644 --- a/libnm-core/nm-property-compare.h +++ b/libnm-core/nm-property-compare.h @@ -23,8 +23,6 @@ #ifndef __NM_PROPERTY_COMPARE_H__ #define __NM_PROPERTY_COMPARE_H__ -#include "nm-default.h" - int nm_property_compare (GVariant *value1, GVariant *value2); #endif /* __NM_PROPERTY_COMPARE_H__ */ diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h index 6560c4a296..8d09e3d759 100644 --- a/libnm-core/nm-setting-private.h +++ b/libnm-core/nm-setting-private.h @@ -21,7 +21,6 @@ #ifndef __NM_SETTING_PRIVATE_H__ #define __NM_SETTING_PRIVATE_H__ -#include "nm-default.h" #include "nm-setting.h" #include "nm-connection.h" #include "nm-core-enum-types.h" diff --git a/libnm-glib/nm-dbus-helpers-private.h b/libnm-glib/nm-dbus-helpers-private.h index c78bf1dae5..1d98e77d9d 100644 --- a/libnm-glib/nm-dbus-helpers-private.h +++ b/libnm-glib/nm-dbus-helpers-private.h @@ -24,8 +24,6 @@ #include <dbus/dbus.h> #include <dbus/dbus-glib-lowlevel.h> -#include "nm-default.h" - DBusGConnection *_nm_dbus_new_connection (GError **error); DBusGProxy * _nm_dbus_new_proxy_for_connection (DBusGConnection *connection, diff --git a/libnm-glib/nm-object-cache.h b/libnm-glib/nm-object-cache.h index 30b62f08ce..03229d566b 100644 --- a/libnm-glib/nm-object-cache.h +++ b/libnm-glib/nm-object-cache.h @@ -21,7 +21,6 @@ #ifndef NM_OBJECT_CACHE_H #define NM_OBJECT_CACHE_H -#include "nm-default.h" #include "nm-object.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-object-private.h b/libnm-glib/nm-object-private.h index 8878354f55..2d3d8f9cb0 100644 --- a/libnm-glib/nm-object-private.h +++ b/libnm-glib/nm-object-private.h @@ -21,7 +21,6 @@ #ifndef NM_OBJECT_PRIVATE_H #define NM_OBJECT_PRIVATE_H -#include "nm-default.h" #include "nm-object.h" void _nm_object_ensure_inited (NMObject *object); diff --git a/libnm-util/crypto.h b/libnm-util/crypto.h index 74d1adbf6a..29e1c3dc37 100644 --- a/libnm-util/crypto.h +++ b/libnm-util/crypto.h @@ -24,8 +24,6 @@ #ifndef __CRYPTO_H__ #define __CRYPTO_H__ -#include "nm-default.h" - #define MD5_HASH_LEN 20 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC" #define CIPHER_DES_CBC "DES-CBC" diff --git a/libnm-util/nm-param-spec-specialized.h b/libnm-util/nm-param-spec-specialized.h index 0f1228f69b..0c4b07e616 100644 --- a/libnm-util/nm-param-spec-specialized.h +++ b/libnm-util/nm-param-spec-specialized.h @@ -23,8 +23,6 @@ #ifndef NM_PARAM_SPEC_SPECIALIZED_H #define NM_PARAM_SPEC_SPECIALIZED_H -#include "nm-default.h" - typedef struct _NMParamSpecSpecialized NMParamSpecSpecialized; #define NM_TYPE_PARAM_SPEC_SPECIALIZED (_nm_param_spec_specialized_get_type ()) diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h index beb87484f0..ba15a238da 100644 --- a/libnm-util/nm-setting-private.h +++ b/libnm-util/nm-setting-private.h @@ -21,8 +21,6 @@ #ifndef NM_SETTING_PRIVATE_H #define NM_SETTING_PRIVATE_H -#include "nm-default.h" - #include "nm-connection.h" #define NM_SETTING_SECRET_FLAGS_ALL \ diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h index 497739f0ac..4ec8988a17 100644 --- a/libnm/nm-dbus-helpers.h +++ b/libnm/nm-dbus-helpers.h @@ -21,8 +21,6 @@ #ifndef __NM_DBUS_HELPERS_PRIVATE_H__ #define __NM_DBUS_HELPERS_PRIVATE_H__ - -#include "nm-default.h" #include "nm-dbus-compat.h" GBusType _nm_dbus_bus_type (void); diff --git a/libnm/nm-object-cache.h b/libnm/nm-object-cache.h index c0f70f21cc..b29692faa1 100644 --- a/libnm/nm-object-cache.h +++ b/libnm/nm-object-cache.h @@ -21,7 +21,6 @@ #ifndef __NM_OBJECT_CACHE_H__ #define __NM_OBJECT_CACHE_H__ -#include "nm-default.h" #include "nm-object.h" G_BEGIN_DECLS diff --git a/libnm/nm-object-private.h b/libnm/nm-object-private.h index 7e8066f4ee..ad78f92ba0 100644 --- a/libnm/nm-object-private.h +++ b/libnm/nm-object-private.h @@ -21,7 +21,6 @@ #ifndef __NM_OBJECT_PRIVATE_H__ #define __NM_OBJECT_PRIVATE_H__ -#include "nm-default.h" #include "nm-object.h" typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GVariant *, gpointer); diff --git a/src/devices/adsl/nm-atm-manager.h b/src/devices/adsl/nm-atm-manager.h index fe0bc14c4e..bcbc6c77bc 100644 --- a/src/devices/adsl/nm-atm-manager.h +++ b/src/devices/adsl/nm-atm-manager.h @@ -22,10 +22,6 @@ #ifndef __NETWORKMANAGER_ATM_MANAGER_H__ #define __NETWORKMANAGER_ATM_MANAGER_H__ -#include "nm-default.h" - -G_BEGIN_DECLS - #define NM_TYPE_ATM_MANAGER (nm_atm_manager_get_type ()) #define NM_ATM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ATM_MANAGER, NMAtmManager)) diff --git a/src/devices/adsl/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h index efcdaf6980..cfde2b3529 100644 --- a/src/devices/adsl/nm-device-adsl.h +++ b/src/devices/adsl/nm-device-adsl.h @@ -23,11 +23,8 @@ #define __NETWORKMANAGER_DEVICE_ADSL_H__ // Parent class -#include "nm-default.h" #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_ADSL (nm_device_adsl_get_type ()) #define NM_DEVICE_ADSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ADSL, NMDeviceAdsl)) #define NM_DEVICE_ADSL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ADSL, NMDeviceAdslClass)) @@ -52,6 +49,4 @@ NMDevice *nm_device_adsl_new (const char *udi, const char *driver, int atm_index); -G_END_DECLS - -#endif /* NM_DEVICE_ADSL_H */ +#endif /* NM_DEVICE_ADSL_H */ diff --git a/src/devices/bluetooth/nm-bluez4-manager.h b/src/devices/bluetooth/nm-bluez4-manager.h index dbf7688940..8afe6924c7 100644 --- a/src/devices/bluetooth/nm-bluez4-manager.h +++ b/src/devices/bluetooth/nm-bluez4-manager.h @@ -21,10 +21,6 @@ #ifndef __NETWORKMANAGER_BLUEZ4_MANAGER_H__ #define __NETWORKMANAGER_BLUEZ4_MANAGER_H__ -#include "nm-default.h" - -G_BEGIN_DECLS - #define NM_TYPE_BLUEZ4_MANAGER (nm_bluez4_manager_get_type ()) #define NM_BLUEZ4_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ4_MANAGER, NMBluez4Manager)) #define NM_BLUEZ4_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ4_MANAGER, NMBluez4ManagerClass)) diff --git a/src/devices/bluetooth/nm-bluez5-dun.h b/src/devices/bluetooth/nm-bluez5-dun.h index c59cbb80f8..124c1a05b0 100644 --- a/src/devices/bluetooth/nm-bluez5-dun.h +++ b/src/devices/bluetooth/nm-bluez5-dun.h @@ -21,8 +21,6 @@ #ifndef _NM_BLUEZ5_UTILS_H_ #define _NM_BLUEZ5_UTILS_H_ -#include "nm-default.h" - typedef struct _NMBluez5DunContext NMBluez5DunContext; typedef void (*NMBluez5DunFunc) (NMBluez5DunContext *context, diff --git a/src/devices/bluetooth/nm-device-bt.h b/src/devices/bluetooth/nm-device-bt.h index c565745ff3..c97cca0137 100644 --- a/src/devices/bluetooth/nm-device-bt.h +++ b/src/devices/bluetooth/nm-device-bt.h @@ -25,8 +25,6 @@ #include "nm-bluez-device.h" #include "nm-modem.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_BT (nm_device_bt_get_type ()) #define NM_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BT, NMDeviceBt)) #define NM_DEVICE_BT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_BT, NMDeviceBtClass)) @@ -63,6 +61,4 @@ gboolean nm_device_bt_modem_added (NMDeviceBt *device, NMModem *modem, const char *driver); -G_END_DECLS - #endif /* __NETWORKMANAGER_DEVICE_BT_H__ */ diff --git a/src/devices/nm-arping-manager.h b/src/devices/nm-arping-manager.h index 4a4f8d4b01..78965a0df2 100644 --- a/src/devices/nm-arping-manager.h +++ b/src/devices/nm-arping-manager.h @@ -19,8 +19,6 @@ #include <netinet/in.h> -G_BEGIN_DECLS - #define NM_TYPE_ARPING_MANAGER (nm_arping_manager_get_type ()) #define NM_ARPING_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ARPING_MANAGER, NMArpingManager)) #define NM_ARPING_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_ARPING_MANAGER, NMArpingManagerClass)) @@ -48,6 +46,4 @@ gboolean nm_arping_manager_check_address (NMArpingManager *self, in_addr_t addre void nm_arping_manager_announce_addresses (NMArpingManager *self); void nm_arping_manager_reset (NMArpingManager *self); -G_END_DECLS - #endif /* __NM_ARPING_MANAGER__ */ diff --git a/src/devices/nm-device-bond.h b/src/devices/nm-device-bond.h index 9e86719e3c..02b6c8e540 100644 --- a/src/devices/nm-device-bond.h +++ b/src/devices/nm-device-bond.h @@ -23,8 +23,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_BOND (nm_device_bond_get_type ()) #define NM_DEVICE_BOND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BOND, NMDeviceBond)) #define NM_DEVICE_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_BOND, NMDeviceBondClass)) @@ -37,6 +35,4 @@ typedef NMDeviceClass NMDeviceBondClass; GType nm_device_bond_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_BOND_H */ +#endif /* NM_DEVICE_BOND_H */ diff --git a/src/devices/nm-device-bridge.h b/src/devices/nm-device-bridge.h index 4648267525..05da9ed751 100644 --- a/src/devices/nm-device-bridge.h +++ b/src/devices/nm-device-bridge.h @@ -21,11 +21,8 @@ #ifndef __NETWORKMANAGER_DEVICE_BRIDGE_H__ #define __NETWORKMANAGER_DEVICE_BRIDGE_H__ -#include "nm-default.h" #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_BRIDGE (nm_device_bridge_get_type ()) #define NM_DEVICE_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridge)) #define NM_DEVICE_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridgeClass)) @@ -38,6 +35,4 @@ typedef NMDeviceClass NMDeviceBridgeClass; GType nm_device_bridge_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_BRIDGE_H */ +#endif /* __NETWORKMANAGER_DEVICE_BRIDGE_H__ */ diff --git a/src/devices/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h index 8f7b7124be..3ce6f0ca4b 100644 --- a/src/devices/nm-device-ethernet.h +++ b/src/devices/nm-device-ethernet.h @@ -24,8 +24,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ()) #define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet)) #define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) @@ -49,6 +47,4 @@ typedef struct { GType nm_device_ethernet_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_ETHERNET_H */ +#endif /* __NETWORKMANAGER_DEVICE_ETHERNET_H__ */ diff --git a/src/devices/nm-device-generic.h b/src/devices/nm-device-generic.h index 9303a27891..9a5ff09122 100644 --- a/src/devices/nm-device-generic.h +++ b/src/devices/nm-device-generic.h @@ -23,8 +23,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_GENERIC (nm_device_generic_get_type ()) #define NM_DEVICE_GENERIC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_GENERIC, NMDeviceGeneric)) #define NM_DEVICE_GENERIC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_GENERIC, NMDeviceGenericClass)) @@ -47,6 +45,4 @@ GType nm_device_generic_get_type (void); NMDevice *nm_device_generic_new (const NMPlatformLink *plink); -G_END_DECLS - -#endif /* NM_DEVICE_GENERIC_H */ +#endif /* __NETWORKMANAGER_DEVICE_GENERIC_H__ */ diff --git a/src/devices/nm-device-infiniband.h b/src/devices/nm-device-infiniband.h index cac9a79d37..a74d07a51f 100644 --- a/src/devices/nm-device-infiniband.h +++ b/src/devices/nm-device-infiniband.h @@ -23,8 +23,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_INFINIBAND (nm_device_infiniband_get_type ()) #define NM_DEVICE_INFINIBAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_INFINIBAND, NMDeviceInfiniband)) #define NM_DEVICE_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_INFINIBAND, NMDeviceInfinibandClass)) @@ -37,6 +35,4 @@ typedef NMDeviceClass NMDeviceInfinibandClass; GType nm_device_infiniband_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_INFINIBAND_H */ +#endif /* __NETWORKMANAGER_DEVICE_INFINIBAND_H__ */ diff --git a/src/devices/nm-device-ip-tunnel.h b/src/devices/nm-device-ip-tunnel.h index 11cb5bce3b..94cc737526 100644 --- a/src/devices/nm-device-ip-tunnel.h +++ b/src/devices/nm-device-ip-tunnel.h @@ -24,8 +24,6 @@ #include "nm-core-types.h" #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_IP_TUNNEL (nm_device_ip_tunnel_get_type ()) #define NM_DEVICE_IP_TUNNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_IP_TUNNEL, NMDeviceIPTunnel)) #define NM_DEVICE_IP_TUNNEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_IP_TUNNEL, NMDeviceIPTunnelClass)) @@ -55,6 +53,4 @@ typedef struct { GType nm_device_ip_tunnel_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_IP_TUNNEL_H */ +#endif /* __NETWORKMANAGER_DEVICE_IP_TUNNEL_H__ */ diff --git a/src/devices/nm-device-logging.h b/src/devices/nm-device-logging.h index 1be17073b6..fac92eaca8 100644 --- a/src/devices/nm-device-logging.h +++ b/src/devices/nm-device-logging.h @@ -21,7 +21,6 @@ #ifndef __NETWORKMANAGER_DEVICE_LOGGING_H__ #define __NETWORKMANAGER_DEVICE_LOGGING_H__ -#include "nm-default.h" #include "nm-device.h" #define _LOG_DECLARE_SELF(t) \ diff --git a/src/devices/nm-device-macvlan.h b/src/devices/nm-device-macvlan.h index 89f670bd82..5756f696fd 100644 --- a/src/devices/nm-device-macvlan.h +++ b/src/devices/nm-device-macvlan.h @@ -23,8 +23,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_MACVLAN (nm_device_macvlan_get_type ()) #define NM_DEVICE_MACVLAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlan)) #define NM_DEVICE_MACVLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlanClass)) @@ -42,6 +40,4 @@ typedef NMDeviceClass NMDeviceMacvlanClass; GType nm_device_macvlan_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_MACVLAN_H */ +#endif /* __NETWORKMANAGER_DEVICE_MACVLAN_H__ */ diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h index 7381fd930f..c85cb969ba 100644 --- a/src/devices/nm-device-private.h +++ b/src/devices/nm-device-private.h @@ -24,8 +24,6 @@ #include "nm-device.h" -#include "nm-default.h" - /* This file should only be used by subclasses of NMDevice */ enum NMActStageReturn { diff --git a/src/devices/nm-device-tun.h b/src/devices/nm-device-tun.h index 32dcfd47b5..d62b0c373e 100644 --- a/src/devices/nm-device-tun.h +++ b/src/devices/nm-device-tun.h @@ -23,8 +23,6 @@ #include "nm-device-generic.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_TUN (nm_device_tun_get_type ()) #define NM_DEVICE_TUN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_TUN, NMDeviceTun)) #define NM_DEVICE_TUN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_TUN, NMDeviceTunClass)) @@ -44,6 +42,4 @@ typedef NMDeviceClass NMDeviceTunClass; GType nm_device_tun_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_TUN_H */ +#endif /* __NETWORKMANAGER_DEVICE_TUN_H__ */ diff --git a/src/devices/nm-device-veth.h b/src/devices/nm-device-veth.h index 3ba5af6939..53ccf9253d 100644 --- a/src/devices/nm-device-veth.h +++ b/src/devices/nm-device-veth.h @@ -23,8 +23,6 @@ #include "nm-device-ethernet.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_VETH (nm_device_veth_get_type ()) #define NM_DEVICE_VETH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_VETH, NMDeviceVeth)) #define NM_DEVICE_VETH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_VETH, NMDeviceVethClass)) @@ -39,6 +37,4 @@ typedef struct _NMDeviceVethClass NMDeviceVethClass; GType nm_device_veth_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_VETH_H */ +#endif /* __NETWORKMANAGER_DEVICE_VETH_H__ */ diff --git a/src/devices/nm-device-vlan.h b/src/devices/nm-device-vlan.h index e31e171d04..71ca80307a 100644 --- a/src/devices/nm-device-vlan.h +++ b/src/devices/nm-device-vlan.h @@ -23,8 +23,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_VLAN (nm_device_vlan_get_type ()) #define NM_DEVICE_VLAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_VLAN, NMDeviceVlan)) #define NM_DEVICE_VLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_VLAN, NMDeviceVlanClass)) @@ -47,6 +45,4 @@ typedef NMDeviceClass NMDeviceVlanClass; GType nm_device_vlan_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_VLAN_H */ +#endif /* __NETWORKMANAGER_DEVICE_VLAN_H__ */ diff --git a/src/devices/nm-device-vxlan.h b/src/devices/nm-device-vxlan.h index 7de04a1242..71204d3beb 100644 --- a/src/devices/nm-device-vxlan.h +++ b/src/devices/nm-device-vxlan.h @@ -23,8 +23,6 @@ #include "nm-device-generic.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_VXLAN (nm_device_vxlan_get_type ()) #define NM_DEVICE_VXLAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_VXLAN, NMDeviceVxlan)) #define NM_DEVICE_VXLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_VXLAN, NMDeviceVxlanClass)) @@ -54,6 +52,4 @@ typedef NMDeviceClass NMDeviceVxlanClass; GType nm_device_vxlan_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_VXLAN_H */ +#endif /* __NETWORKMANAGER_DEVICE_VXLAN_H__ */ diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 433448565d..34d31cadbf 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -92,8 +92,6 @@ #define NM_DEVICE_STATISTICS_TX_BYTES "tx-bytes" #define NM_DEVICE_STATISTICS_RX_BYTES "rx-bytes" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE (nm_device_get_type ()) #define NM_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE, NMDevice)) #define NM_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE, NMDeviceClass)) @@ -595,6 +593,4 @@ void nm_device_update_initial_hw_address (NMDevice *self); void nm_device_update_permanent_hw_address (NMDevice *self); void nm_device_update_dynamic_ip_setup (NMDevice *self); -G_END_DECLS - -#endif /* NM_DEVICE_H */ +#endif /* __NETWORKMANAGER_DEVICE_H__ */ diff --git a/src/devices/nm-lldp-listener.h b/src/devices/nm-lldp-listener.h index df02fd6305..870ca8a5b5 100644 --- a/src/devices/nm-lldp-listener.h +++ b/src/devices/nm-lldp-listener.h @@ -21,8 +21,6 @@ #ifndef __NM_LLDP_LISTENER__ #define __NM_LLDP_LISTENER__ -G_BEGIN_DECLS - #define NM_TYPE_LLDP_LISTENER (nm_lldp_listener_get_type ()) #define NM_LLDP_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_LLDP_LISTENER, NMLldpListener)) #define NM_LLDP_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_LLDP_LISTENER, NMLldpListenerClass)) @@ -48,6 +46,4 @@ gboolean nm_lldp_listener_is_running (NMLldpListener *self); GVariant *nm_lldp_listener_get_neighbors (NMLldpListener *self); -G_END_DECLS - #endif /* __NM_LLDP_LISTENER__ */ diff --git a/src/devices/team/nm-device-team.h b/src/devices/team/nm-device-team.h index 27bd8227db..43e8aab408 100644 --- a/src/devices/team/nm-device-team.h +++ b/src/devices/team/nm-device-team.h @@ -23,8 +23,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_TEAM (nm_device_team_get_type ()) #define NM_DEVICE_TEAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_TEAM, NMDeviceTeam)) #define NM_DEVICE_TEAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_TEAM, NMDeviceTeamClass)) @@ -42,6 +40,4 @@ GType nm_device_team_get_type (void); NMDevice *nm_device_team_new (const char *iface); -G_END_DECLS - -#endif /* NM_DEVICE_TEAM_H */ +#endif /* __NETWORKMANAGER_DEVICE_TEAM_H__ */ diff --git a/src/devices/team/nm-team-factory.h b/src/devices/team/nm-team-factory.h index 9049478dc1..4155870c2a 100644 --- a/src/devices/team/nm-team-factory.h +++ b/src/devices/team/nm-team-factory.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_TEAM_FACTORY_H__ #define __NETWORKMANAGER_TEAM_FACTORY_H__ -#include "nm-default.h" - #define NM_TYPE_TEAM_FACTORY (nm_team_factory_get_type ()) #define NM_TEAM_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_TEAM_FACTORY, NMTeamFactory)) diff --git a/src/devices/wifi/nm-device-olpc-mesh.h b/src/devices/wifi/nm-device-olpc-mesh.h index 63895a88fd..135226d5af 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.h +++ b/src/devices/wifi/nm-device-olpc-mesh.h @@ -30,8 +30,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_OLPC_MESH (nm_device_olpc_mesh_get_type ()) #define NM_DEVICE_OLPC_MESH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_OLPC_MESH, NMDeviceOlpcMesh)) #define NM_DEVICE_OLPC_MESH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_OLPC_MESH, NMDeviceOlpcMeshClass)) @@ -67,6 +65,4 @@ GType nm_device_olpc_mesh_get_type (void); NMDevice *nm_device_olpc_mesh_new (const char *iface); -G_END_DECLS - -#endif /* NM_DEVICE_OLPC_MESH_H */ +#endif /* __NETWORKMANAGER_DEVICE_OLPC_MESH_H__ */ diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am index 1d3c7c851d..44d0f1e24a 100644 --- a/src/devices/wwan/Makefile.am +++ b/src/devices/wwan/Makefile.am @@ -27,7 +27,7 @@ pkglib_LTLIBRARIES = libnm-wwan.la libnm-device-plugin-wwan.la GLIB_GENERATED = nm-modem-enum-types.h nm-modem-enum-types.c GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM +GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' nm_modem_enum_types_sources = $(srcdir)/nm-modem.h BUILT_SOURCES += $(GLIB_GENERATED) diff --git a/src/devices/wwan/nm-modem-broadband.h b/src/devices/wwan/nm-modem-broadband.h index 371607782b..6607f7f553 100644 --- a/src/devices/wwan/nm-modem-broadband.h +++ b/src/devices/wwan/nm-modem-broadband.h @@ -23,8 +23,6 @@ #include "nm-modem.h" -G_BEGIN_DECLS - #define NM_TYPE_MODEM_BROADBAND (nm_modem_broadband_get_type ()) #define NM_MODEM_BROADBAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_BROADBAND, NMModemBroadband)) #define NM_MODEM_BROADBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_MODEM_BROADBAND, NMModemBroadbandClass)) @@ -49,6 +47,4 @@ GType nm_modem_broadband_get_type (void); NMModem *nm_modem_broadband_new (GObject *object, GError **error); -G_END_DECLS - #endif /* __NETWORKMANAGER_MODEM_BROADBAND_H__ */ diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h index 60e5589b55..8f797d4400 100644 --- a/src/devices/wwan/nm-modem.h +++ b/src/devices/wwan/nm-modem.h @@ -22,12 +22,9 @@ #ifndef __NETWORKMANAGER_MODEM_H__ #define __NETWORKMANAGER_MODEM_H__ -#include "nm-default.h" #include "ppp-manager/nm-ppp-manager.h" #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_MODEM (nm_modem_get_type ()) #define NM_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM, NMModem)) #define NM_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_MODEM, NMModemClass)) @@ -268,6 +265,4 @@ void nm_modem_emit_ip6_config_result (NMModem *self, const gchar *nm_modem_ip_type_to_string (NMModemIPType ip_type); -G_END_DECLS - #endif /* __NETWORKMANAGER_MODEM_H__ */ diff --git a/src/devices/wwan/nm-wwan-factory.h b/src/devices/wwan/nm-wwan-factory.h index 78031e60f6..61bdcb1e4b 100644 --- a/src/devices/wwan/nm-wwan-factory.h +++ b/src/devices/wwan/nm-wwan-factory.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_WWAN_FACTORY_H__ #define __NETWORKMANAGER_WWAN_FACTORY_H__ -#include "nm-default.h" - #define NM_TYPE_WWAN_FACTORY (nm_wwan_factory_get_type ()) #define NM_WWAN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WWAN_FACTORY, NMWwanFactory)) diff --git a/src/dhcp-manager/nm-dhcp-client-logging.h b/src/dhcp-manager/nm-dhcp-client-logging.h index 96b6358033..8dd18bf233 100644 --- a/src/dhcp-manager/nm-dhcp-client-logging.h +++ b/src/dhcp-manager/nm-dhcp-client-logging.h @@ -21,7 +21,6 @@ #ifndef __NETWORKMANAGER_DHCP_CLIENT_LOGGING_H__ #define __NETWORKMANAGER_DHCP_CLIENT_LOGGING_H__ -#include "nm-default.h" #include "nm-dhcp-client.h" #define _NMLOG_PREFIX_NAME "dhcp" diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp-manager/nm-dhcp-client.h index 1c78c5b124..5779d4eddf 100644 --- a/src/dhcp-manager/nm-dhcp-client.h +++ b/src/dhcp-manager/nm-dhcp-client.h @@ -24,8 +24,6 @@ #include <nm-ip4-config.h> #include <nm-ip6-config.h> -#include "nm-default.h" - #define NM_TYPE_DHCP_CLIENT (nm_dhcp_client_get_type ()) #define NM_DHCP_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClient)) #define NM_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_CLIENT, NMDhcpClientClass)) diff --git a/src/dhcp-manager/nm-dhcp-dhclient.h b/src/dhcp-manager/nm-dhcp-dhclient.h index 3e8d9c5d8e..7f0c855a75 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.h +++ b/src/dhcp-manager/nm-dhcp-dhclient.h @@ -19,7 +19,6 @@ #ifndef __NETWORKMANAGER_DHCP_DHCLIENT_H__ #define __NETWORKMANAGER_DHCP_DHCLIENT_H__ -#include "nm-default.h" #include "nm-dhcp-client.h" #define NM_TYPE_DHCP_DHCLIENT (nm_dhcp_dhclient_get_type ()) diff --git a/src/dhcp-manager/nm-dhcp-listener.h b/src/dhcp-manager/nm-dhcp-listener.h index b2631acc5e..ff31fe3476 100644 --- a/src/dhcp-manager/nm-dhcp-listener.h +++ b/src/dhcp-manager/nm-dhcp-listener.h @@ -19,8 +19,6 @@ #ifndef __NETWORKMANAGER_DHCP_LISTENER_H__ #define __NETWORKMANAGER_DHCP_LISTENER_H__ -#include "nm-default.h" - #define NM_TYPE_DHCP_LISTENER (nm_dhcp_listener_get_type ()) #define NM_DHCP_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_LISTENER, NMDhcpListener)) #define NM_IS_DHCP_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_LISTENER)) diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index 42d968ab25..df92c91c3b 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -22,8 +22,6 @@ #ifndef __NETWORKMANAGER_DHCP_MANAGER_H__ #define __NETWORKMANAGER_DHCP_MANAGER_H__ - -#include "nm-default.h" #include "nm-dhcp-client.h" #include "nm-ip4-config.h" #include "nm-dhcp4-config.h" diff --git a/src/dhcp-manager/nm-dhcp-utils.h b/src/dhcp-manager/nm-dhcp-utils.h index 056982c382..6540b1ff80 100644 --- a/src/dhcp-manager/nm-dhcp-utils.h +++ b/src/dhcp-manager/nm-dhcp-utils.h @@ -24,8 +24,6 @@ #include <nm-ip4-config.h> #include <nm-ip6-config.h> -#include "nm-default.h" - NMIP4Config *nm_dhcp_utils_ip4_config_from_options (int ifindex, const char *iface, GHashTable *options, diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h index 50f050e544..3deda58237 100644 --- a/src/dns-manager/nm-dns-manager.h +++ b/src/dns-manager/nm-dns-manager.h @@ -24,12 +24,9 @@ #ifndef __NETWORKMANAGER_DNS_MANAGER_H__ #define __NETWORKMANAGER_DNS_MANAGER_H__ -#include "nm-default.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" -G_BEGIN_DECLS - typedef enum { NM_DNS_IP_CONFIG_TYPE_DEFAULT = 0, NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE, @@ -117,6 +114,4 @@ typedef enum { gboolean nm_dns_manager_get_resolv_conf_explicit (NMDnsManager *self); -G_END_DECLS - #endif /* __NETWORKMANAGER_DNS_MANAGER_H__ */ diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h index 4c84b1457d..e24bc1732a 100644 --- a/src/dns-manager/nm-dns-plugin.h +++ b/src/dns-manager/nm-dns-plugin.h @@ -19,9 +19,7 @@ #ifndef __NETWORKMANAGER_DNS_PLUGIN_H__ #define __NETWORKMANAGER_DNS_PLUGIN_H__ -#include "nm-default.h" #include "nm-dns-manager.h" - #include "nm-config-data.h" #define NM_TYPE_DNS_PLUGIN (nm_dns_plugin_get_type ()) diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.h b/src/dnsmasq-manager/nm-dnsmasq-manager.h index cc095d66c8..b610b4987b 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.h +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_DNSMASQ_MANAGER_H__ #define __NETWORKMANAGER_DNSMASQ_MANAGER_H__ - -#include "nm-default.h" #include "nm-ip4-config.h" #define NM_TYPE_DNSMASQ_MANAGER (nm_dnsmasq_manager_get_type ()) diff --git a/src/dnsmasq-manager/nm-dnsmasq-utils.h b/src/dnsmasq-manager/nm-dnsmasq-utils.h index 43d0b9a30b..459dda0475 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-utils.h +++ b/src/dnsmasq-manager/nm-dnsmasq-utils.h @@ -21,7 +21,6 @@ #ifndef __NETWORKMANAGER_DNSMASQ_UTILS_H__ #define __NETWORKMANAGER_DNSMASQ_UTILS_H__ -#include "nm-default.h" #include "nm-platform.h" gboolean nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr, diff --git a/src/main-utils.h b/src/main-utils.h index 10ba3135f9..dbbdb85f2f 100644 --- a/src/main-utils.h +++ b/src/main-utils.h @@ -21,8 +21,6 @@ #ifndef __MAIN_UTILS_H__ #define __MAIN_UTILS_H__ -#include "nm-default.h" - void nm_main_utils_ensure_root (void); void nm_main_utils_setup_signals (GMainLoop *main_loop); diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h index 929ce195f2..1bd004994e 100644 --- a/src/nm-activation-request.h +++ b/src/nm-activation-request.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_ACTIVATION_REQUEST_H__ #define __NETWORKMANAGER_ACTIVATION_REQUEST_H__ - -#include "nm-default.h" #include "nm-connection.h" #include "nm-active-connection.h" diff --git a/src/nm-audit-manager.h b/src/nm-audit-manager.h index 2d44c2ca52..af8a2037c7 100644 --- a/src/nm-audit-manager.h +++ b/src/nm-audit-manager.h @@ -21,15 +21,10 @@ #ifndef __NM_AUDIT_MANAGER_H__ #define __NM_AUDIT_MANAGER_H__ -#include <glib.h> -#include <glib-object.h> - #include "nm-connection.h" #include "nm-device.h" #include "nm-types.h" -G_BEGIN_DECLS - #define NM_TYPE_AUDIT_MANAGER (nm_audit_manager_get_type ()) #define NM_AUDIT_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AUDIT_MANAGER, NMAuditManager)) #define NM_AUDIT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_AUDIT_MANAGER, NMAuditManagerClass)) @@ -127,6 +122,4 @@ void _nm_audit_manager_log_device_op (NMAuditManager *self, const char *file const char *func, const char *op, NMDevice *device, gboolean result, gpointer subject_context, const char *reason); -G_END_DECLS - #endif /* __NM_AUDIT_MANAGER_H__ */ diff --git a/src/nm-auth-manager.h b/src/nm-auth-manager.h index 2875cccbaa..9251b3347c 100644 --- a/src/nm-auth-manager.h +++ b/src/nm-auth-manager.h @@ -21,13 +21,8 @@ #ifndef NM_AUTH_MANAGER_H #define NM_AUTH_MANAGER_H - -#include "nm-default.h" #include "nm-auth-subject.h" -G_BEGIN_DECLS - - #define NM_TYPE_AUTH_MANAGER (nm_auth_manager_get_type ()) #define NM_AUTH_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AUTH_MANAGER, NMAuthManager)) #define NM_AUTH_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_AUTH_MANAGER, NMAuthManagerClass)) @@ -72,7 +67,5 @@ gboolean nm_auth_manager_polkit_authority_check_authorization_finish (NMAuthMana #endif -G_END_DECLS - #endif /* NM_AUTH_MANAGER_H */ diff --git a/src/nm-bus-manager.h b/src/nm-bus-manager.h index f8a2cb6b5b..f49901db2c 100644 --- a/src/nm-bus-manager.h +++ b/src/nm-bus-manager.h @@ -22,8 +22,6 @@ #ifndef __NM_BUS_MANAGER_H__ #define __NM_BUS_MANAGER_H__ -G_BEGIN_DECLS - #define NM_TYPE_BUS_MANAGER (nm_bus_manager_get_type ()) #define NM_BUS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_BUS_MANAGER, NMBusManager)) #define NM_BUS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NM_TYPE_BUS_MANAGER, NMBusManagerClass)) @@ -107,6 +105,4 @@ GDBusProxy *nm_bus_manager_new_proxy (NMBusManager *self, const char *path, const char *iface); -G_END_DECLS - #endif /* __NM_BUS_MANAGER_H__ */ diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h index f037403ce8..10fcef97af 100644 --- a/src/nm-connectivity.h +++ b/src/nm-connectivity.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_CONNECTIVITY_H__ #define __NETWORKMANAGER_CONNECTIVITY_H__ - -#include "nm-default.h" #include "nm-dbus-interface.h" #define NM_TYPE_CONNECTIVITY (nm_connectivity_get_type ()) diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h index 90a4c23e6d..3ef960bb6d 100644 --- a/src/nm-core-utils.h +++ b/src/nm-core-utils.h @@ -25,7 +25,6 @@ #include <stdio.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-connection.h" /*****************************************************************************/ diff --git a/src/nm-dcb.h b/src/nm-dcb.h index 86e6153d67..8bc084706c 100644 --- a/src/nm-dcb.h +++ b/src/nm-dcb.h @@ -21,7 +21,6 @@ #ifndef __NETWORKMANAGER_DCB_H__ #define __NETWORKMANAGER_DCB_H__ -#include "nm-default.h" #include "nm-setting-dcb.h" gboolean nm_dcb_enable (const char *iface, gboolean enable, GError **error); diff --git a/src/nm-default-route-manager.h b/src/nm-default-route-manager.h index ca92814c34..30f130a476 100644 --- a/src/nm-default-route-manager.h +++ b/src/nm-default-route-manager.h @@ -18,13 +18,10 @@ * Copyright (C) 2014 Red Hat, Inc. */ - -#include "nm-default.h" -#include "nm-connection.h" - #ifndef __NETWORKMANAGER_DEFAULT_ROUTE_MANAGER_H__ #define __NETWORKMANAGER_DEFAULT_ROUTE_MANAGER_H__ +#include "nm-connection.h" #define NM_TYPE_DEFAULT_ROUTE_MANAGER (nm_default_route_manager_get_type ()) #define NM_DEFAULT_ROUTE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEFAULT_ROUTE_MANAGER, NMDefaultRouteManager)) diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h index 47cb64816b..62818c4563 100644 --- a/src/nm-dispatcher.h +++ b/src/nm-dispatcher.h @@ -24,7 +24,6 @@ #include <stdio.h> -#include "nm-default.h" #include "nm-connection.h" typedef enum { diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h index a08ac8b843..92fac8e2fc 100644 --- a/src/nm-firewall-manager.h +++ b/src/nm-firewall-manager.h @@ -21,16 +21,11 @@ #ifndef __NETWORKMANAGER_FIREWALL_MANAGER_H__ #define __NETWORKMANAGER_FIREWALL_MANAGER_H__ -#include "nm-default.h" - #define FIREWALL_DBUS_SERVICE "org.fedoraproject.FirewallD1" #define FIREWALL_DBUS_PATH "/org/fedoraproject/FirewallD1" #define FIREWALL_DBUS_INTERFACE "org.fedoraproject.FirewallD1" #define FIREWALL_DBUS_INTERFACE_ZONE "org.fedoraproject.FirewallD1.zone" - -G_BEGIN_DECLS - #define NM_TYPE_FIREWALL_MANAGER (nm_firewall_manager_get_type ()) #define NM_FIREWALL_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_FIREWALL_MANAGER, NMFirewallManager)) #define NM_FIREWALL_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_FIREWALL_MANAGER, NMFirewallManagerClass)) diff --git a/src/nm-multi-index.h b/src/nm-multi-index.h index 1e1e8fdaee..fb102574a1 100644 --- a/src/nm-multi-index.h +++ b/src/nm-multi-index.h @@ -21,11 +21,6 @@ #ifndef __NM_MULTI_INDEX__ #define __NM_MULTI_INDEX__ -#include "nm-default.h" - -G_BEGIN_DECLS - - typedef struct { char _dummy; } NMMultiIndexId; @@ -106,7 +101,5 @@ void nm_multi_index_id_iter_init (NMMultiIndexIdIter *iter, gboolean nm_multi_index_id_iter_next (NMMultiIndexIdIter *iter, void **out_value); -G_END_DECLS - #endif /* __NM_MULTI_INDEX__ */ diff --git a/src/nm-policy.h b/src/nm-policy.h index 476ddf1dbe..ce900ba641 100644 --- a/src/nm-policy.h +++ b/src/nm-policy.h @@ -22,8 +22,6 @@ #ifndef __NETWORKMANAGER_POLICY_H__ #define __NETWORKMANAGER_POLICY_H__ -#include "nm-default.h" - #define NM_TYPE_POLICY (nm_policy_get_type ()) #define NM_POLICY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_POLICY, NMPolicy)) #define NM_POLICY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_POLICY, NMPolicyClass)) diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h index 0084364cc7..d9937dafc3 100644 --- a/src/nm-rfkill-manager.h +++ b/src/nm-rfkill-manager.h @@ -19,9 +19,6 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ - -#include "nm-default.h" - #ifndef __NETWORKMANAGER_RFKILL_MANAGER_H__ #define __NETWORKMANAGER_RFKILL_MANAGER_H__ diff --git a/src/nm-route-manager.h b/src/nm-route-manager.h index 1f4b81744f..8e2746d93e 100644 --- a/src/nm-route-manager.h +++ b/src/nm-route-manager.h @@ -18,9 +18,6 @@ * Copyright (C) 2015 Red Hat, Inc. */ - -#include "nm-default.h" - #ifndef __NETWORKMANAGER_ROUTE_MANAGER_H__ #define __NETWORKMANAGER_ROUTE_MANAGER_H__ diff --git a/src/nm-session-monitor.h b/src/nm-session-monitor.h index e776ef25ab..3751d7db4c 100644 --- a/src/nm-session-monitor.h +++ b/src/nm-session-monitor.h @@ -21,11 +21,6 @@ #ifndef __NETWORKMANAGER_SESSION_MONITOR_H__ #define __NETWORKMANAGER_SESSION_MONITOR_H__ - -#include "nm-default.h" - -G_BEGIN_DECLS - #define NM_TYPE_SESSION_MONITOR (nm_session_monitor_get_type ()) #define NM_SESSION_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SESSION_MONITOR, NMSessionMonitor)) #define NM_SESSION_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SESSION_MONITOR, NMSessionMonitorClass)) @@ -49,7 +44,5 @@ gboolean nm_session_monitor_session_exists (NMSessionMonitor *self, uid_t uid, gboolean active); -G_END_DECLS - #endif /* __NETWORKMANAGER_SESSION_MONITOR_H__ */ diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h index 140f964f06..d54aebbcf1 100644 --- a/src/nm-sleep-monitor.h +++ b/src/nm-sleep-monitor.h @@ -20,8 +20,6 @@ #ifndef __NETWORKMANAGER_SLEEP_MONITOR_H__ #define __NETWORKMANAGER_SLEEP_MONITOR_H__ -G_BEGIN_DECLS - #define NM_TYPE_SLEEP_MONITOR (nm_sleep_monitor_get_type ()) #define NM_SLEEP_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor)) #define NM_SLEEP_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass)) @@ -42,7 +40,5 @@ NMSleepMonitorInhibitorHandle *nm_sleep_monitor_inhibit_take (NMSleepMonitor void nm_sleep_monitor_inhibit_release (NMSleepMonitor *self, NMSleepMonitorInhibitorHandle *handle); -G_END_DECLS - #endif /* __NETWORKMANAGER_SLEEP_MONITOR_H__ */ diff --git a/src/platform/wifi/wifi-utils-private.h b/src/platform/wifi/wifi-utils-private.h index 21a4c57b62..ebe76f1b6a 100644 --- a/src/platform/wifi/wifi-utils-private.h +++ b/src/platform/wifi/wifi-utils-private.h @@ -21,8 +21,6 @@ #ifndef __WIFI_UTILS_PRIVATE_H__ #define __WIFI_UTILS_PRIVATE_H__ - -#include "nm-default.h" #include "nm-dbus-interface.h" #include "wifi-utils.h" diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h index 3a4f996d68..8e2b93f1f0 100644 --- a/src/platform/wifi/wifi-utils.h +++ b/src/platform/wifi/wifi-utils.h @@ -24,7 +24,6 @@ #include <net/ethernet.h> -#include "nm-default.h" #include "nm-dbus-interface.h" typedef struct WifiData WifiData; diff --git a/src/settings/nm-inotify-helper.h b/src/settings/nm-inotify-helper.h index b4e2c61225..2ac9376cd8 100644 --- a/src/settings/nm-inotify-helper.h +++ b/src/settings/nm-inotify-helper.h @@ -23,8 +23,6 @@ #include <sys/inotify.h> -#include "nm-default.h" - /* NOTE: this code should be killed once we depend on a new enough glib to * include the patches from https://bugzilla.gnome.org/show_bug.cgi?id=532815 */ diff --git a/src/settings/nm-secret-agent.h b/src/settings/nm-secret-agent.h index 333aa461c1..916623a7d6 100644 --- a/src/settings/nm-secret-agent.h +++ b/src/settings/nm-secret-agent.h @@ -22,7 +22,6 @@ #define __NETWORKMANAGER_SECRET_AGENT_H__ #include <nm-connection.h> -#include "nm-default.h" #define NM_TYPE_SECRET_AGENT (nm_secret_agent_get_type ()) #define NM_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT, NMSecretAgent)) diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index c45505d9f0..761203ead6 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -26,9 +26,6 @@ #include "nm-exported-object.h" #include <nm-connection.h> -#include "nm-default.h" - -G_BEGIN_DECLS #define NM_TYPE_SETTINGS_CONNECTION (nm_settings_connection_get_type ()) #define NM_SETTINGS_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTINGS_CONNECTION, NMSettingsConnection)) @@ -230,6 +227,4 @@ const char *nm_settings_connection_get_filename (NMSettingsConnection *self); const char *nm_settings_connection_get_id (NMSettingsConnection *connection); const char *nm_settings_connection_get_uuid (NMSettingsConnection *connection); -G_END_DECLS - #endif /* __NETWORKMANAGER_SETTINGS_CONNECTION_H__ */ diff --git a/src/settings/nm-settings-plugin.h b/src/settings/nm-settings-plugin.h index ab88e7c2b5..8abd72eaeb 100644 --- a/src/settings/nm-settings-plugin.h +++ b/src/settings/nm-settings-plugin.h @@ -22,11 +22,7 @@ #ifndef __NETWORKMANAGER_SETTINGS_PLUGIN_H__ #define __NETWORKMANAGER_SETTINGS_PLUGIN_H__ - #include <nm-connection.h> -#include "nm-default.h" - -G_BEGIN_DECLS /* Plugin's factory function that returns a GObject that implements * NMSettingsPlugin. @@ -156,6 +152,4 @@ NMSettingsConnection *nm_settings_plugin_add_connection (NMSettingsPlugin *confi gboolean save_to_disk, GError **error); -G_END_DECLS - -#endif /* NM_SETTINGS_PLUGIN_H */ +#endif /* __NETWORKMANAGER_SETTINGS_PLUGIN_H__ */ diff --git a/src/settings/plugins/ibft/nm-ibft-connection.h b/src/settings/plugins/ibft/nm-ibft-connection.h index 4ccebc3cec..a4ee17ac7c 100644 --- a/src/settings/plugins/ibft/nm-ibft-connection.h +++ b/src/settings/plugins/ibft/nm-ibft-connection.h @@ -21,8 +21,6 @@ #ifndef NM_IBFT_CONNECTION_H #define NM_IBFT_CONNECTION_H -G_BEGIN_DECLS - #include <nm-settings-connection.h> #define NM_TYPE_IBFT_CONNECTION (nm_ibft_connection_get_type ()) @@ -45,6 +43,4 @@ GType nm_ibft_connection_get_type (void); NMIbftConnection *nm_ibft_connection_new (const GPtrArray *block, GError **error); -G_END_DECLS - #endif /* NM_IBFT_CONNECTION_H */ diff --git a/src/settings/plugins/ibft/plugin.h b/src/settings/plugins/ibft/plugin.h index 3fc58c7f1d..4867e07daa 100644 --- a/src/settings/plugins/ibft/plugin.h +++ b/src/settings/plugins/ibft/plugin.h @@ -21,8 +21,6 @@ #ifndef _PLUGIN_H_ #define _PLUGIN_H_ -#include "nm-default.h" - #define SETTINGS_TYPE_PLUGIN_IBFT (settings_plugin_ibft_get_type ()) #define SETTINGS_PLUGIN_IBFT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SETTINGS_TYPE_PLUGIN_IBFT, SettingsPluginIbft)) #define SETTINGS_PLUGIN_IBFT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SETTINGS_TYPE_PLUGIN_IBFT, SettingsPluginIbftClass)) diff --git a/src/settings/plugins/ibft/reader.h b/src/settings/plugins/ibft/reader.h index 42969ae0f3..97ef0c71a8 100644 --- a/src/settings/plugins/ibft/reader.h +++ b/src/settings/plugins/ibft/reader.h @@ -23,8 +23,6 @@ #include <nm-connection.h> -#include "nm-default.h" - gboolean read_ibft_blocks (const char *iscsiadm_path, GSList **out_blocks, GError **error); diff --git a/src/settings/plugins/ifnet/net_parser.h b/src/settings/plugins/ifnet/net_parser.h index 968feaf508..31fc9ead0c 100644 --- a/src/settings/plugins/ifnet/net_parser.h +++ b/src/settings/plugins/ifnet/net_parser.h @@ -22,8 +22,6 @@ #ifndef _NET_PARSER_H #define _NET_PARSER_H -#include "nm-default.h" - #define CONF_NET_FILE SYSCONFDIR "/conf.d/net" gboolean ifnet_init (gchar * config_file); @@ -40,4 +38,5 @@ gboolean ifnet_flush_to_file (const char *config_file, gchar **out_backup); void ifnet_set_data (const char *conn_name, const char *key, const char *value); gboolean ifnet_add_network (const char *name, const char *type); gboolean ifnet_delete_network (const char *conn_name); + #endif diff --git a/src/settings/plugins/ifnet/net_utils.h b/src/settings/plugins/ifnet/net_utils.h index 459693692b..85a5cb1ca2 100644 --- a/src/settings/plugins/ifnet/net_utils.h +++ b/src/settings/plugins/ifnet/net_utils.h @@ -21,12 +21,15 @@ #ifndef _IFNET_UTILS_H #define _IFNET_UTILS_H + #define IFNET_PLUGIN_NAME "SettingsPlugin-Ifnet" + #include <arpa/inet.h> + #include <nm-setting-ip6-config.h> #include <nm-setting-ip4-config.h> -#include "nm-default.h" #include "net_parser.h" + #define has_default_ip4_route(conn_name) has_default_route((conn_name), &is_ip4_address) #define has_default_ip6_route(conn_name) has_default_route((conn_name), &is_ip6_address) diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.h b/src/settings/plugins/ifnet/nm-ifnet-connection.h index baa4c07ed5..856996e070 100644 --- a/src/settings/plugins/ifnet/nm-ifnet-connection.h +++ b/src/settings/plugins/ifnet/nm-ifnet-connection.h @@ -25,8 +25,6 @@ #include <nm-settings-connection.h> #include "net_parser.h" -G_BEGIN_DECLS - #define NM_TYPE_IFNET_CONNECTION (nm_ifnet_connection_get_type ()) #define NM_IFNET_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFNET_CONNECTION, NMIfnetConnection)) #define NM_IFNET_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IFNET_CONNECTION, NMIfnetConnectionClass)) @@ -49,5 +47,4 @@ NMIfnetConnection *nm_ifnet_connection_new (NMConnection *source, const char *nm_ifnet_connection_get_conn_name (NMIfnetConnection *connection); -G_END_DECLS -#endif /* NM_IFNET_CONNECTION_H */ +#endif /* __NETWORKMANAGER_IFNET_CONNECTION_H__ */ diff --git a/src/settings/plugins/ifnet/plugin.h b/src/settings/plugins/ifnet/plugin.h index 33dcc2017f..09640968ba 100644 --- a/src/settings/plugins/ifnet/plugin.h +++ b/src/settings/plugins/ifnet/plugin.h @@ -23,8 +23,6 @@ #ifndef _PLUGIN_H_ #define _PLUGIN_H_ -#include "nm-default.h" - #define SETTINGS_TYPE_PLUGIN_IFNET (settings_plugin_ifnet_get_type ()) #define SETTINGS_PLUGIN_IFNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SETTINGS_TYPE_PLUGIN_IFNET, SettingsPluginIfnet)) #define SETTINGS_PLUGIN_IFNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SETTINGS_TYPE_PLUGIN_IFNET, SettingsPluginIfnetClass)) diff --git a/src/settings/plugins/ifnet/wpa_parser.h b/src/settings/plugins/ifnet/wpa_parser.h index 8099d19c62..d096f468db 100644 --- a/src/settings/plugins/ifnet/wpa_parser.h +++ b/src/settings/plugins/ifnet/wpa_parser.h @@ -22,8 +22,6 @@ #ifndef _WPA_PARSER_H #define _WPA_PARSER_H -#include "nm-default.h" - #define WPA_SUPPLICANT_CONF SYSCONFDIR "/wpa_supplicant/wpa_supplicant.conf" void wpa_parser_init (const char *wpa_supplicant_conf); diff --git a/src/settings/plugins/ifupdown/interface_parser.h b/src/settings/plugins/ifupdown/interface_parser.h index d4bb85150e..bf9c4465d2 100644 --- a/src/settings/plugins/ifupdown/interface_parser.h +++ b/src/settings/plugins/ifupdown/interface_parser.h @@ -24,8 +24,6 @@ #ifndef _INTERFACE_PARSER_H #define _INTERFACE_PARSER_H -#include "nm-default.h" - typedef struct _if_data { char *key; diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h index 8085b8316d..e1999bef5c 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h @@ -25,10 +25,8 @@ #define __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__ #include <nm-settings-connection.h> -#include "nm-default.h" -#include "interface_parser.h" -G_BEGIN_DECLS +#include "interface_parser.h" #define NM_TYPE_IFUPDOWN_CONNECTION (nm_ifupdown_connection_get_type ()) #define NM_IFUPDOWN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFUPDOWN_CONNECTION, NMIfupdownConnection)) @@ -49,6 +47,4 @@ GType nm_ifupdown_connection_get_type (void); NMIfupdownConnection *nm_ifupdown_connection_new (if_block *block); -G_END_DECLS - #endif /* __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__ */ diff --git a/src/settings/plugins/ifupdown/parser.h b/src/settings/plugins/ifupdown/parser.h index ee88c50064..549f1ad3fb 100644 --- a/src/settings/plugins/ifupdown/parser.h +++ b/src/settings/plugins/ifupdown/parser.h @@ -21,14 +21,15 @@ * (C) Copyright 2008 Canonical Ltd. */ +#ifndef __PARSER_H__ +#define __PARSER_H__ + #include <nm-connection.h> #include "interface_parser.h" -G_BEGIN_DECLS - gboolean ifupdown_update_connection_from_if_block (NMConnection *connection, if_block *block, GError **error); -G_END_DECLS +#endif /* __PARSER_H__ */ diff --git a/src/settings/plugins/ifupdown/plugin.h b/src/settings/plugins/ifupdown/plugin.h index 10ba228765..b568ea78b6 100644 --- a/src/settings/plugins/ifupdown/plugin.h +++ b/src/settings/plugins/ifupdown/plugin.h @@ -24,8 +24,6 @@ #ifndef _PLUGIN_H_ #define _PLUGIN_H_ -#include "nm-default.h" - #define PLUGIN_NAME "ifupdown" #define SETTINGS_TYPE_PLUGIN_IFUPDOWN (settings_plugin_ifupdown_get_type ()) diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.h b/src/settings/plugins/keyfile/nm-keyfile-connection.h index f6fa432b65..31dbe754a8 100644 --- a/src/settings/plugins/keyfile/nm-keyfile-connection.h +++ b/src/settings/plugins/keyfile/nm-keyfile-connection.h @@ -24,8 +24,6 @@ #include <nm-settings-connection.h> -G_BEGIN_DECLS - #define NM_TYPE_KEYFILE_CONNECTION (nm_keyfile_connection_get_type ()) #define NM_KEYFILE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_KEYFILE_CONNECTION, NMKeyfileConnection)) #define NM_KEYFILE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_KEYFILE_CONNECTION, NMKeyfileConnectionClass)) @@ -47,6 +45,4 @@ NMKeyfileConnection *nm_keyfile_connection_new (NMConnection *source, const char *filename, GError **error); -G_END_DECLS - #endif /* __NETWORKMANAGER_KEYFILE_CONNECTION_H__ */ diff --git a/src/settings/plugins/keyfile/plugin.h b/src/settings/plugins/keyfile/plugin.h index 07403270ba..a22b9c494a 100644 --- a/src/settings/plugins/keyfile/plugin.h +++ b/src/settings/plugins/keyfile/plugin.h @@ -22,8 +22,6 @@ #ifndef _PLUGIN_H_ #define _PLUGIN_H_ -#include "nm-default.h" - #define SETTINGS_TYPE_PLUGIN_KEYFILE (settings_plugin_keyfile_get_type ()) #define SETTINGS_PLUGIN_KEYFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SETTINGS_TYPE_PLUGIN_KEYFILE, SettingsPluginKeyfile)) #define SETTINGS_PLUGIN_KEYFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SETTINGS_TYPE_PLUGIN_KEYFILE, SettingsPluginKeyfileClass)) diff --git a/src/settings/plugins/keyfile/reader.h b/src/settings/plugins/keyfile/reader.h index a8021cb744..7bbc6005c2 100644 --- a/src/settings/plugins/keyfile/reader.h +++ b/src/settings/plugins/keyfile/reader.h @@ -24,8 +24,6 @@ #include <nm-connection.h> -#include "nm-default.h" - NMConnection *nm_keyfile_plugin_connection_from_file (const char *filename, GError **error); #endif /* _KEYFILE_PLUGIN_READER_H */ diff --git a/src/settings/plugins/keyfile/utils.h b/src/settings/plugins/keyfile/utils.h index c18fb2bcce..85aa545842 100644 --- a/src/settings/plugins/keyfile/utils.h +++ b/src/settings/plugins/keyfile/utils.h @@ -21,7 +21,6 @@ #ifndef _UTILS_H_ #define _UTILS_H_ -#include "nm-default.h" #include "NetworkManagerUtils.h" #define KEYFILE_PLUGIN_NAME "keyfile" diff --git a/src/settings/plugins/keyfile/writer.h b/src/settings/plugins/keyfile/writer.h index 25f44e941e..894356518d 100644 --- a/src/settings/plugins/keyfile/writer.h +++ b/src/settings/plugins/keyfile/writer.h @@ -24,8 +24,6 @@ #include <nm-connection.h> -#include "nm-default.h" - gboolean nm_keyfile_plugin_write_connection (NMConnection *connection, const char *existing_path, gboolean force_rename, diff --git a/src/supplicant-manager/nm-supplicant-config.h b/src/supplicant-manager/nm-supplicant-config.h index 32589930c7..bf3e64c5c2 100644 --- a/src/supplicant-manager/nm-supplicant-config.h +++ b/src/supplicant-manager/nm-supplicant-config.h @@ -25,10 +25,8 @@ #include <nm-setting-wireless.h> #include <nm-setting-wireless-security.h> #include <nm-setting-8021x.h> -#include "nm-default.h" -#include "nm-supplicant-types.h" -G_BEGIN_DECLS +#include "nm-supplicant-types.h" #define NM_TYPE_SUPPLICANT_CONFIG (nm_supplicant_config_get_type ()) #define NM_SUPPLICANT_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SUPPLICANT_CONFIG, NMSupplicantConfig)) @@ -82,6 +80,4 @@ gboolean nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, gboolean wired, GError **error); -G_END_DECLS - -#endif /* NM_SUPPLICANT_CONFIG_H */ +#endif /* __NETWORKMANAGER_SUPPLICANT_CONFIG_H__ */ diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant-manager/nm-supplicant-interface.h index d514c53bc9..a586e7ea79 100644 --- a/src/supplicant-manager/nm-supplicant-interface.h +++ b/src/supplicant-manager/nm-supplicant-interface.h @@ -22,7 +22,6 @@ #ifndef __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__ #define __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__ -#include "nm-default.h" #include "nm-supplicant-types.h" /* diff --git a/src/supplicant-manager/nm-supplicant-manager.h b/src/supplicant-manager/nm-supplicant-manager.h index b0ce6a523f..4cd7a0bdc4 100644 --- a/src/supplicant-manager/nm-supplicant-manager.h +++ b/src/supplicant-manager/nm-supplicant-manager.h @@ -22,12 +22,9 @@ #ifndef __NETWORKMANAGER_SUPPLICANT_MANAGER_H__ #define __NETWORKMANAGER_SUPPLICANT_MANAGER_H__ -#include "nm-default.h" #include "nm-supplicant-types.h" #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_SUPPLICANT_MANAGER (nm_supplicant_manager_get_type ()) #define NM_SUPPLICANT_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SUPPLICANT_MANAGER, NMSupplicantManager)) #define NM_SUPPLICANT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SUPPLICANT_MANAGER, NMSupplicantManagerClass)) diff --git a/src/tests/config/nm-test-device.h b/src/tests/config/nm-test-device.h index c3532c9cc0..dfb8ff7813 100644 --- a/src/tests/config/nm-test-device.h +++ b/src/tests/config/nm-test-device.h @@ -23,8 +23,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_TEST_DEVICE (nm_test_device_get_type ()) #define NM_TEST_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_TEST_DEVICE, NMTestDevice)) #define NM_TEST_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_TEST_DEVICE, NMTestDeviceClass)) @@ -45,6 +43,4 @@ GType nm_test_device_get_type (void); NMDevice *nm_test_device_new (const char *hwaddr); -G_END_DECLS - -#endif /* NM_DEVICE_H */ +#endif /* __NETWORKMANAGER_TEST_DEVICE_H__ */ diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index f557e27acb..9ccd882d1c 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -22,7 +22,6 @@ #ifndef __NETWORKMANAGER_VPN_MANAGER_H__ #define __NETWORKMANAGER_VPN_MANAGER_H__ -#include "nm-default.h" #include "nm-vpn-connection.h" #define NM_TYPE_VPN_MANAGER (nm_vpn_manager_get_type ()) |