diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-10-28 16:25:29 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-10-28 16:25:29 +1300 |
| commit | 14301de77881819ae395c5ed3fe60120970223c3 (patch) | |
| tree | 25073a07caad1bddfaf98a9e18ee6942c4e1d7bf | |
| parent | 0a2e5336c54359c6e94ba22a016be4dd363b6346 (diff) | |
| download | lightdm-14301de77881819ae395c5ed3fe60120970223c3.tar.gz | |
Merge log-mode.h into log-file.h
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/log-file.h | 7 | ||||
| -rw-r--r-- | src/log-mode.h | 22 | ||||
| -rw-r--r-- | src/process.h | 2 | ||||
| -rw-r--r-- | src/session-child.c | 1 | ||||
| -rw-r--r-- | src/session.h | 2 |
6 files changed, 8 insertions, 27 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c011e12c..e99509ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,6 @@ lightdm_SOURCES = \ login1.h \ log-file.c \ log-file.h \ - log-mode.h \ mir-server.c \ mir-server.h \ plymouth.c \ diff --git a/src/log-file.h b/src/log-file.h index bfaee29f..5081bf45 100644 --- a/src/log-file.h +++ b/src/log-file.h @@ -14,7 +14,12 @@ #include <glib.h> -#include "log-mode.h" +typedef enum +{ + LOG_MODE_INVALID = -1, + LOG_MODE_BACKUP_AND_TRUNCATE, + LOG_MODE_APPEND +} LogMode; int log_file_open (const gchar *log_filename, LogMode log_mode); diff --git a/src/log-mode.h b/src/log-mode.h deleted file mode 100644 index 65e39e0a..00000000 --- a/src/log-mode.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2015 Alexandros Frantzis - * Author: Alexandros Frantzis <alexandros.frantzis@canonical.com> - * - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation, either version 3 of the License, or (at your option) any later - * version. See http://www.gnu.org/copyleft/gpl.html the full text of the - * license. - */ - -#ifndef LOG_MODE_H_ -#define LOG_MODE_H_ - -typedef enum -{ - LOG_MODE_INVALID = -1, - LOG_MODE_BACKUP_AND_TRUNCATE, - LOG_MODE_APPEND -} LogMode; - -#endif /* !LOD_MODE_H_ */ diff --git a/src/process.h b/src/process.h index 8a0f2e17..c358048a 100644 --- a/src/process.h +++ b/src/process.h @@ -14,7 +14,7 @@ #include <glib-object.h> -#include "log-mode.h" +#include "log-file.h" G_BEGIN_DECLS diff --git a/src/session-child.c b/src/session-child.c index d5634171..9dd079c0 100644 --- a/src/session-child.c +++ b/src/session-child.c @@ -27,7 +27,6 @@ #include "console-kit.h" #include "login1.h" #include "log-file.h" -#include "log-mode.h" #include "privileges.h" #include "x-authority.h" #include "configuration.h" diff --git a/src/session.h b/src/session.h index 50f9cf2a..800d0a71 100644 --- a/src/session.h +++ b/src/session.h @@ -23,7 +23,7 @@ typedef struct Session Session; #include "accounts.h" #include "x-authority.h" #include "logger.h" -#include "log-mode.h" +#include "log-file.h" G_BEGIN_DECLS |