libnm: create NMDhcpConfig as parent of NMDhcp4Config and NMDhcp6Config

As with NMIP4Config and NMIP6Config, merge the two DHCP config classes
into one in the public API.

1 files changed, 6 insertions, 17 deletions

diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h
index 90152c8f6..3423740db 100644
--- a/libnm/nm-dhcp4-config.h
+++ b/libnm/nm-dhcp4-config.h
@@ -15,18 +15,13 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright 2008 Red Hat, Inc.
- * Copyright 2008 Novell, Inc.
+ * Copyright 2014 Red Hat, Inc.
  */
 
 #ifndef __NM_DHCP4_CONFIG_H__
 #define __NM_DHCP4_CONFIG_H__
 
-#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
-#error "Only <NetworkManager.h> can be included directly."
-#endif
-
-#include <nm-object.h>
+#include <nm-dhcp-config.h>
 
 G_BEGIN_DECLS
 
@@ -36,25 +31,19 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP4_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG))
 #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG))
 
-struct _NMDhcp4Config {
-	NMObject parent;
-};
+typedef struct {
+	NMDhcpConfig parent;
+} NMDhcp4Config;
 
 typedef struct {
-	NMObjectClass parent;
+	NMDhcpConfigClass parent;
 
 	/*< private >*/
 	gpointer padding[4];
 } NMDhcp4ConfigClass;
 
-#define NM_DHCP4_CONFIG_OPTIONS "options"
-
 GType nm_dhcp4_config_get_type (void);
 
-GHashTable * nm_dhcp4_config_get_options (NMDhcp4Config *config);
-
-const char * nm_dhcp4_config_get_one_option (NMDhcp4Config *config, const char *option);
-
 G_END_DECLS
 
 #endif /* __NM_DHCP4_CONFIG_H__ */