From 3efbb756198101af02caed19b29e9d0b129268d1 Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Sun, 27 Nov 2016 21:31:21 -0500
Subject: [PATCH] mir: fix build failures

---
 gdk/mir/gdkmirdrawingcontext.c |  1 +
 gdk/mir/gdkmirscreen.c         | 65 ----------------------------------
 gdk/mir/gdkmirwindowimpl.c     |  2 --
 3 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/gdk/mir/gdkmirdrawingcontext.c b/gdk/mir/gdkmirdrawingcontext.c
index e888a4abaa..af82fcd0b7 100644
--- a/gdk/mir/gdkmirdrawingcontext.c
+++ b/gdk/mir/gdkmirdrawingcontext.c
@@ -16,6 +16,7 @@
  */
 
 #include "config.h"
+#include "gdk/gdkdrawingcontextprivate.h"
 
 #define GDK_TYPE_MIR_DRAWING_CONTEXT                (gdk_mir_drawing_context_get_type ())
 #define GDK_MIR_DRAWING_CONTEXT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_MIR_DRAWING_CONTEXT, GdkMirDrawingContext))
diff --git a/gdk/mir/gdkmirscreen.c b/gdk/mir/gdkmirscreen.c
index 668da6073b..a723084919 100644
--- a/gdk/mir/gdkmirscreen.c
+++ b/gdk/mir/gdkmirscreen.c
@@ -25,7 +25,6 @@
 #include "gdkmir-private.h"
 
 #define VISUAL_TYPE GDK_VISUAL_TRUE_COLOR
-#define VISUAL_DEPTH 32
 
 typedef struct GdkMirScreen      GdkMirScreen;
 typedef struct GdkMirScreenClass GdkMirScreenClass;
@@ -91,29 +90,6 @@ get_screen_size (MirDisplayConfiguration *config, gint *width, gint *height)
     }
 }
 
-static void
-get_screen_size_mm (MirDisplayConfiguration *config, gint *width, gint *height)
-{
-  uint32_t i;
-
-  *width = 0;
-  *height = 0;
-
-  if (!config)
-    return;
-
-  for (i = 0; i < config->num_outputs; i++)
-    {
-      MirDisplayOutput *o = &config->outputs[i];
-
-      if (!o->used)
-        continue;
-
-      *width += o->physical_width_mm;
-      *height += o->physical_height_mm;
-    }
-}
-
 static void
 update_display_config (GdkMirScreen *screen)
 {
@@ -196,42 +172,6 @@ get_output (GdkScreen *screen, gint monitor_num)
   return NULL;
 }
 
-static gint
-gdk_mir_screen_get_width (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_get_width\n");
-  gint width, height;
-  get_screen_size (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
-  return width;
-}
-
-static gint
-gdk_mir_screen_get_height (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_get_height\n");
-  gint width, height;
-  get_screen_size (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
-  return height;
-}
-
-static gint
-gdk_mir_screen_get_width_mm (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_get_width_mm\n");
-  gint width, height;
-  get_screen_size_mm (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
-  return width;
-}
-
-static gint
-gdk_mir_screen_get_height_mm (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_get_height_mm\n");
-  gint width, height;
-  get_screen_size_mm (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
-  return height;
-}
-
 static GdkWindow *
 gdk_mir_screen_get_root_window (GdkScreen *screen)
 {
@@ -247,7 +187,6 @@ gdk_mir_screen_get_root_window (GdkScreen *screen)
   s->root_window = _gdk_display_create_window (s->display);
   s->root_window->impl_window = s->root_window;
   s->root_window->window_type = GDK_WINDOW_ROOT;
-  s->root_window->depth = VISUAL_DEPTH;
   s->root_window->x = 0;
   s->root_window->y = 0;
   s->root_window->abs_x = 0;
@@ -667,10 +606,6 @@ gdk_mir_screen_class_init (GdkMirScreenClass *klass)
   object_class->finalize = gdk_mir_screen_finalize;
 
   screen_class->get_display = gdk_mir_screen_get_display;
-  screen_class->get_width = gdk_mir_screen_get_width;
-  screen_class->get_height = gdk_mir_screen_get_height;
-  screen_class->get_width_mm = gdk_mir_screen_get_width_mm;
-  screen_class->get_height_mm = gdk_mir_screen_get_height_mm;
   screen_class->get_root_window = gdk_mir_screen_get_root_window;
   screen_class->get_n_monitors = gdk_mir_screen_get_n_monitors;
   screen_class->get_primary_monitor = gdk_mir_screen_get_primary_monitor;
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 96f65a4feb..5e0e1fc21c 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -576,7 +576,6 @@ gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window)
   MirGraphicsRegion region;
   cairo_format_t pixel_format = CAIRO_FORMAT_ARGB32;
   cairo_surface_t *cairo_surface;
-  cairo_t *c;
 
   if (impl->cairo_surface)
     {
@@ -1763,7 +1762,6 @@ gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
   impl_class->restack_toplevel = gdk_mir_window_impl_restack_toplevel;
   impl_class->move_resize = gdk_mir_window_impl_move_resize;
   impl_class->move_to_rect = gdk_mir_window_impl_move_to_rect;
-  impl_class->set_background = gdk_mir_window_impl_set_background;
   impl_class->get_events = gdk_mir_window_impl_get_events;
   impl_class->set_events = gdk_mir_window_impl_set_events;
   impl_class->reparent = gdk_mir_window_impl_reparent;