ClutterX11TexturePixmap: Fix unbalanced error trapping
ClutterX11TexturePixmap: Fix unbalanced error trapping

I think this is what commit 2cf140550635 intended to do since it
specifically mentioned cleaning up the trap in
clutter_x11_texture_pixmap_set_pixmap, but although it moved the untrap
to only be done in the case where Pixmap != None it left the position of
the trap itself unchanged. This meant the error trapping wouldn't be
balanced if pixmap == None since the untrap wouldn't be done. We now
only trap and untrap around the XGetGeometry call done when pixmap !=
None.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2303

djdeath/clutter-multithreaded,collects/clutter,Distrotech/clutter,heysion/clutter-clone,jigpu/clutter,nobled/clutter,spatulasnout/clutter,jigpu/clutter,ebassi/clutter,heysion/clutter-clone,djdeath/clutter-multithreaded,spatulasnout/clutter,ebassi/clutter,collects/clutter,heysion/clutter-clone,ebassi/clutter,djdeath/clutter-android,Distrotech/clutter,kerrickstaley/clutter-vala,jigpu/clutter,GNOME/clutter,collects/clutter,collects/clutter,nobled/clutter,spatulasnout/clutter,kerrickstaley/clutter-vala,djdeath/clutter-multithreaded,ebassi/clutter,jigpu/clutter,djdeath/clutter,dlespiau/clutter,kerrickstaley/clutter-vala,dlespiau/clutter,kerrickstaley/clutter-vala,spatulasnout/clutter,djdeath/clutter,djdeath/clutter-android,GNOME/clutter,djdeath/clutter-android,djdeath/clutter,djdeath/clutter-android,Distrotech/clutter,djdeath/clutter,GNOME/clutter,djdeath/clutter,djdeath/clutter,djdeath/clutter-multithreaded,jigpu/clutter,dlespiau/clutter,spatulasnout/clutter,djdeath/clutter-android,jigpu/clutter,Distrotech/clutter,Distrotech/clutter,heysion/clutter-clone,Distrotech/clutter,GNOME/clutter,nobled/clutter,collects/clutter,heysion/clutter-clone,ebassi/clutter,GNOME/clutter