ifnet: rename files to "nms-ifnet-*"

src/settings/plugins/ifnet/Makefile.am

@@ -25,22 +25,22 @@ noinst_LTLIBRARIES = \
 ###############################################################################
 
 libnms_ifnet_core_la_SOURCES = \
-	net_parser.c\
-	net_parser.h\
-	connection_parser.c \
-	connection_parser.h \
-	net_utils.h\
-	net_utils.c\
-	wpa_parser.h\
-	wpa_parser.c
+	nms-ifnet-net-parser.c\
+	nms-ifnet-net-parser.h\
+	nms-ifnet-connection-parser.c \
+	nms-ifnet-connection-parser.h \
+	nms-ifnet-net-utils.h\
+	nms-ifnet-net-utils.c\
+	nms-ifnet-wpa-parser.h\
+	nms-ifnet-wpa-parser.c
 
 ###############################################################################
 
 libnm_settings_plugin_ifnet_la_SOURCES = \
-	nm-ifnet-connection.c \
-	nm-ifnet-connection.h \
-	plugin.c \
-	plugin.h
+	nms-ifnet-connection.c \
+	nms-ifnet-connection.h \
+	nms-ifnet-plugin.c \
+	nms-ifnet-plugin.h
 
 libnm_settings_plugin_ifnet_la_LDFLAGS = \
 	-module -avoid-version

src/settings/plugins/ifnet/nms-ifnet-connection-parser.c

@@ -21,6 +21,8 @@
 
 #include "nm-default.h"
 
+#include "nms-ifnet-connection-parser.h"
+
 #include <string.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
@@ -30,10 +32,9 @@
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 
-#include "net_utils.h"
-#include "wpa_parser.h"
-#include "connection_parser.h"
-#include "nm-ifnet-connection.h"
+#include "nms-ifnet-net-utils.h"
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-connection.h"
 
 static char *
 connection_id_from_ifnet_name (const char *conn_name)

src/settings/plugins/ifnet/nms-ifnet-connection-parser.h

@@ -21,8 +21,10 @@
 
 #ifndef _CONNECTION_PARSER_H
 #define _CONNECTION_PARSER_H
+
 #include <nm-connection.h>
-#include "net_parser.h"
+
+#include "nms-ifnet-net-parser.h"
 
 gboolean ifnet_can_write_connection (NMConnection *connection, GError **error);
 

src/settings/plugins/ifnet/nms-ifnet-connection.c

@@ -21,7 +21,7 @@
 
 #include "nm-default.h"
 
-#include "nm-ifnet-connection.h"
+#include "nms-ifnet-connection.h"
 
 #include <string.h>
 #include <glib/gstdio.h>
@@ -32,11 +32,11 @@
 #include "nm-settings-connection.h"
 #include "nm-settings-plugin.h"
 
-#include "connection_parser.h"
-#include "net_parser.h"
-#include "net_utils.h"
-#include "wpa_parser.h"
-#include "plugin.h"
+#include "nms-ifnet-connection-parser.h"
+#include "nms-ifnet-net-parser.h"
+#include "nms-ifnet-net-utils.h"
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-plugin.h"
 
 /*****************************************************************************/
 

src/settings/plugins/ifnet/nms-ifnet-connection.h

@@ -23,7 +23,8 @@
 #define __NETWORKMANAGER_IFNET_CONNECTION_H__
 
 #include <nm-settings-connection.h>
-#include "net_parser.h"
+
+#include "nms-ifnet-net-parser.h"
 
 #define NM_TYPE_IFNET_CONNECTION            (nm_ifnet_connection_get_type ())
 #define NM_IFNET_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFNET_CONNECTION, NMIfnetConnection))

src/settings/plugins/ifnet/nms-ifnet-net-parser.c

@@ -21,18 +21,18 @@
 
 #include "nm-default.h"
 
+#include "nms-ifnet-net-parser.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
 #include "nm-settings-plugin.h"
-
-#include "plugin.h"
 #include "nm-platform.h"
 
-#include "net_parser.h"
-#include "net_utils.h"
+#include "nms-ifnet-plugin.h"
+#include "nms-ifnet-net-utils.h"
 
 /* Save all the connection information */
 static GHashTable *conn_table;

src/settings/plugins/ifnet/nms-ifnet-net-utils.c

@@ -21,6 +21,8 @@
 
 #include "nm-default.h"
 
+#include "nms-ifnet-net-utils.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -30,9 +32,9 @@
 #include "NetworkManagerUtils.h"
 #include "nm-settings-plugin.h"
 #include "nm-config.h"
-#include "net_utils.h"
-#include "wpa_parser.h"
-#include "net_parser.h"
+
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-net-parser.h"
 
 /* emit heading and tailing blank space, tab, character t */
 gchar *

src/settings/plugins/ifnet/nms-ifnet-net-utils.h

@@ -28,7 +28,8 @@
 
 #include <nm-setting-ip6-config.h>
 #include <nm-setting-ip4-config.h>
-#include "net_parser.h"
+
+#include "nms-ifnet-net-parser.h"
 
 #define has_default_ip4_route(conn_name) has_default_route((conn_name), &is_ip4_address)
 #define has_default_ip6_route(conn_name) has_default_route((conn_name), &is_ip6_address)

src/settings/plugins/ifnet/nms-ifnet-plugin.c

@@ -22,7 +22,7 @@
 
 #include "nm-default.h"
 
-#include "plugin.h"
+#include "nms-ifnet-plugin.h"
 
 #include <string.h>
 #include <gmodule.h>
@@ -34,11 +34,11 @@
 #include "nm-config.h"
 #include "NetworkManagerUtils.h"
 
-#include "nm-ifnet-connection.h"
-#include "net_utils.h"
-#include "net_parser.h"
-#include "wpa_parser.h"
-#include "connection_parser.h"
+#include "nms-ifnet-connection.h"
+#include "nms-ifnet-net-utils.h"
+#include "nms-ifnet-net-parser.h"
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-connection-parser.h"
 
 #define IFNET_PLUGIN_NAME_PRINT "ifnet"
 #define IFNET_PLUGIN_INFO "(C) 1999-2010 Gentoo Foundation, Inc. To report bugs please use bugs.gentoo.org with [networkmanager] or [qiaomuf] prefix."

src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c

@@ -21,13 +21,15 @@
 
 #include "nm-default.h"
 
+#include "nms-ifnet-wpa-parser.h"
+
 #include <string.h>
 #include <stdlib.h>
 
 #include "nm-settings-plugin.h"
-#include "wpa_parser.h"
-#include "net_parser.h"
-#include "net_utils.h"
+
+#include "nms-ifnet-net-parser.h"
+#include "nms-ifnet-net-utils.h"
 
 /* Security information */
 static GHashTable *wsec_table = NULL;

src/settings/plugins/ifnet/tests/test-ifnet.c

@@ -30,13 +30,13 @@
 
 #include "nm-utils.h"
 
+#include "nm-config.h"
 #include "nm-linux-platform.h"
 
-#include "net_parser.h"
-#include "net_utils.h"
-#include "wpa_parser.h"
-#include "connection_parser.h"
-#include "nm-config.h"
+#include "nms-ifnet-net-parser.h"
+#include "nms-ifnet-net-utils.h"
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-connection-parser.h"
 
 #include "nm-test-utils-core.h"