NetworkManager r3287 - in trunk: . system-settings/plugins/ifcfg-fedora

[dcbw svn gnome org]

Author: dcbw
Date: Mon Feb  4 19:31:20 2008
New Revision: 3287
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3287&view=rev

Log:
2008-02-04  Dan Williams  <dcbw redhat com>

	* system-settings/plugins/ifcfg-fedora/plugin.c
		- Change reported name to 'ifcfg-fedora'
		- Use IFCFG_PLUGIN_NAME

	* system-settings/plugins/ifcfg-fedora/plugin.c
		- Remove PLUGIN_NAME, use IFCFG_PLUGIN_NAME instead



Modified:
   trunk/ChangeLog
   trunk/system-settings/plugins/ifcfg-fedora/plugin.c
   trunk/system-settings/plugins/ifcfg-fedora/plugin.h

Modified: trunk/system-settings/plugins/ifcfg-fedora/plugin.c
==============================================================================
--- trunk/system-settings/plugins/ifcfg-fedora/plugin.c	(original)
+++ trunk/system-settings/plugins/ifcfg-fedora/plugin.c	Mon Feb  4 19:31:20 2008
@@ -33,8 +33,8 @@
 #include "shvar.h"
 #include "nm-system-config-interface.h"
 
-#define IFCFG_PLUGIN_NAME "ifcfg"
-#define IFCFG_PLUGIN_INFO "(C) 2007 Red Hat, Inc.  To report bugs please use the NetworkManager mailing list."
+#define IFCFG_PLUGIN_NAME "ifcfg-fedora"
+#define IFCFG_PLUGIN_INFO "(c) 2007 - 2008 Red Hat, Inc.  To report bugs please use the NetworkManager mailing list."
 
 static void system_config_interface_init (NMSystemConfigInterface *system_config_interface_class);
 
@@ -149,7 +149,7 @@
 	ifcfg_file = g_build_filename (profile_path, filename, NULL);
 	g_return_val_if_fail (ifcfg_file != NULL, NULL);
 
-	PLUGIN_PRINT (PLUGIN_NAME, "parsing %s ... ", ifcfg_file);
+	PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "parsing %s ... ", ifcfg_file);
 
 	connection = parser_parse_file (ifcfg_file, &error);
 	if (connection) {
@@ -158,11 +158,11 @@
 		s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
 		g_assert (s_con);
 		g_assert (s_con->id);
-		PLUGIN_PRINT (PLUGIN_NAME, "    found connection '%s'", s_con->id);
+		PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "    found connection '%s'", s_con->id);
 		g_object_set_data_full (G_OBJECT (connection), IFCFG_FILE_PATH_TAG,
 		                        ifcfg_file, (GDestroyNotify) g_free);
 	} else {
-		PLUGIN_PRINT (PLUGIN_NAME, "    error: %s",
+		PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "    error: %s",
 		              error->message ? error->message : "(unknown)");
 		g_free (ifcfg_file);
 	}
@@ -184,7 +184,7 @@
 
 	dir = g_dir_open (profile_path, 0, NULL);
 	if (!dir) {
-		PLUGIN_WARN (PLUGIN_NAME, "couldn't access network profile directory '%s'.", profile_path);
+		PLUGIN_WARN (IFCFG_PLUGIN_NAME, "couldn't access network profile directory '%s'.", profile_path);
 		return NULL;
 	}
 
@@ -221,7 +221,7 @@
 	int wd = GPOINTER_TO_INT (value);
 
 	if (inotify_rm_watch (ifd, wd) != 0)
-		PLUGIN_WARN (PLUGIN_NAME, "error removing inotify watch on %s", (char *) key);
+		PLUGIN_WARN (IFCFG_PLUGIN_NAME, "error removing inotify watch on %s", (char *) key);
 }
 
 static void
@@ -325,7 +325,7 @@
 				/* couldn't replace the settings for some reason; have to
 				 * remove the connection then.
 				 */
-				PLUGIN_WARN (PLUGIN_NAME, "couldn't update connection for '%s'.", filename);
+				PLUGIN_WARN (IFCFG_PLUGIN_NAME, "couldn't update connection for '%s'.", filename);
 				priv->connections = g_slist_remove (priv->connections, existing);
 				g_signal_emit_by_name (plugin, "connection-removed", existing);
 				g_object_unref (existing);
@@ -439,11 +439,11 @@
 
 	priv->profile = get_current_profile_path ();
 	if (!priv->profile)
-		PLUGIN_WARN (PLUGIN_NAME, "could not determine network profile path.");
+		PLUGIN_WARN (IFCFG_PLUGIN_NAME, "could not determine network profile path.");
 
 	priv->ifd = sc_plugin_inotify_init (plugin, &error);
 	if (error) {
-		PLUGIN_PRINT (PLUGIN_NAME, "    inotify error: %s",
+		PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "    inotify error: %s",
 		              error->message ? error->message : "(unknown)");
 	}
 }

Modified: trunk/system-settings/plugins/ifcfg-fedora/plugin.h
==============================================================================
--- trunk/system-settings/plugins/ifcfg-fedora/plugin.h	(original)
+++ trunk/system-settings/plugins/ifcfg-fedora/plugin.h	Mon Feb  4 19:31:20 2008
@@ -24,8 +24,6 @@
 
 #include <glib-object.h>
 
-#define PLUGIN_NAME "ifcfg"
-
 #define SC_TYPE_PLUGIN_IFCFG            (sc_plugin_ifcfg_get_type ())
 #define SC_PLUGIN_IFCFG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfg))
 #define SC_PLUGIN_IFCFG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfgClass))