From b855c7b64ad16cbac9f521308720186d0f21d76d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 18 Jun 2014 20:46:45 +0200 Subject: [PATCH] team/trivial: rename NM_TEAM_ERROR* to NM_DEVICE_TEAM_ERROR* Signed-off-by: Thomas Haller --- src/devices/nm-device-team.c | 6 +++--- src/devices/nm-device-team.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/devices/nm-device-team.c b/src/devices/nm-device-team.c index 29fb88183..e9dfbf38a 100644 --- a/src/devices/nm-device-team.c +++ b/src/devices/nm-device-team.c @@ -51,7 +51,7 @@ G_DEFINE_TYPE (NMDeviceTeam, nm_device_team, NM_TYPE_DEVICE) #define NM_DEVICE_TEAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_TEAM, NMDeviceTeamPrivate)) -#define NM_TEAM_ERROR (nm_team_error_quark ()) +#define NM_DEVICE_TEAM_ERROR (nm_device_team_error_quark ()) static gboolean teamd_start (NMDevice *dev, NMSettingTeam *s_team); @@ -75,7 +75,7 @@ enum { /******************************************************************/ static GQuark -nm_team_error_quark (void) +nm_device_team_error_quark (void) { static GQuark quark = 0; if (!quark) @@ -889,5 +889,5 @@ nm_device_team_class_init (NMDeviceTeamClass *klass) G_TYPE_FROM_CLASS (klass), &dbus_glib_nm_device_team_object_info); - dbus_g_error_domain_register (NM_TEAM_ERROR, NULL, NM_TYPE_TEAM_ERROR); + dbus_g_error_domain_register (NM_DEVICE_TEAM_ERROR, NULL, NM_TYPE_TEAM_ERROR); } diff --git a/src/devices/nm-device-team.h b/src/devices/nm-device-team.h index fe1275c6b..32bc5fd86 100644 --- a/src/devices/nm-device-team.h +++ b/src/devices/nm-device-team.h @@ -35,9 +35,9 @@ G_BEGIN_DECLS #define NM_DEVICE_TEAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_TEAM, NMDeviceTeamClass)) typedef enum { - NM_TEAM_ERROR_CONNECTION_NOT_TEAM = 0, /*< nick=ConnectionNotTeam >*/ - NM_TEAM_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ - NM_TEAM_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ + NM_DEVICE_TEAM_ERROR_CONNECTION_NOT_TEAM = 0, /*< nick=ConnectionNotTeam >*/ + NM_DEVICE_TEAM_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_DEVICE_TEAM_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMTeamError; #define NM_DEVICE_TEAM_SLAVES "slaves"