Use glib top-level includes

glib HEAD complains about this now

 /usr/include/glib-2.0/glib/gtypes.h:28:2: error: #error "Only <glib.h> can be included directly."

Also nuke some trailing whitespace.

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

diff --git a/src/udiskslinuxfsinfo.c b/src/udiskslinuxfsinfo.c
index 8a485dc..0fa2262 100644 (file)
--- a/src/udiskslinuxfsinfo.c
+++ b/src/udiskslinuxfsinfo.c
@@ -26,68 +26,68 @@
 
 const FSInfo _fs_info[] =
   {
-    { 
-      "ext2", 
-      "e2label $DEVICE $LABEL", 
+    {
+      "ext2",
+      "e2label $DEVICE $LABEL",
       NULL,
       TRUE,
     },
-    { 
-      "ext3", 
-      "e2label $DEVICE $LABEL", 
+    {
+      "ext3",
+      "e2label $DEVICE $LABEL",
       NULL,
       TRUE,
     },
-    { 
-      "ext4", 
-      "e2label $DEVICE $LABEL", 
+    {
+      "ext4",
+      "e2label $DEVICE $LABEL",
       NULL,
       TRUE,
     },
     {
-      "vfat", 
-      "mlabel -i $DEVICE ::$LABEL", 
+      "vfat",
+      "mlabel -i $DEVICE ::$LABEL",
       "mlabel -i $DEVICE -c ::",
       FALSE,
     },
-    { 
+    {
       "ntfs",
       "ntfslabel $DEVICE $LABEL",
       NULL,
       FALSE,
     },
-    { 
+    {
       "xfs",
-      "xfs_admin -L $LABEL $DEVICE", 
-      "xfs_admin -L -- $DEVICE", 
+      "xfs_admin -L $LABEL $DEVICE",
+      "xfs_admin -L -- $DEVICE",
       FALSE,
     },
-    { 
+    {
       "reiserfs",
-      "reiserfstune -l $LABEL $DEVICE", 
+      "reiserfstune -l $LABEL $DEVICE",
       NULL,
       FALSE,
     },
-    { 
+    {
       "nilfs2",
       "nilfs-tune -L $LABEL $DEVICE",
       NULL,
       FALSE,
     },
     {
-      "btrfs", 
-      NULL, 
+      "btrfs",
+      NULL,
       NULL,
       FALSE,
     },
     {
-      "minix", 
+      "minix",
       NULL,
       NULL,
       FALSE,
     },
     {
-      "swap", 
+      "swap",
       NULL,
       NULL,
       FALSE,

diff --git a/src/udiskslinuxfsinfo.h b/src/udiskslinuxfsinfo.h
index bb34082..a69aee2 100644 (file)
--- a/src/udiskslinuxfsinfo.h
+++ b/src/udiskslinuxfsinfo.h
@@ -21,7 +21,7 @@
 #ifndef __UDISKS_LINUX_FSINFO_H__
 #define __UDISKS_LINUX_FSINFO_H__
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS