Remove compatibility for GTK+-2.0

While the Meego developers agreed to switching mutter to GTK+-3.0
unconditionally a while ago, Canonical used a GTK+-2.0 build for their
Unity project. As Canonical now announced a switch to compiz as their
window manager, there is no longer a reason to maintain GTK+-2.0
compatibility.

https://bugzilla.gnome.org/show_bug.cgi?id=633133
This commit is contained in:
Florian Müllner
2010-10-25 20:44:30 +02:00
parent 95a7f0269a
commit b445ee3763
37 changed files with 158 additions and 1381 deletions

View File

@ -272,7 +272,7 @@ window_decorated_notify (MetaWindow *mw,
{
meta_error_trap_push (display);
XDamageDestroy (xdisplay, priv->damage);
meta_error_trap_pop (display, FALSE);
meta_error_trap_pop (display);
priv->damage = None;
}
@ -411,7 +411,7 @@ meta_window_actor_dispose (GObject *object)
{
meta_error_trap_push (display);
XDamageDestroy (xdisplay, priv->damage);
meta_error_trap_pop (display, FALSE);
meta_error_trap_pop (display);
priv->damage = None;
}
@ -1582,7 +1582,7 @@ check_needs_pixmap (MetaWindowActor *self)
priv->back_pixmap = XCompositeNameWindowPixmap (xdisplay, xwindow);
if (meta_error_trap_pop_with_return (display, FALSE) != Success)
if (meta_error_trap_pop_with_return (display) != Success)
{
/* Probably a BadMatch if the window isn't viewable; we could
* GrabServer/GetWindowAttributes/NameWindowPixmap/UngrabServer/Sync
@ -1630,7 +1630,7 @@ check_needs_pixmap (MetaWindowActor *self)
full = TRUE;
}
meta_error_trap_pop (display, FALSE);
meta_error_trap_pop (display);
priv->needs_pixmap = FALSE;
}
@ -1718,7 +1718,7 @@ check_needs_reshape (MetaWindowActor *self)
ShapeBounding,
&n_rects,
&ordering);
meta_error_trap_pop (display, TRUE);
meta_error_trap_pop (display);
if (rects)
{
@ -1766,7 +1766,7 @@ meta_window_actor_pre_paint (MetaWindowActor *self)
{
meta_error_trap_push (display);
XDamageSubtract (xdisplay, priv->damage, None, None);
meta_error_trap_pop (display, FALSE);
meta_error_trap_pop (display);
priv->received_damage = FALSE;
}