From 208ad944281dedd93f8326ec5007dfeade3b84de Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Mon, 12 Nov 2012 14:45:07 +0000
Subject: [PATCH] more null checks in evas to avoid segs.

SVN revision: 79167
---
 src/lib/evas/canvas/evas_clip.c               | 4 ----
 src/modules/evas/engines/gl_x11/evas_engine.c | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 7a69277579..fbeb719d48 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -219,26 +219,22 @@ _clip_set(Eo *eo_obj, void *_pd, va_list *list)
    if (clip->delete_me)
      {
         CRIT("Setting deleted object %p as clip obj %p", eo_clip, eo_obj);
-        abort();
         return;
      }
    if (obj->delete_me)
      {
         CRIT("Setting object %p as clip to deleted obj %p", eo_clip, eo_obj);
-        abort();
         return;
      }
    if (!obj->layer)
      {
         CRIT("No evas surface associated with object (%p)", eo_obj);
-        abort();
         return;
      }
    if ((obj->layer && clip->layer) &&
        (obj->layer->evas != clip->layer->evas))
      {
         CRIT("Setting object %p from Evas (%p) to another Evas (%p)", obj, obj->layer->evas, clip->layer->evas);
-        abort();
         return;
      }
 
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index e56a4f5679..b8d7914b1c 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1939,7 +1939,7 @@ eng_image_native_set(void *data, void *image, void *native)
                         ERR("Try glXCreatePixmap on GLX with no support");
                       if (n->glx_pixmap)
                         {
-//                           printf("%p: new native texture for %x | %4i x %4i @ %2i = %p\n",
+//                          printf("%p: new native texture for %x | %4i x %4i @ %2i = %p\n",
 //                                  n, pm, w, h, depth, n->glx_pixmap);
                            if (!target)
                              {