[gtk+] mir: Remove redundant calls
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] mir: Remove redundant calls
- Date: Tue, 2 Jun 2015 19:27:36 +0000 (UTC)
commit a57636f057c6c9bc16a6b60a51b973c9dc8573ca
Author: William Hua <william hua canonical com>
Date: Wed May 20 15:02:31 2015 -0500
mir: Remove redundant calls
gdk/mir/gdkmirwindowimpl.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 30d1580..8008fba 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -155,18 +155,6 @@ set_surface_state (GdkMirWindowImpl *impl,
}
static void
-set_surface_type (GdkMirWindowImpl *impl,
- MirSurfaceType type)
-{
- if (impl->surface_type == type)
- return;
-
- impl->surface_type = type;
- if (impl->surface)
- mir_surface_set_type (impl->surface, type);
-}
-
-static void
event_cb (MirSurface *surface,
const MirEvent *event,
void *context)
@@ -230,8 +218,6 @@ ensure_surface_full (GdkWindow *window,
*/
mir_surface_set_event_handler (impl->surface, event_cb, window_ref); // FIXME: Ignore some events until
shown
- set_surface_type (impl, impl->surface_type);
- set_surface_state (impl, impl->surface_state);
}
static void
@@ -277,6 +263,20 @@ ensure_no_surface (GdkWindow *window)
}
static void
+set_surface_type (GdkWindow *window,
+ MirSurfaceType type)
+{
+ GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+
+ if (impl->surface_type == type)
+ return;
+
+ impl->surface_type = type;
+
+ ensure_no_surface (window);
+}
+
+static void
send_buffer (GdkWindow *window)
{
GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
@@ -710,7 +710,7 @@ gdk_mir_window_impl_set_type_hint (GdkWindow *window,
break;
}
- set_surface_type (GDK_MIR_WINDOW_IMPL (window->impl), mir_type);
+ set_surface_type (window, mir_type);
}
static GdkWindowTypeHint
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]