Merge lp:~om26er/ubuntu/oneiric/nux/sru-819721 into lp:ubuntu/oneiric-proposed/nux

[Omer Akram]

backport the fix bug 819721

[Michael Terry (mterry)]

Looks good! I pushed to oneiric-proposed after testing.

review: Approve

Unmerged revisions

53. By Omer Akram on 2012-01-15

* NuxGraphics/GraphicsDisplayX11.cpp:
  - Quicklists not accessible for the first time just after login.
    (LP: #819721)

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2011-10-17 09:10:05 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2012-01-15 07:57:25 +0000
@@ -75,32 +75,63 @@
     m_GraphicsContext               = 0;
     m_Style                         = WINDOWSTYLE_NORMAL;
     m_PauseGraphicsRendering        = false;
+    m_FrameTime                     = 0;
 
     inlSetThreadLocalStorage (_TLS_GraphicsDisplay, this);
-
+    
+    m_X11Display = 0;
+    m_X11Window = 0;
+    m_X11VisualInfo = 0;
+    m_X11Screen = 0;
     m_X11LastEvent.type = -1;
     m_X11RepeatKey = true;
 
+    m_PixelFormat = 0;
+    m_WindowTitle = "";
+
+    m_ParentWindow = 0;
+    _fb_config = 0;
+
+    m_NumVideoModes = 0;
+
+    m_WMDeleteWindow = 0;
+    m_X11Colormap = 0;
+    m_BorderPixel = 0;
+
     m_GfxInterfaceCreated = false;
     m_pEvent = new IEvent();
 
+    m_ViewportSize = Size(0,0);
     m_WindowSize = Size(0,0);
+    m_WindowPosition = Point(0,0);
+
+    _x11_major = 0;
+    _x11_minor = 0;
 
     _has_glx_13 = false;
     _glx_major = 0;
     _glx_minor = 0;
-    
+  
+    _dnd_source_data = NULL;   
     _dnd_is_drag_source = false;
     _dnd_source_grab_active = false;
     _dnd_source_funcs.get_drag_image = 0;
     _dnd_source_funcs.get_drag_types = 0;
     _dnd_source_funcs.get_data_for_type = 0;
     _dnd_source_funcs.drag_finished = 0;
-    
+
+    _drag_display = 0;
+    _drag_window = 0;
+    _drag_source = 0;
+    _drag_drop_timestamp = 0;
+
+    _global_grab_window = 0;    
     _global_keyboard_grab_data = 0;
     _global_keyboard_grab_callback = 0;
+    _global_keyboard_grab_active = false;
     _global_pointer_grab_data = 0;
     _global_pointer_grab_callback = 0;
+    _global_pointer_grab_active = false;
 
     // DND
     _last_dnd_position = Point(0, 0);

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-17 09:10:05 +0000
+++ debian/changelog	2012-01-15 07:57:25 +0000
@@ -1,3 +1,11 @@
+nux (1.16.0-0ubuntu1.1) oneiric-proposed; urgency=low
+
+  * NuxGraphics/GraphicsDisplayX11.cpp:
+    - Quicklists not accessible for the first time just after login.
+      (LP: #819721)
+
+ -- Omer Akram <[e-mail]>  Sun, 15 Jan 2012 12:50:34 +0500
+
 nux (1.16.0-0ubuntu1) oneiric-proposed; urgency=low
 
   * New upstream release.