summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-18 15:58:57 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-18 15:58:57 +0900
commit57a7fe5cd8a3ce3091429974e7cc50429e3abe92 (patch)
treef49ee55d3e8273129b12210dcbeb3f89070c6c35
parent601856ede71c1d98197933695e2d04128b915ec5 (diff)
elm win - on shutdown some objects become null during shutdown so be quiet
so don't complain so much about it - it's normal. don't use the noisy macros to do so. this fixes much of T958
-rw-r--r--src/lib/elm_win.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 939270000..340517e87 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -553,7 +553,9 @@ _shot_handle(Elm_Win_Smart_Data *sd)
553static Elm_Win_Smart_Data * 553static Elm_Win_Smart_Data *
554_elm_win_associate_get(const Ecore_Evas *ee) 554_elm_win_associate_get(const Ecore_Evas *ee)
555{ 555{
556 ELM_WIN_DATA_GET(ecore_evas_data_get(ee, "elm_win"), sd); 556 Evas_Object *obj = ecore_evas_data_get(ee, "elm_win");
557 if (!obj) return NULL;
558 ELM_WIN_DATA_GET(obj, sd);
557 return sd; 559 return sd;
558} 560}
559 561
@@ -615,7 +617,7 @@ _elm_win_move(Ecore_Evas *ee)
615 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee); 617 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee);
616 int x, y; 618 int x, y;
617 619
618 EINA_SAFETY_ON_NULL_RETURN(sd); 620 if (!sd) return;
619 621
620 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL); 622 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
621 sd->screen.x = x; 623 sd->screen.x = x;
@@ -656,7 +658,7 @@ static void
656_elm_win_resize(Ecore_Evas *ee) 658_elm_win_resize(Ecore_Evas *ee)
657{ 659{
658 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee); 660 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee);
659 EINA_SAFETY_ON_NULL_RETURN(sd); 661 if (!sd) return;
660 662
661 ecore_job_del(sd->deferred_resize_job); 663 ecore_job_del(sd->deferred_resize_job);
662 sd->deferred_resize_job = ecore_job_add(_elm_win_resize_job, sd->obj); 664 sd->deferred_resize_job = ecore_job_add(_elm_win_resize_job, sd->obj);
@@ -666,7 +668,7 @@ static void
666_elm_win_mouse_in(Ecore_Evas *ee) 668_elm_win_mouse_in(Ecore_Evas *ee)
667{ 669{
668 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee); 670 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee);
669 EINA_SAFETY_ON_NULL_RETURN(sd); 671 if (!sd) return;
670 672
671 if (sd->resizing) sd->resizing = EINA_FALSE; 673 if (sd->resizing) sd->resizing = EINA_FALSE;
672} 674}
@@ -850,7 +852,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
850 Evas_Object *obj; 852 Evas_Object *obj;
851 unsigned int order = 0; 853 unsigned int order = 0;
852 854
853 EINA_SAFETY_ON_NULL_RETURN(sd); 855 if (!sd) return;
854 856
855 obj = sd->obj; 857 obj = sd->obj;
856 858
@@ -883,7 +885,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
883 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee); 885 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee);
884 Evas_Object *obj; 886 Evas_Object *obj;
885 887
886 EINA_SAFETY_ON_NULL_RETURN(sd); 888 if (!sd) return;
887 889
888 obj = sd->obj; 890 obj = sd->obj;
889 891
@@ -1005,7 +1007,7 @@ _elm_win_state_change(Ecore_Evas *ee)
1005 Eina_Bool ch_wm_rotation = EINA_FALSE; 1007 Eina_Bool ch_wm_rotation = EINA_FALSE;
1006 const char *profile; 1008 const char *profile;
1007 1009
1008 EINA_SAFETY_ON_NULL_RETURN(sd); 1010 if (!sd) return;
1009 1011
1010 obj = sd->obj; 1012 obj = sd->obj;
1011 1013
@@ -1676,7 +1678,7 @@ _elm_win_delete_request(Ecore_Evas *ee)
1676 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee); 1678 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee);
1677 Evas_Object *obj; 1679 Evas_Object *obj;
1678 1680
1679 EINA_SAFETY_ON_NULL_RETURN(sd); 1681 if (!sd) return;
1680 1682
1681 obj = sd->obj; 1683 obj = sd->obj;
1682 1684