1 files changed, 9 insertions, 31 deletions
diff --git a/src/core/display.c b/src/core/display.c
index 6a4831fb..caa76247 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -558,6 +558,9 @@ meta_display_open (void)
 
 #ifdef HAVE_COMPOSITE_EXTENSIONS
 {
+ int composite_major_version = 0;
+ int composite_minor_version = 0;
+
 the_display->have_composite = FALSE;
 
 the_display->composite_error_base = 0;
@@ -572,18 +575,16 @@ meta_display_open (void)
 }
 else
 {
- the_display->composite_major_version = 0;
- the_display->composite_minor_version = 0;
 if (XCompositeQueryVersion (the_display->xdisplay,
- &the_display->composite_major_version,
- &the_display->composite_minor_version))
+ &composite_major_version,
+ &composite_minor_version))
 {
 the_display->have_composite = TRUE;
 }
 else
 {
- the_display->composite_major_version = 0;
- the_display->composite_minor_version = 0;
+ composite_major_version = 0;
+ composite_minor_version = 0;
 }
 }
 
@@ -591,8 +592,8 @@ meta_display_open (void)
 "extn ver %d %d\n",
 the_display->composite_error_base,
 the_display->composite_event_base,
- the_display->composite_major_version,
- the_display->composite_minor_version);
+ composite_major_version,
+ composite_minor_version);
 
 the_display->have_damage = FALSE;
 
@@ -3662,18 +3663,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
 g_assert (display->grab_window != NULL || display->grab_screen != NULL);
 g_assert (display->grab_op != META_GRAB_OP_NONE);
 
- /* If this is a move or resize, cache the window edges for
- * resistance/snapping
- */
- if (meta_grab_op_is_resizing (display->grab_op) ||
- meta_grab_op_is_moving (display->grab_op))
- {
- meta_topic (META_DEBUG_WINDOW_OPS,
- "Computing edges to resist-movement or snap-to for %s.\n",
- window->desc);
- meta_display_compute_resistance_and_snapping_edges (display);
- }
-
 /* Save the old stacking */
 if (GRAB_OP_IS_WINDOW_SWITCH (display->grab_op))
 {
@@ -5401,17 +5390,6 @@ meta_display_remove_autoraise_callback (MetaDisplay *display)
 }
 }
 
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-void
-meta_display_get_compositor_version (MetaDisplay *display,
- int *major,
- int *minor)
-{
- *major = display->composite_major_version;
- *minor = display->composite_minor_version;
-}
-#endif
-
 Display *
 meta_display_get_xdisplay (MetaDisplay *display)
 {