diff options
| author | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:53 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:53 +0100 |
| commit | 4d939c60d4ac257a2977871baf3b8b3671b5a4f7 (patch) | |
| tree | 318c08dea542d7865422af76e2d36a9559340cd3 /src/nm-session-utils.h | |
| parent | bb9eef75b2aaaab741e2b99911c8be3db6d1bc0b (diff) | |
| parent | 2c032d8f1c6292c1338a615e6ec40252889ba85c (diff) | |
Merge tag 'upstream/1.0.0' into experimental
Upstream version 1.0.0
Diffstat (limited to 'src/nm-session-utils.h')
| -rw-r--r-- | src/nm-session-utils.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/nm-session-utils.h b/src/nm-session-utils.h index 54b6d4c4..e626f52a 100644 --- a/src/nm-session-utils.h +++ b/src/nm-session-utils.h @@ -17,23 +17,12 @@ * Author: Dan Williams <dcbw@redhat.com> */ -#ifndef NM_SESSION_UTILS_H -#define NM_SESSION_UTILS_H +#ifndef __NETWORKMANAGER_SESSION_UTILS_H__ +#define __NETWORKMANAGER_SESSION_UTILS_H__ #include <glib.h> #include <glib-object.h> -#define NM_SESSION_MONITOR_ERROR (nm_session_monitor_error_quark ()) -GQuark nm_session_monitor_error_quark (void) G_GNUC_CONST; -GType nm_session_monitor_error_get_type (void) G_GNUC_CONST; - -typedef enum { - NM_SESSION_MONITOR_ERROR_IO_ERROR = 0, /*< nick=IOError >*/ - NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, /*< nick=MalformedDatabase >*/ - NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, /*< nick=UnknownUser >*/ - NM_SESSION_MONITOR_ERROR_NO_DATABASE, /*< nick=NoDatabase >*/ -} NMSessionMonitorError; - gboolean nm_session_uid_to_user (uid_t uid, const char **out_user, GError **error); gboolean nm_session_user_to_uid (const char *user, uid_t *out_uid, GError **error); |