From: Enlightenment S. <no-...@en...> - 2012-02-19 07:36:08
|
Log: lets not segv shall we? Author: raster Date: 2012-02-18 23:36:01 -0800 (Sat, 18 Feb 2012) New Revision: 68119 Trac: http://trac.enlightenment.org/e/changeset/68119 Modified: trunk/e/src/bin/e_randr_12.c trunk/e/src/bin/e_randr_12_crtc.c trunk/e/src/bin/e_randr_private.h Modified: trunk/e/src/bin/e_randr_12.c =================================================================== --- trunk/e/src/bin/e_randr_12.c 2012-02-18 18:12:19 UTC (rev 68118) +++ trunk/e/src/bin/e_randr_12.c 2012-02-19 07:36:01 UTC (rev 68119) @@ -23,8 +23,8 @@ static Ecore_Poller *poller = NULL; static Eina_List *_event_handlers = NULL; -const static char *_CONNECTION_STATES_STRINGS[] = {"CONNECTED", "DISCONNECTED", "UNKNOWN"}; -const static char *_POLICIES_STRINGS[] = {"ABOVE", "RIGHT", "BELOW", "LEFT", "CLONE", "NONE"}; +static const char *_CONNECTION_STATES_STRINGS[] = {"CONNECTED", "DISCONNECTED", "UNKNOWN"}; +static const char *_POLICIES_STRINGS[] = {"ABOVE", "RIGHT", "BELOW", "LEFT", "CLONE", "NONE"}; //"New" helper functions /** @@ -88,7 +88,8 @@ while (--noutputs >= 0) { output_info = _output_info_new(outputs[noutputs]); - e_randr_screen_info.rrvd_info.randr_info_12->outputs = eina_list_append(e_randr_screen_info.rrvd_info.randr_info_12->outputs, output_info); + if (output_info) + e_randr_screen_info.rrvd_info.randr_info_12->outputs = eina_list_append(e_randr_screen_info.rrvd_info.randr_info_12->outputs, output_info); } free(outputs); Modified: trunk/e/src/bin/e_randr_12_crtc.c =================================================================== --- trunk/e/src/bin/e_randr_12_crtc.c 2012-02-18 18:12:19 UTC (rev 68118) +++ trunk/e/src/bin/e_randr_12_crtc.c 2012-02-19 07:36:01 UTC (rev 68119) @@ -193,7 +193,7 @@ * which means that e.g. when a crtc should be placed at a position < 0, all * other crtcs are accordingly moved instead, so the result is the same. */ - const Eina_Bool +Eina_Bool _crtc_move_policy(E_Randr_Crtc_Info *new_crtc) { const E_Randr_Crtc_Info *crtc_rel; Modified: trunk/e/src/bin/e_randr_private.h =================================================================== --- trunk/e/src/bin/e_randr_private.h 2012-02-18 18:12:19 UTC (rev 68118) +++ trunk/e/src/bin/e_randr_private.h 2012-02-19 07:36:01 UTC (rev 68119) @@ -61,7 +61,7 @@ void _crtc_info_free(E_Randr_Crtc_Info *crtc_info); void _crtc_refs_set(E_Randr_Crtc_Info *crtc_info); void _crtc_outputs_refs_set(E_Randr_Crtc_Info *crtc_info); -const Eina_Bool _crtc_move_policy(E_Randr_Crtc_Info *new_crtc); +Eina_Bool _crtc_move_policy(E_Randr_Crtc_Info *new_crtc); const E_Randr_Crtc_Info *_crtc_according_to_policy_get(E_Randr_Crtc_Info *but, Ecore_X_Randr_Output_Policy policy); #endif |