Properly name types header file for daemon

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 72d65c0..f628426 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ EXTRA_DIST += udisks-daemon-marshal.list
 noinst_LTLIBRARIES = libudisks-daemon.la
 
 libudisks_daemon_la_SOURCES =                                          \
-       types.h                                                         \
+       udisksdaemontypes.h                                             \
        gposixsignal.h                  gposixsignal.c                  \
        udisksdaemon.h                  udisksdaemon.c                  \
        udisksprovider.h                udisksprovider.c                \

diff --git a/src/main.c b/src/main.c
index 57be63f..9d50ecb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,7 @@
 
 #include "gposixsignal.h"
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 #include "udisksdaemon.h"
 
 /* ---------------------------------------------------------------------------------------------------- */

diff --git a/src/tests/test.c b/src/tests/test.c
index 509c33c..110d62e 100644 (file)
--- a/src/tests/test.c
+++ b/src/tests/test.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include <types.h>
+#include <udisksdaemontypes.h>
 #include <udisksdaemon.h>
 #include <udisksspawnedjob.h>
 #include <udisksthreadedjob.h>

diff --git a/src/udisksbasejob.h b/src/udisksbasejob.h
index 3e32b66..3e1a261 100644 (file)
--- a/src/udisksbasejob.h
+++ b/src/udisksbasejob.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_BASE_JOB_H__
 #define __UDISKS_BASE_JOB_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udisksdaemon.h b/src/udisksdaemon.h
index 2047d17..5bf9aba 100644 (file)
--- a/src/udisksdaemon.h
+++ b/src/udisksdaemon.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_DAEMON_H__
 #define __UDISKS_DAEMON_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/types.h b/src/udisksdaemontypes.h
similarity index 100%
rename from src/types.h
rename to src/udisksdaemontypes.h

diff --git a/src/udisksdaemonutil.h b/src/udisksdaemonutil.h
index 0373a85..7d2faec 100644 (file)
--- a/src/udisksdaemonutil.h
+++ b/src/udisksdaemonutil.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_DAEMON_UTIL_H__
 #define __UDISKS_DAEMON_UTIL_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udisksfstabprovider.h b/src/udisksfstabprovider.h
index a32c26b..ad31f7c 100644 (file)
--- a/src/udisksfstabprovider.h
+++ b/src/udisksfstabprovider.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_FSTAB_PROVIDER_H__
 #define __UDISKS_FSTAB_PROVIDER_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udisksiscsiprovider.h b/src/udisksiscsiprovider.h
index 77005f2..e3fdb5d 100644 (file)
--- a/src/udisksiscsiprovider.h
+++ b/src/udisksiscsiprovider.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_ISCSI_PROVIDER_H__
 #define __UDISKS_ISCSI_PROVIDER_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udiskslinuxblock.h b/src/udiskslinuxblock.h
index 1ae7330..9e7fd5b 100644 (file)
--- a/src/udiskslinuxblock.h
+++ b/src/udiskslinuxblock.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_LINUX_BLOCK_H__
 #define __UDISKS_LINUX_BLOCK_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 #include <gudev/gudev.h>
 
 G_BEGIN_DECLS

diff --git a/src/udiskslinuxfilesystem.h b/src/udiskslinuxfilesystem.h
index 9b32b0b..73afea4 100644 (file)
--- a/src/udiskslinuxfilesystem.h
+++ b/src/udiskslinuxfilesystem.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_LINUX_FILESYSTEM_H__
 #define __UDISKS_LINUX_FILESYSTEM_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udiskslinuxlun.h b/src/udiskslinuxlun.h
index 1a90d79..679dcce 100644 (file)
--- a/src/udiskslinuxlun.h
+++ b/src/udiskslinuxlun.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_LINUX_LUN_H__
 #define __UDISKS_LINUX_LUN_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 #include <gudev/gudev.h>
 
 G_BEGIN_DECLS

diff --git a/src/udiskslinuxprovider.h b/src/udiskslinuxprovider.h
index 9f8ac3d..fd1ec5c 100644 (file)
--- a/src/udiskslinuxprovider.h
+++ b/src/udiskslinuxprovider.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_LINUX_PROVIDER_H__
 #define __UDISKS_LINUX_PROVIDER_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 #include <gudev/gudev.h>
 
 G_BEGIN_DECLS

diff --git a/src/udisksmount.h b/src/udisksmount.h
index afa0bd5..b88823d 100644 (file)
--- a/src/udisksmount.h
+++ b/src/udisksmount.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_MOUNT_H__
 #define __UDISKS_MOUNT_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udisksmountmonitor.h b/src/udisksmountmonitor.h
index 2e4a2cc..79ffcf1 100644 (file)
--- a/src/udisksmountmonitor.h
+++ b/src/udisksmountmonitor.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_MOUNT_MONITOR_H__
 #define __UDISKS_MOUNT_MONITOR_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udiskspersistentstore.h b/src/udiskspersistentstore.h
index 1c80f0d..977e757 100644 (file)
--- a/src/udiskspersistentstore.h
+++ b/src/udiskspersistentstore.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_PERSISTENT_STORE_H__
 #define __UDISKS_PERSISTENT_STORE_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udisksprivate.h b/src/udisksprivate.h
index 30bf3b9..cc9b8af 100644 (file)
--- a/src/udisksprivate.h
+++ b/src/udisksprivate.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_PRIVATE_H__
 #define __UDISKS_PRIVATE_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udisksprovider.h b/src/udisksprovider.h
index 85177a6..83f5e24 100644 (file)
--- a/src/udisksprovider.h
+++ b/src/udisksprovider.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_PROVIDER_H__
 #define __UDISKS_PROVIDER_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udiskssimplejob.h b/src/udiskssimplejob.h
index 0b43350..c61ca4f 100644 (file)
--- a/src/udiskssimplejob.h
+++ b/src/udiskssimplejob.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_SIMPLE_JOB_H__
 #define __UDISKS_SIMPLE_JOB_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udisksspawnedjob.h b/src/udisksspawnedjob.h
index 309971d..ad62418 100644 (file)
--- a/src/udisksspawnedjob.h
+++ b/src/udisksspawnedjob.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_SPAWNED_JOB_H__
 #define __UDISKS_SPAWNED_JOB_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/udisksthreadedjob.h b/src/udisksthreadedjob.h
index 0820439..800fd84 100644 (file)
--- a/src/udisksthreadedjob.h
+++ b/src/udisksthreadedjob.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_THREADED_JOB_H__
 #define __UDISKS_THREADED_JOB_H__
 
-#include "types.h"
+#include "udisksdaemontypes.h"
 
 G_BEGIN_DECLS