[gtk+/wip/attachment-parameters-3: 27/27] tmp

[William Hua <williamhua src gnome org>]

commit f913251ebfd37a2b97a8c0f3531259af81b10428
Author: William Hua <william hua canonical com>
Date:   Thu Oct 22 18:11:32 2015 -0400

    tmp

 gdk/Makefile.am                   |    6 +++---
 gdk/broadway/gdkwindow-broadway.c |    2 +-
 gdk/gdk.h                         |    2 +-
 gdk/gdkattachinfo.c               |    3 +--
 gdk/gdkattachinfoprivate.h        |    2 +-
 gdk/gdkwindow.h                   |    2 +-
 gdk/gdkwindowimpl.h               |    2 +-
 gdk/mir/gdkmirwindowimpl.c        |    2 +-
 gdk/wayland/gdkwindow-wayland.c   |    2 +-
 gdk/x11/gdkwindow-x11.c           |    2 +-
 10 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index c32404b..d266fd7 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -63,7 +63,7 @@ gdk_public_h_sources =                                \
        gdk.h                                   \
        gdk-autocleanup.h                       \
        gdkapplaunchcontext.h                   \
-       gdkattachmentparameters.h               \
+       gdkattachinfo.h                         \
        gdkcairo.h                              \
        gdkcursor.h                             \
        gdkdevice.h                             \
@@ -103,7 +103,7 @@ gdk_h_sources =                                     \
 gdk_private_headers =                          \
        gdk-private.h                           \
        gdkapplaunchcontextprivate.h            \
-       gdkattachmentparametersprivate.h        \
+       gdkattachinfoprivate.h                  \
        gdkcursorprivate.h                      \
        gdkdevicemanagerprivate.h               \
        gdkdeviceprivate.h                      \
@@ -128,7 +128,7 @@ gdk_c_sources =                             \
        gdk-private.c                           \
        gdk.c                                   \
        gdkapplaunchcontext.c                   \
-       gdkattachmentparameters.c               \
+       gdkattachinfo.c                         \
        gdkcairo.c                              \
        gdkcursor.c                             \
        gdkdeprecated.c                         \
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 13a34c6..654ec92 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -37,7 +37,7 @@
 #include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
 #include "gdkeventsource.h"
-#include "gdkattachmentparametersprivate.h"
+#include "gdkattachinfoprivate.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/gdk/gdk.h b/gdk/gdk.h
index d88bfb9..d394e74 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -30,7 +30,7 @@
 #include <gdk/gdkconfig.h>
 #include <gdk/gdkversionmacros.h>
 #include <gdk/gdkapplaunchcontext.h>
-#include <gdk/gdkattachmentparameters.h>
+#include <gdk/gdkattachinfo.h>
 #include <gdk/gdkcairo.h>
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkdevice.h>
diff --git a/gdk/gdkattachinfo.c b/gdk/gdkattachinfo.c
index 8d764e7..0c2f1d4 100644
--- a/gdk/gdkattachinfo.c
+++ b/gdk/gdkattachinfo.c
@@ -1,7 +1,6 @@
 #include "config.h"
 
-#include "gdkattachmentparameters.h"
-#include "gdkattachmentparametersprivate.h"
+#include "gdkattachinfoprivate.h"
 #include "gdkscreen.h"
 #include "gdkwindow.h"
 
diff --git a/gdk/gdkattachinfoprivate.h b/gdk/gdkattachinfoprivate.h
index 423f96f..da74d3a 100644
--- a/gdk/gdkattachinfoprivate.h
+++ b/gdk/gdkattachinfoprivate.h
@@ -1,7 +1,7 @@
 #ifndef __GDK_ATTACHMENT_PARAMETERS_PRIVATE_H__
 #define __GDK_ATTACHMENT_PARAMETERS_PRIVATE_H__
 
-#include "gdkattachmentparameters.h"
+#include "gdkattachinfo.h"
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 2795883..808ac13 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -33,7 +33,7 @@
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkframeclock.h>
-#include <gdk/gdkattachmentparameters.h>
+#include <gdk/gdkattachinfo.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h
index 0d7e0ce..244fb83 100644
--- a/gdk/gdkwindowimpl.h
+++ b/gdk/gdkwindowimpl.h
@@ -27,7 +27,7 @@
 
 #include <gdk/gdkwindow.h>
 #include <gdk/gdkproperty.h>
-#include <gdk/gdkattachmentparameters.h>
+#include <gdk/gdkattachinfo.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index a2b1700..161c0df 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -28,7 +28,7 @@
 #include "gdkintl.h"
 #include "gdkdisplayprivate.h"
 #include "gdkdeviceprivate.h"
-#include "gdkattachmentparametersprivate.h"
+#include "gdkattachinfoprivate.h"
 
 #define GDK_MIR_WINDOW_IMPL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW_IMPL_MIR, 
GdkMirWindowImplClass))
 #define GDK_IS_WINDOW_IMPL_MIR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW_IMPL_MIR))
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 005ebbf..a3ddbc1 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -31,7 +31,7 @@
 #include "gdkprivate-wayland.h"
 #include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
-#include "gdkattachmentparametersprivate.h"
+#include "gdkattachinfoprivate.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 4a19098..696e0a4 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -39,7 +39,7 @@
 #include "gdkglcontext-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdk-private.h"
-#include "gdkattachmentparametersprivate.h"
+#include "gdkattachinfoprivate.h"
 
 #include <stdlib.h>
 #include <stdio.h>