Merge "Revert "[Tizen] keygrab & ecore-wl-window-handle c# binding"" into tizen

diff --combined adaptors/ecore/wayland/window-impl-ecore-wl.cpp
index 8846a50,3ca3887..5091344
mode 100755,100644..100644
--- 1/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
--- 2/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
@@@ -1,5 -1,5 +1,5 @@@
  /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+  * Copyright (c) 2017 Samsung Electronics Co., Ltd.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -98,22 -98,19 +98,22 @@@ struct Window::EventHandle
  
      mDisplay = ecore_wl_display_get();
  
 -    wl_display* displayWrapper = static_cast< wl_display* >( wl_proxy_create_wrapper( mDisplay ) );
 -    if( displayWrapper )
 +    if( mDisplay )
      {
 -      mEventQueue = wl_display_create_queue( mDisplay );
 -      if( mEventQueue )
 +      wl_display* displayWrapper = static_cast< wl_display* >( wl_proxy_create_wrapper( mDisplay ) );
 +      if( displayWrapper )
        {
 -        wl_proxy_set_queue( reinterpret_cast< wl_proxy* >( displayWrapper ), mEventQueue );
 +        mEventQueue = wl_display_create_queue( mDisplay );
 +        if( mEventQueue )
 +        {
 +          wl_proxy_set_queue( reinterpret_cast< wl_proxy* >( displayWrapper ), mEventQueue );
  
 -        wl_registry* registry = wl_display_get_registry( displayWrapper );
 -        wl_registry_add_listener( registry, &mRegistryListener, this );
 -      }
 +          wl_registry* registry = wl_display_get_registry( displayWrapper );
 +          wl_registry_add_listener( registry, &mRegistryListener, this );
 +        }
  
 -      wl_proxy_wrapper_destroy( displayWrapper );
 +        wl_proxy_wrapper_destroy( displayWrapper );
 +      }
      }
    }
  
@@@ -1363,11 -1360,6 +1363,6 @@@ int Window::GetBrightness(
    return mEventHandler->mBrightness;
  }
  
- void* Window::GetNativeWindowHandler()
- {
-   return mEventHandler->mEcoreWindow;
- }
- 
  } // Adaptor
  } // Internal
  } // Dali