[metacity] compositor: remove is_our_xwindow vfunc
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] compositor: remove is_our_xwindow vfunc
- Date: Wed, 15 Mar 2017 15:40:37 +0000 (UTC)
commit 0e5f8a5e7e9cee999533942ecb6ce36f52a1bc0e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Mar 15 17:34:24 2017 +0200
compositor: remove is_our_xwindow vfunc
src/compositor/meta-compositor-none.c | 8 --------
src/compositor/meta-compositor-private.h | 3 ---
src/compositor/meta-compositor-vulkan.c | 8 --------
src/compositor/meta-compositor-xrender.c | 8 --------
src/compositor/meta-compositor.c | 4 +---
5 files changed, 1 insertions(+), 30 deletions(-)
---
diff --git a/src/compositor/meta-compositor-none.c b/src/compositor/meta-compositor-none.c
index 282a261..eea9396 100644
--- a/src/compositor/meta-compositor-none.c
+++ b/src/compositor/meta-compositor-none.c
@@ -110,13 +110,6 @@ meta_compositor_none_sync_stack (MetaCompositor *compositor,
{
}
-static gboolean
-meta_compositor_none_is_our_xwindow (MetaCompositor *compositor,
- Window xwindow)
-{
- return FALSE;
-}
-
static void
meta_compositor_none_class_init (MetaCompositorNoneClass *none_class)
{
@@ -137,7 +130,6 @@ meta_compositor_none_class_init (MetaCompositorNoneClass *none_class)
compositor_class->maximize_window = meta_compositor_none_maximize_window;
compositor_class->unmaximize_window = meta_compositor_none_unmaximize_window;
compositor_class->sync_stack = meta_compositor_none_sync_stack;
- compositor_class->is_our_xwindow = meta_compositor_none_is_our_xwindow;
}
static void
diff --git a/src/compositor/meta-compositor-private.h b/src/compositor/meta-compositor-private.h
index 0f48511..9d6bff1 100644
--- a/src/compositor/meta-compositor-private.h
+++ b/src/compositor/meta-compositor-private.h
@@ -69,9 +69,6 @@ struct _MetaCompositorClass
void (* sync_stack) (MetaCompositor *compositor,
GList *stack);
-
- gboolean (* is_our_xwindow) (MetaCompositor *compositor,
- Window xwindow);
};
gboolean meta_compositor_check_extensions (MetaCompositor *compositor,
diff --git a/src/compositor/meta-compositor-vulkan.c b/src/compositor/meta-compositor-vulkan.c
index a9b9470..da67e55 100644
--- a/src/compositor/meta-compositor-vulkan.c
+++ b/src/compositor/meta-compositor-vulkan.c
@@ -622,13 +622,6 @@ meta_compositor_vulkan_sync_stack (MetaCompositor *compositor,
{
}
-static gboolean
-meta_compositor_vulkan_is_our_xwindow (MetaCompositor *compositor,
- Window xwindow)
-{
- return FALSE;
-}
-
static void
meta_compositor_vulkan_class_init (MetaCompositorVulkanClass *vulkan_class)
{
@@ -653,7 +646,6 @@ meta_compositor_vulkan_class_init (MetaCompositorVulkanClass *vulkan_class)
compositor_class->maximize_window = meta_compositor_vulkan_maximize_window;
compositor_class->unmaximize_window = meta_compositor_vulkan_unmaximize_window;
compositor_class->sync_stack = meta_compositor_vulkan_sync_stack;
- compositor_class->is_our_xwindow = meta_compositor_vulkan_is_our_xwindow;
}
static void
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 474dbeb..521b3a2 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -3062,13 +3062,6 @@ meta_compositor_xrender_sync_stack (MetaCompositor *compositor,
add_repair (xrender);
}
-static gboolean
-meta_compositor_xrender_is_our_xwindow (MetaCompositor *compositor,
- Window xwindow)
-{
- return FALSE;
-}
-
static void
meta_compositor_xrender_class_init (MetaCompositorXRenderClass *xrender_class)
{
@@ -3094,7 +3087,6 @@ meta_compositor_xrender_class_init (MetaCompositorXRenderClass *xrender_class)
compositor_class->maximize_window = meta_compositor_xrender_maximize_window;
compositor_class->unmaximize_window = meta_compositor_xrender_unmaximize_window;
compositor_class->sync_stack = meta_compositor_xrender_sync_stack;
- compositor_class->is_our_xwindow = meta_compositor_xrender_is_our_xwindow;
}
static void
diff --git a/src/compositor/meta-compositor.c b/src/compositor/meta-compositor.c
index 4b8af1e..5afa21e 100644
--- a/src/compositor/meta-compositor.c
+++ b/src/compositor/meta-compositor.c
@@ -378,10 +378,8 @@ meta_compositor_is_our_xwindow (MetaCompositor *compositor,
Window xwindow)
{
MetaCompositorPrivate *priv;
- MetaCompositorClass *compositor_class;
priv = meta_compositor_get_instance_private (compositor);
- compositor_class = META_COMPOSITOR_GET_CLASS (compositor);
if (priv->cm_window == xwindow)
return TRUE;
@@ -389,7 +387,7 @@ meta_compositor_is_our_xwindow (MetaCompositor *compositor,
if (priv->overlay_window == xwindow)
return TRUE;
- return compositor_class->is_our_xwindow (compositor, xwindow);
+ return FALSE;
}
gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]