colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/rm-userset'

Browse Source 
There; it's merged.  Yay!
This commit is contained in:
Dan Williams
2011-02-12 22:51:12 -06:00
parent 5f6b68862e e08db5cae5
commit 6d344a43e9
267 changed files with 18303 additions and 11381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/logging/nm-logging.c
View File

@@ -41,8 +41,8 @@ static guint32 log_level = LOGL_INFO | LOGL_WARN | LOGL_ERR;
static guint32 log_domains = \
LOGD_HW | LOGD_RFKILL | LOGD_ETHER | LOGD_WIFI | LOGD_BT | LOGD_MB | \
LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_IP4 | LOGD_IP6 | LOGD_AUTOIP4 | \
LOGD_DNS | LOGD_VPN | LOGD_SHARING | LOGD_SUPPLICANT | LOGD_USER_SET | \
LOGD_SYS_SET | LOGD_SUSPEND | LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | \
LOGD_DNS | LOGD_VPN | LOGD_SHARING | LOGD_SUPPLICANT | LOGD_AGENTS | \
LOGD_SETTINGS | LOGD_SUSPEND | LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | \
LOGD_WIMAX;
typedef struct {
@@ -77,8 +77,8 @@ static const LogDesc domain_descs[] = {
{ LOGD_VPN, "VPN" },
{ LOGD_SHARING, "SHARING" },
{ LOGD_SUPPLICANT,"SUPPLICANT" },
{ LOGD_USER_SET, "USER_SET" },
{ LOGD_SYS_SET, "SYS_SET" },
{ LOGD_AGENTS, "AGENTS" },
{ LOGD_SETTINGS, "SETTINGS" },
{ LOGD_SUSPEND, "SUSPEND" },
{ LOGD_CORE, "CORE" },
{ LOGD_DEVICE, "DEVICE" },

4
src/logging/nm-logging.h
View File

@@ -45,8 +45,8 @@ enum {
LOGD_VPN = 0x00004000,
LOGD_SHARING = 0x00008000, /* Connection sharing/dnsmasq */
LOGD_SUPPLICANT = 0x00010000, /* WiFi and 802.1x */
LOGD_USER_SET = 0x00020000, /* User settings */
LOGD_SYS_SET = 0x00040000, /* System settings */
LOGD_AGENTS = 0x00020000, /* Secret agents */
LOGD_SETTINGS = 0x00040000, /* Settings */
LOGD_SUSPEND = 0x00080000, /* Suspend/Resume */
LOGD_CORE = 0x00100000, /* Core daemon and policy stuff */
LOGD_DEVICE = 0x00200000, /* Device state and activation */