system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-05 17:19:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: cleanup includes in header files

Browse Source 
- 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.
This commit is contained in:
Thomas Haller 2016-08-17 18:19:00 +02:00
parent b2eb64a439
commit f19aff8909
163 changed files with 32 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
callouts/nm-dispatcher-utils.h
View File

@ -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,

1
clients/cli/nmcli.c
View File

@ -19,7 +19,6 @@
* Copyright 2010 - 2015 Red Hat, Inc.
*/
/* Generated configuration file */
#include "nm-default.h"
#include <stdio.h>

1
clients/cli/polkit-agent.c
View File

@ -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"

2
clients/cli/utils.c
View File

@ -17,8 +17,6 @@
* Copyright 2010 - 2015 Red Hat, Inc.
*/
/* Generated configuration file */
#include "nm-default.h"
#include <stdio.h>

6
clients/common/nm-polkit-listener.h
View File

@ -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__ */

4
clients/common/nm-secret-agent-simple.h
View File

@ -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__ */

2
clients/common/nm-vpn-helpers.h
View File

@ -21,8 +21,6 @@
#include <NetworkManager.h>
#include "nm-default.h"
struct {
const char *name;
const char *ui_name;

4
clients/tui/newt/nmt-newt-button-box.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-button.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-checkbox.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-component.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-container.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-entry-numeric.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-entry.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-form.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-grid.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-label.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-listbox.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-popup.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-section.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-separator.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-stack.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-textbox.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-toggle-button.h
View File

@ -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 */

6
clients/tui/newt/nmt-newt-types.h
View File

@ -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 */

6
clients/tui/newt/nmt-newt-utils.h
View File

@ -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 */

4
clients/tui/newt/nmt-newt-widget.h
View File

@ -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 */

4
clients/tui/nm-editor-bindings.h
View File

@ -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 */

4
clients/tui/nm-editor-utils.h
View File

@ -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 */

4
clients/tui/nmt-address-list.h
View File

@ -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 */

4
clients/tui/nmt-connect-connection-list.h
View File

@ -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 */

4
clients/tui/nmt-device-entry.h
View File

@ -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 */

4
clients/tui/nmt-edit-connection-list.h
View File

@ -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 */

4
clients/tui/nmt-editor-grid.h
View File

@ -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 */

4
clients/tui/nmt-editor-page-device.h
View File

@ -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 */

4
clients/tui/nmt-editor-page.h
View File

@ -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 */

4
clients/tui/nmt-editor-section.h
View File

@ -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 */

4
clients/tui/nmt-editor.h
View File

@ -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 */

4
clients/tui/nmt-ip-entry.h
View File

@ -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 */

5
clients/tui/nmt-mac-entry.h
View File

@ -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 */

4
clients/tui/nmt-mtu-entry.h
View File

@ -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 */

4
clients/tui/nmt-page-bond.h
View File

@ -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 */

4
clients/tui/nmt-page-bridge-port.h
View File

@ -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 */

4
clients/tui/nmt-page-bridge.h
View File

@ -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 */

5
clients/tui/nmt-page-dsl.h
View File

@ -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 */

4
clients/tui/nmt-page-ethernet.h
View File

@ -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 */

4
clients/tui/nmt-page-infiniband.h
View File

@ -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 */

4
clients/tui/nmt-page-ip4.h
View File

@ -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 */

4
clients/tui/nmt-page-ip6.h
View File

@ -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 */

4
clients/tui/nmt-page-ppp.h
View File

@ -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 */

4
clients/tui/nmt-page-team-port.h
View File

@ -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 */

5
clients/tui/nmt-page-team.h
View File

@ -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 */

4
clients/tui/nmt-page-vlan.h
View File

@ -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 */

4
clients/tui/nmt-page-wifi.h
View File

@ -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 */

4
clients/tui/nmt-password-dialog.h
View File

@ -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 */

4
clients/tui/nmt-password-fields.h
View File

@ -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 */

4
clients/tui/nmt-route-editor.h
View File

@ -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 */

4
clients/tui/nmt-route-entry.h
View File

@ -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 */

4
clients/tui/nmt-route-table.h
View File

@ -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 */

4
clients/tui/nmt-slave-list.h
View File

@ -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 */

6
clients/tui/nmt-utils.h
View File

@ -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 */

4
clients/tui/nmt-widget-list.h
View File

@ -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 */

4
clients/tui/nmtui-connect.h
View File

@ -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 */

4
clients/tui/nmtui-edit.h
View File

@ -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 */

4
clients/tui/nmtui-hostname.h
View File

@ -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 */

4
clients/tui/nmtui.h
View File

@ -21,12 +21,8 @@
#include <NetworkManager.h>
G_BEGIN_DECLS
extern NMClient *nm_client;
void nmtui_quit (void);
G_END_DECLS
#endif /* NMTUI_H */

2
libnm-core/crypto.h
View File

@ -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"

1
libnm-core/nm-core-internal.h
View File

@ -34,7 +34,6 @@
**/
#include "nm-default.h"
#include "nm-connection.h"
#include "nm-core-enum-types.h"
#include "nm-setting-8021x.h"

1
libnm-core/nm-keyfile-internal.h
View File

@ -24,7 +24,6 @@
#include <sys/types.h>
#include "nm-default.h"
#include "nm-connection.h"
#include "nm-setting-8021x.h"

2
libnm-core/nm-property-compare.h
View File

@ -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__ */

1
libnm-core/nm-setting-private.h
View File

@ -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"

2
libnm-glib/nm-dbus-helpers-private.h
View File

@ -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,

1
libnm-glib/nm-object-cache.h
View File

@ -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

1
libnm-glib/nm-object-private.h
View File

@ -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);

2
libnm-util/crypto.h
View File

@ -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"

2
libnm-util/nm-param-spec-specialized.h
View File

@ -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 ())

2
libnm-util/nm-setting-private.h
View File

@ -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 \

2
libnm/nm-dbus-helpers.h
View File

@ -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);

1
libnm/nm-object-cache.h
View File

@ -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

1
libnm/nm-object-private.h
View File

@ -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);

4
src/devices/adsl/nm-atm-manager.h
View File

@ -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))

7
src/devices/adsl/nm-device-adsl.h
View File

@ -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 */

4
src/devices/bluetooth/nm-bluez4-manager.h
View File

@ -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))

2
src/devices/bluetooth/nm-bluez5-dun.h
View File

@ -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,

4
src/devices/bluetooth/nm-device-bt.h
View File

@ -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__ */

4
src/devices/nm-arping-manager.h
View File

@ -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__ */

6
src/devices/nm-device-bond.h
View File

@ -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 */

7
src/devices/nm-device-bridge.h
View File

@ -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__ */

6
src/devices/nm-device-ethernet.h
View File

@ -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__ */

6
src/devices/nm-device-generic.h
View File

@ -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__ */

6
src/devices/nm-device-infiniband.h
View File

@ -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__ */

6
src/devices/nm-device-ip-tunnel.h
View File

@ -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__ */

1
src/devices/nm-device-logging.h
View File

@ -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) \

6
src/devices/nm-device-macvlan.h
View File

@ -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__ */

2
src/devices/nm-device-private.h
View File

@ -24,8 +24,6 @@
#include "nm-device.h"
#include "nm-default.h"
/* This file should only be used by subclasses of NMDevice */
enum NMActStageReturn {

6
src/devices/nm-device-tun.h
View File

@ -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__ */

6
src/devices/nm-device-veth.h
View File

@ -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__ */

6
src/devices/nm-device-vlan.h
View File

@ -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__ */

6
src/devices/nm-device-vxlan.h
View File

@ -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__ */

6
src/devices/nm-device.h
View File

@ -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__ */

Some files were not shown because too many files have changed in this diff Show More