diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-26 02:18:32 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-26 02:18:32 +0200 |
| commit | 7514efc2f38c9ace4557d4e69d68e7d380389030 (patch) | |
| tree | 7fb00fda86cfcc2ca377f191633a7cfdbfea7ca3 /clients/tui | |
| parent | d6201f5d8daada3d64a0a3e0038e14eebec683ce (diff) | |
Imported Upstream version 1.4.0 upstream/1.4.0
Diffstat (limited to 'clients/tui')
70 files changed, 135 insertions, 288 deletions
diff --git a/clients/tui/Makefile.in b/clients/tui/Makefile.in index d7773283..0aaf339a 100644 --- a/clients/tui/Makefile.in +++ b/clients/tui/Makefile.in @@ -91,8 +91,9 @@ host_triplet = @host@ @BUILD_NMTUI_TRUE@bin_PROGRAMS = nmtui$(EXEEXT) subdir = clients/tui ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -330,6 +331,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -386,13 +388,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -404,6 +407,8 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@ +LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@ LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ @@ -464,6 +469,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -499,6 +506,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/clients/tui/newt/Makefile.in b/clients/tui/newt/Makefile.in index 3042089f..12583516 100644 --- a/clients/tui/newt/Makefile.in +++ b/clients/tui/newt/Makefile.in @@ -90,8 +90,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = clients/tui/newt ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -231,6 +232,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -287,13 +289,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -305,6 +308,8 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@ +LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@ LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ @@ -365,6 +370,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -400,6 +407,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/clients/tui/newt/nmt-newt-button-box.h b/clients/tui/newt/nmt-newt-button-box.h index 970588a4..dec2c347 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 52e95c5d..646d0053 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 c277386b..e46e3ec2 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 2ffa018e..bf8f2bb8 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 6f182925..32d6abcc 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 43ac3449..00e19739 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 8df0b137..36bd9d51 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 be95eb68..2cae5b5e 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 f36a38ee..11bfdec3 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 a4e0dcca..ef894d91 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 c18c9f8e..eba17a7c 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 643ea2d8..be2bc34c 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 6bf59ebb..569e86e5 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 3f4183d5..71503099 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 09afe4ba..c9bb5a07 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 b3743aea..31a159e2 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 e54c6d3f..69c0b7d1 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 4ea0a7b8..af550ca0 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 706f10d3..49d717d2 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); @@ -41,14 +37,12 @@ char *nmt_newt_locale_from_utf8 (const char *str_utf8); int nmt_newt_text_width (const char *str); void nmt_newt_message_dialog (const char *message, - ...); + ...) _nm_printf (1, 2); int nmt_newt_choice_dialog (const char *button1, const char *button2, const char *message, - ...); + ...) _nm_printf (3, 4); 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 a526a674..34ce943c 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 c4ed95d5..fd4fcd30 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.c b/clients/tui/nm-editor-utils.c index e582d41f..0ec55f3d 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -223,7 +223,7 @@ nm_editor_utils_get_connection_type_list (void) #if 0 /* Add "VPN" only if there are plugins */ - vpn_plugins_hash = nm_vpn_get_plugins (); + vpn_plugins_hash = nm_vpn_get_plugin_infos (); have_vpn_plugins = vpn_plugins_hash && g_hash_table_size (vpn_plugins_hash); if (have_vpn_plugins) { GHashTableIter iter; @@ -252,6 +252,18 @@ nm_editor_utils_get_connection_type_list (void) return list; } +static gboolean +_assert_format_int (const char *format) +{ + g_assert (format); + format = strchr (format, '%'); + g_assert (format); + format++; + g_assert (!strchr (format, '%')); + g_assert (format[0] == 'd'); + return TRUE; +} + static char * get_available_connection_name (const char *format, NMClient *client) @@ -261,6 +273,8 @@ get_available_connection_name (const char *format, char *cname = NULL; int i = 0; + nm_assert (_assert_format_int (format)); + conns = nm_client_get_connections (client); for (i = 0; i < conns->len; i++) { const char *id; @@ -275,7 +289,9 @@ get_available_connection_name (const char *format, char *temp; gboolean found = FALSE; + NM_PRAGMA_WARNING_DISABLE("-Wformat-nonliteral") temp = g_strdup_printf (format, i); + NM_PRAGMA_WARNING_REENABLE for (iter = names; iter; iter = g_slist_next (iter)) { if (!strcmp (iter->data, temp)) { found = TRUE; diff --git a/clients/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h index 5e402ce7..15a16cd2 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 df7a4f79..f82f2181 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 d4790043..bf4721b9 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 05d5d40f..4945e7c2 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 c31c0a8c..fd492bce 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 2ae01d71..48676896 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 f911602c..75aecd01 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 bbc0d9e3..8da5ea9f 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 67410c71..3c2537be 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 db10b82a..b000f64e 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 ceb355ef..2338a873 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.c b/clients/tui/nmt-mac-entry.c index d0f07e12..da7f55fa 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -28,11 +28,13 @@ #include "nm-default.h" +#include "nmt-mac-entry.h" + #include <string.h> #include "NetworkManager.h" +#include "nm-common-macros.h" -#include "nmt-mac-entry.h" G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY) @@ -41,6 +43,7 @@ G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY) typedef struct { int mac_length; int mac_str_length; + NmtMacEntryType entry_type; } NmtMacEntryPrivate; @@ -48,6 +51,7 @@ enum { PROP_0, PROP_MAC_LENGTH, PROP_MAC_ADDRESS, + PROP_ENTRY_TYPE, LAST_PROP }; @@ -57,6 +61,7 @@ enum { * @width: the width in characters of the entry * @mac_length: the length in bytes of the hardware address * (either %ETH_ALEN or %INFINIBAND_ALEN) + * @entry_type: the type of the entry. * * Creates a new #NmtMacEntry. * @@ -64,11 +69,13 @@ enum { */ NmtNewtWidget * nmt_mac_entry_new (int width, - int mac_length) + int mac_length, + NmtMacEntryType entry_type) { return g_object_new (NMT_TYPE_MAC_ENTRY, "width", width, "mac-length", mac_length, + "entry-type", (int) entry_type, NULL); } @@ -81,6 +88,9 @@ mac_filter (NmtNewtEntry *entry, { NmtMacEntryPrivate *priv = NMT_MAC_ENTRY_GET_PRIVATE (entry); + if (priv->entry_type != NMT_MAC_ENTRY_TYPE_MAC) + return TRUE; + if (position >= priv->mac_str_length) return FALSE; @@ -98,6 +108,11 @@ mac_validator (NmtNewtEntry *entry, if (!*text) return TRUE; + if (priv->entry_type == NMT_MAC_ENTRY_TYPE_CLONED) { + if (NM_CLONED_MAC_IS_SPECIAL (text)) + return TRUE; + } + p = text; while ( g_ascii_isxdigit (p[0]) && g_ascii_isxdigit (p[1]) @@ -112,7 +127,9 @@ mac_validator (NmtNewtEntry *entry, if (!*p) return (p - text == priv->mac_str_length); - if (g_ascii_isxdigit (p[0]) && !p[1]) { + if ( g_ascii_isxdigit (p[0]) + && !p[1] + && p - text < priv->mac_str_length) { char *fixed = g_strdup_printf ("%.*s:%c", (int)(p - text), text, *p); nmt_newt_entry_set_text (entry, fixed); @@ -161,6 +178,10 @@ nmt_mac_entry_set_property (GObject *object, case PROP_MAC_ADDRESS: nmt_newt_entry_set_text (NMT_NEWT_ENTRY (object), g_value_get_string (value)); break; + case PROP_ENTRY_TYPE: + /* construct-only */ + priv->entry_type = g_value_get_int (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -182,6 +203,9 @@ nmt_mac_entry_get_property (GObject *object, case PROP_MAC_ADDRESS: g_value_set_string (value, nmt_newt_entry_get_text (NMT_NEWT_ENTRY (object))); break; + case PROP_ENTRY_TYPE: + g_value_set_int (value, priv->entry_type); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -224,4 +248,17 @@ nmt_mac_entry_class_init (NmtMacEntryClass *entry_class) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** + * NmtMacEntry:entry-type: + * + * The type of the #NmtMacEntry. Can be either used for plain + * MAC addresses or for the extended format for cloned MAC addresses. + */ + g_object_class_install_property + (object_class, PROP_ENTRY_TYPE, + g_param_spec_int ("entry-type", "", "", + NMT_MAC_ENTRY_TYPE_MAC, NMT_MAC_ENTRY_TYPE_CLONED, NMT_MAC_ENTRY_TYPE_MAC, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); } diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h index 099bacb7..68d9a208 100644 --- a/clients/tui/nmt-mac-entry.h +++ b/clients/tui/nmt-mac-entry.h @@ -19,11 +19,13 @@ #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, +} NmtMacEntryType; #define NMT_TYPE_MAC_ENTRY (nmt_mac_entry_get_type ()) #define NMT_MAC_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_MAC_ENTRY, NmtMacEntry)) @@ -45,8 +47,7 @@ typedef struct { GType nmt_mac_entry_get_type (void); NmtNewtWidget *nmt_mac_entry_new (int width, - int mac_length); - -G_END_DECLS + int mac_length, + NmtMacEntryType type); #endif /* NMT_MAC_ENTRY_H */ diff --git a/clients/tui/nmt-mtu-entry.h b/clients/tui/nmt-mtu-entry.h index dfe416d0..b7b2cf46 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 b77477db..d9b071ef 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 c566dbc0..95689fff 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 60cbdea2..21d850af 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 dc84ca07..aa436e71 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.c b/clients/tui/nmt-page-ethernet.c index dfe2e440..6b924327 100644 --- a/clients/tui/nmt-page-ethernet.c +++ b/clients/tui/nmt-page-ethernet.c @@ -70,7 +70,7 @@ nmt_page_ethernet_constructed (GObject *object) section = nmt_editor_section_new (_("ETHERNET"), NULL, FALSE); grid = nmt_editor_section_get_body (section); - widget = nmt_mac_entry_new (40, ETH_ALEN); + widget = nmt_mac_entry_new (40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED); g_object_bind_property (s_wired, NM_SETTING_WIRED_CLONED_MAC_ADDRESS, widget, "mac-address", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); diff --git a/clients/tui/nmt-page-ethernet.h b/clients/tui/nmt-page-ethernet.h index bdf3d677..56d917e1 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 f51e0874..e2e0fbbc 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 e3c5a003..f120e57d 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 498261e1..3a471447 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 79103232..634323d4 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 2d8fa121..75c42849 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 994b63d3..a04c2a95 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.c b/clients/tui/nmt-page-vlan.c index c63b1904..9cd65421 100644 --- a/clients/tui/nmt-page-vlan.c +++ b/clients/tui/nmt-page-vlan.c @@ -115,7 +115,7 @@ nmt_page_vlan_constructed (GObject *object) nmt_editor_grid_append (grid, NULL, nmt_newt_separator_new (), NULL); - widget = nmt_mac_entry_new (40, ETH_ALEN); + widget = nmt_mac_entry_new (40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED); g_object_bind_property (s_wired, NM_SETTING_WIRED_CLONED_MAC_ADDRESS, widget, "mac-address", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); diff --git a/clients/tui/nmt-page-vlan.h b/clients/tui/nmt-page-vlan.h index db7c4098..043c3bc0 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.c b/clients/tui/nmt-page-wifi.c index cd9b60e1..35625fe4 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -351,13 +351,13 @@ nmt_page_wifi_constructed (GObject *object) nmt_editor_grid_append (grid, NULL, nmt_newt_separator_new (), NULL); - widget = nmt_mac_entry_new (40, ETH_ALEN); + widget = nmt_mac_entry_new (40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_MAC); g_object_bind_property (s_wireless, NM_SETTING_WIRELESS_BSSID, widget, "mac-address", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); nmt_editor_grid_append (grid, _("BSSID"), widget, NULL); - widget = nmt_mac_entry_new (40, ETH_ALEN); + widget = nmt_mac_entry_new (40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED); g_object_bind_property (s_wireless, NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, widget, "mac-address", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); diff --git a/clients/tui/nmt-page-wifi.h b/clients/tui/nmt-page-wifi.h index 7ce50584..ed16bdc5 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 36c9f51e..efdab7ec 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 2ef830aa..6a6017ba 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 9882c713..febcb402 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 d37b14cd..fa76fa7b 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 217bf40d..1aa92e6b 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 d10cd3a7..e0d836c7 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 5531dbeb..067c6512 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 7dbeb215..b7bf0151 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.c b/clients/tui/nmtui-connect.c index 46e33617..ae9dd43e 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -378,7 +378,7 @@ listbox_active_changed (GObject *object, } static NmtNewtForm * -nmt_connect_connection_list (void) +nmt_connect_connection_list (gboolean is_top) { int screen_width, screen_height; NmtNewtForm *form; @@ -410,7 +410,7 @@ nmt_connect_connection_list (void) listbox_active_changed (G_OBJECT (list), NULL, activate); g_signal_connect (activate, "clicked", G_CALLBACK (activate_clicked), list); - quit = nmt_newt_button_box_add_end (NMT_NEWT_BUTTON_BOX (bbox), _("Quit")); + quit = nmt_newt_button_box_add_end (NMT_NEWT_BUTTON_BOX (bbox), is_top ? _("Quit") : _("Back")); nmt_newt_widget_set_exit_on_activate (quit, TRUE); nmt_newt_form_set_content (form, grid); @@ -444,10 +444,10 @@ nmt_connect_connection (const char *identifier) } NmtNewtForm * -nmtui_connect (int argc, char **argv) +nmtui_connect (gboolean is_top, int argc, char **argv) { if (argc == 2) return nmt_connect_connection (argv[1]); else - return nmt_connect_connection_list (); + return nmt_connect_connection_list (is_top); } diff --git a/clients/tui/nmtui-connect.h b/clients/tui/nmtui-connect.h index 8310ac38..569d191a 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 (int argc, char **argv); - -G_END_DECLS +NmtNewtForm *nmtui_connect (gboolean is_top, int argc, char **argv); #endif /* NMTUI_CONNECT_H */ diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c index 96c17245..a92e45a3 100644 --- a/clients/tui/nmtui-edit.c +++ b/clients/tui/nmtui-edit.c @@ -103,7 +103,7 @@ edit_connection_list_filter (NmtEditConnectionList *list, } static NmtNewtForm * -nmt_edit_main_connection_list (void) +nmt_edit_main_connection_list (gboolean is_top) { int screen_width, screen_height; NmtNewtForm *form; @@ -117,7 +117,7 @@ nmt_edit_main_connection_list (void) "escape-exits", TRUE, NULL); - quit = nmt_newt_button_new (_("Quit")); + quit = nmt_newt_button_new (is_top ? _("Quit") : _("Back")); nmt_newt_widget_set_exit_on_activate (quit, TRUE); list = g_object_new (NMT_TYPE_EDIT_CONNECTION_LIST, @@ -560,7 +560,7 @@ nmt_remove_connection (NMRemoteConnection *connection) } NmtNewtForm * -nmtui_edit (int argc, char **argv) +nmtui_edit (gboolean is_top, int argc, char **argv) { NMConnection *conn = NULL; @@ -577,5 +577,5 @@ nmtui_edit (int argc, char **argv) return nmt_editor_new (conn); } else - return nmt_edit_main_connection_list (); + return nmt_edit_main_connection_list (is_top); } diff --git a/clients/tui/nmtui-edit.h b/clients/tui/nmtui-edit.h index dae91cfa..041e7859 100644 --- a/clients/tui/nmtui-edit.h +++ b/clients/tui/nmtui-edit.h @@ -21,12 +21,10 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - typedef gboolean (*NmtAddConnectionTypeFilter) (GType connection_type, gpointer user_data); -NmtNewtForm *nmtui_edit (int argc, char **argv); +NmtNewtForm *nmtui_edit (gboolean is_top, int argc, char **argv); void nmt_add_connection (void); void nmt_add_connection_full (const char *primary_text, @@ -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.c b/clients/tui/nmtui-hostname.c index ada2393f..f8005502 100644 --- a/clients/tui/nmtui-hostname.c +++ b/clients/tui/nmtui-hostname.c @@ -96,7 +96,7 @@ hostname_set (GObject *object, } NmtNewtForm * -nmtui_hostname (int argc, char **argv) +nmtui_hostname (gboolean is_top, int argc, char **argv) { const char *hostname; char *tmp = NULL; diff --git a/clients/tui/nmtui-hostname.h b/clients/tui/nmtui-hostname.h index a14bc699..772d9a72 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 (int argc, char **argv); - -G_END_DECLS +NmtNewtForm *nmtui_hostname (gboolean is_top, int argc, char **argv); #endif /* NMTUI_HOSTNAME_H */ diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index 47ba5bf5..70cad5d6 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -43,7 +43,7 @@ NMClient *nm_client; static GMainLoop *loop; -typedef NmtNewtForm * (*NmtuiSubprogram) (int argc, char **argv); +typedef NmtNewtForm * (*NmtuiSubprogram) (gboolean is_top, int argc, char **argv); static const struct { const char *name, *shortcut, *arg; @@ -61,22 +61,43 @@ static const struct { nmtui_hostname } }; static const int num_subprograms = G_N_ELEMENTS (subprograms); +static NmtNewtForm *toplevel_form; -static void +static NmtNewtForm * quit_func (int argc, char **argv) { + if (toplevel_form) + nmt_newt_form_quit (toplevel_form); + nmtui_quit (); + + return NULL; +} + +static void +main_list_activated (NmtNewtWidget *widget, NmtNewtListbox *listbox) +{ + NmtNewtForm *form; + NmtuiSubprogram sub; + + sub = nmt_newt_listbox_get_active_key (listbox); + if (sub) { + form = sub (FALSE, 0, NULL); + if (form) { + nmt_newt_form_show (form); + g_object_unref (form); + } + } } static NmtNewtForm * -nmtui_main (int argc, char **argv) +nmtui_main (gboolean is_top, int argc, char **argv) { NmtNewtForm *form; NmtNewtWidget *widget, *ok; NmtNewtGrid *grid; NmtNewtListbox *listbox; NmtNewtButtonBox *bbox; - NmtuiSubprogram subprogram = NULL; int i; form = g_object_new (NMT_TYPE_NEWT_FORM, @@ -97,8 +118,9 @@ nmtui_main (int argc, char **argv) NULL); nmt_newt_grid_add (grid, widget, 0, 1); nmt_newt_widget_set_padding (widget, 0, 1, 0, 1); - nmt_newt_widget_set_exit_on_activate (widget, TRUE); listbox = NMT_NEWT_LISTBOX (widget); + g_signal_connect (widget, "activated", + G_CALLBACK (main_list_activated), listbox); for (i = 0; i < num_subprograms; i++) { nmt_newt_listbox_append (listbox, _(subprograms[i].display_name), @@ -112,17 +134,12 @@ nmtui_main (int argc, char **argv) bbox = NMT_NEWT_BUTTON_BOX (widget); ok = nmt_newt_button_box_add_end (bbox, _("OK")); - nmt_newt_widget_set_exit_on_activate (ok, TRUE); + g_signal_connect (ok, "activated", + G_CALLBACK (main_list_activated), listbox); - widget = nmt_newt_form_run_sync (form); - if (widget) - subprogram = nmt_newt_listbox_get_active_key (listbox); - g_object_unref (form); + toplevel_form = form; - if (subprogram) - return subprogram (argc, argv); - else - return NULL; + return form; } /** @@ -179,7 +196,7 @@ idle_run_subprogram (gpointer user_data) NmtuiStartupData *data = user_data; NmtNewtForm *form; - form = data->subprogram (data->argc, data->argv); + form = data->subprogram (TRUE, data->argc, data->argv); if (form) { g_signal_connect (form, "quit", G_CALLBACK (toplevel_form_quit), NULL); nmt_newt_form_show (form); diff --git a/clients/tui/nmtui.h b/clients/tui/nmtui.h index aada9719..53c20cb4 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 */ |