Merge lp:~unity-team/unity/youtube-fix into lp:unity

[Jason Smith]

[Neil J. Patel (njpatel)]

Approved pending removal of the npviewer.bin check

=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-09-13 20:14:46 +0000
+++ targets/mutter/plugin.vala	2010-09-16 17:39:47 +0000
@@ -1407,16 +1407,19 @@
           Idle.add (() => {
             if (win is Object)
               {
-                if (Utils.window_is_decorated (Mutter.MetaWindow.get_xwindow (win)) == false && Mutter.MetaWindow.is_maximized (win) == false)
+                bool decorated  = Utils.window_is_decorated (Mutter.MetaWindow.get_xwindow (win));
+                bool maximized  = Mutter.MetaWindow.is_maximized (win);
+                
+                bool fullscreen;
+                win.get ("fullscreen", out fullscreen);
+                
+                if (!decorated && !maximized)
                   {
                     window.set_data (UNDECORATED_HINT, "%s".printf ("true"));
                   }
-                else
+                else if (decorated && maximized && !fullscreen)
                   {
-                    if (Mutter.MetaWindow.is_maximized (win))
-                      {
-                        Utils.window_set_decorations (Mutter.MetaWindow.get_xwindow (win), 0);
-                      }
+                    Utils.window_set_decorations (Mutter.MetaWindow.get_xwindow (win), 0);
                   }
               }