Merge lp:~unity-team/unity/njpatel-2010-07-02-bug-fixes into lp:unity

[Neil J. Patel]

Please see the linked bugs for the description of changes. Also, there should be a bugfix-per-commit, to ease review.

[Mirco Müller (macslow)]

Selecting the overlay-mode doesn't allow to exit it again. Search doesn't work, selecting indicators doesn't work (no menus show up). One has to exit X11 completely and start gdm to get a responding system again. This is on Lucid.

review: Needs Fixing

[Gord Allott (gordallott)]

works well for me, approved.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-06-28 14:28:48 +0000
+++ .bzrignore	2010-07-03 13:30:43 +0000
@@ -317,3 +317,7 @@
 targets/mutter/spaces-manager.c
 unity/unity-pixbuf-cache.c
 tests/unit/test-unity-pixbuf-cache.c
+tests/unit/test-appinfo-manager.c
+tests/unit/test-io.c
+unity/unity-appinfo-manager.c
+unity/unity-io.c
 
=== modified file 'Makefile.am'
--- Makefile.am	2010-06-09 14:24:08 +0000
+++ Makefile.am	2010-07-03 13:30:43 +0000
@@ -28,5 +28,7 @@
 EXTRA_DIST = \
   autogen.sh \
   COPYING \
-  unity.pc.in \
-  COPYING.LGPL
+  COPYING.LGPL \
+  HACKING \
+  unity.pc.in
+
 
=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-06-25 15:33:40 +0000
+++ targets/mutter/plugin.vala	2010-07-03 13:30:43 +0000
@@ -196,7 +196,7 @@
 
       this.wm = new WindowManagement (this);
       this.maximus = new Maximus ();
-      
+
       END_FUNCTION ();
     }
 
@@ -239,7 +239,7 @@
 
       this.launcher = new Launcher.Launcher (this);
       this.launcher.get_view ().opacity = 0;
-      
+
       this.spaces_manager = new SpacesManager (this);
       this.spaces_manager.set_padding (50, 50, 125, 50);
 
@@ -584,27 +584,38 @@
       expose_manager.end_expose ();
     }
 
+    public void hide_unity ()
+    {
+      if (places_showing == false)
+        return;
+
+      places_showing = false;
+
+      var anim = dark_box.animate (Clutter.AnimationMode.EASE_IN_QUAD, 100, "opacity", 0);
+      anim.completed.connect ((an) => {
+        (an.get_object () as Clutter.Actor).destroy ();
+      });
+
+      plugin.get_normal_window_group ().animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100, "opacity", 255);
+
+      anim = places.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100,
+                      "opacity", 0);
+      anim.completed.connect ((an) => {
+        (an.get_object () as Clutter.Actor).hide ();
+        });
+
+      panel.set_indicator_mode (false);
+      ensure_input_region ();
+
+      while (Gtk.events_pending ())
+        Gtk.main_iteration ();
+    }
+
     public void show_unity ()
     {
       if (this.places_showing)
         {
-          this.places_showing = false;
-
-          var anim = dark_box.animate (Clutter.AnimationMode.EASE_IN_QUAD, 100, "opacity", 0);
-          anim.completed.connect ((an) => {
-            (an.get_object () as Clutter.Actor).destroy ();
-          });
-
-          plugin.get_normal_window_group ().animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100, "opacity", 255);
-
-          anim = places.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100,
-                          "opacity", 0);
-          anim.completed.connect ((an) => {
-            (an.get_object () as Clutter.Actor).hide ();
-            });
-
-          this.panel.set_indicator_mode (false);
-          this.ensure_input_region ();
+          hide_unity ();
         }
       else
         {
 
=== modified file 'tests/ui/test-home-button.vala'
--- tests/ui/test-home-button.vala	2010-06-22 17:18:49 +0000
+++ tests/ui/test-home-button.vala	2010-07-03 13:30:43 +0000
@@ -85,6 +85,12 @@
       g_flag = true;
     }
 
+    public void
+    hide_unity ()
+    {
+
+    }
+
     public int
     get_indicators_width ()
     {
 
=== modified file 'unity-private/launcher/application-controller.vala'
--- unity-private/launcher/application-controller.vala	2010-07-01 11:09:37 +0000
+++ unity-private/launcher/application-controller.vala	2010-07-03 13:30:43 +0000
@@ -49,12 +49,13 @@
           context.set_timestamp (Gdk.CURRENT_TIME);
 
           appinfo.launch (null, context);
+
+          global_shell.hide_unity ();
         }
       catch (Error e)
         {
           warning (e.message);
         }
-
     }
   }
 
@@ -383,6 +384,8 @@
 
     public override void activate ()
     {
+      global_shell.hide_unity ();
+
       if (app is Bamf.Application)
         {
           if (app.is_running ())
 
=== modified file 'unity-private/panel/panel-indicator-object-entry-view.vala'
--- unity-private/panel/panel-indicator-object-entry-view.vala	2010-06-23 21:18:02 +0000
+++ unity-private/panel/panel-indicator-object-entry-view.vala	2010-07-03 13:30:43 +0000
@@ -30,7 +30,6 @@
     private bool          menu_is_open = false;
 
     private uint32 click_time;
-    private float last_found_entry_x = 0.0f;
 
     private float last_width = 0;
     private float last_height = 0;
@@ -44,6 +43,11 @@
               reactive:true);
     }
 
+    ~IndicatorObjectEntryView ()
+    {
+      bg.unparent ();
+    }
+
     construct
     {
       /* Figure out if you need a label, text or both, create the ctk
@@ -86,7 +90,7 @@
             {
               image.hide ();
             }
-            
+
           entry.image.notify["visible"].connect (() =>
             {
               if (entry.image != null)
@@ -140,7 +144,7 @@
             {
               text.text = entry.label.label;
             });
-            
+
           if ((entry.label.get_flags () & Gtk.WidgetFlags.VISIBLE) != 0)
             {
               text.show ();
@@ -149,7 +153,7 @@
             {
               text.hide ();
             }
-            
+
           entry.label.notify["visible"].connect (() =>
             {
               if (entry.label != null)
@@ -163,7 +167,7 @@
                       text.hide ();
                     }
                 }
-            });            
+            });
         }
     }
 
@@ -173,14 +177,19 @@
                                 out bool push_in)
     {
       y = (int)height;
-      x = (int)last_found_entry_x;
+
+      float xx;
+      get_transformed_position (out xx, null);
+
+      x = (int)xx;
     }
 
     public void show_menu ()
     {
       if (entry.menu is Gtk.Menu)
         {
-          last_found_entry_x = x + get_parent ().x + get_parent ().get_parent ().x;
+          global_shell.hide_unity ();
+
           MenuManager.get_default ().register_visible_menu (entry.menu);
           entry.menu.popup (null,
                             null,
@@ -188,6 +197,7 @@
                             1,
                             Clutter.get_current_event_time ());
           click_time = Clutter.get_current_event_time ();
+          menu_is_open = true;
           menu_shown ();
         }
     }
@@ -216,7 +226,8 @@
             }
           else
             {
-              last_found_entry_x = x + get_parent ().x + get_parent ().get_parent ().x;
+              global_shell.hide_unity ();
+
               MenuManager.get_default ().register_visible_menu (entry.menu);
               entry.menu.popup (null,
                                     null,
@@ -233,7 +244,9 @@
 
     public bool on_motion_event (Clutter.Event e)
     {
-      if ((entry.menu is Gtk.Menu) && MenuManager.get_default ().menu_is_open ())
+      if ((entry.menu is Gtk.Menu)
+          && MenuManager.get_default ().menu_is_open ()
+          && menu_is_open == false)
         {
           show_menu ();
           return true;
@@ -310,7 +323,7 @@
     {
       return (entry.menu.get_flags () & Gtk.WidgetFlags.VISIBLE) != 0;
     }
-        
+
     private override void paint ()
     {
       bg.paint ();
 
=== modified file 'unity-private/panel/panel-menu-manager.vala'
--- unity-private/panel/panel-menu-manager.vala	2010-06-18 15:42:52 +0000
+++ unity-private/panel/panel-menu-manager.vala	2010-07-03 13:30:43 +0000
@@ -33,7 +33,9 @@
 
   public void register_visible_menu (Gtk.Menu menu)
   {
-    if (current_menu is Gtk.Menu && (current_menu.visible == true) && (current_menu != menu))
+    if (current_menu is Gtk.Menu
+        && (current_menu.visible == true)
+        && (current_menu != menu))
       current_menu.popdown ();
 
     current_menu = menu;
@@ -41,7 +43,8 @@
 
   public void popdown_current_menu ()
   {
-    current_menu.popdown ();
+    if (current_menu is Gtk.Menu)
+      current_menu.popdown ();
   }
 
   public bool menu_is_open ()
 
=== modified file 'unity-private/places/places-default-renderer-group.vala'
--- unity-private/places/places-default-renderer-group.vala	2010-07-01 15:49:26 +0000
+++ unity-private/places/places-default-renderer-group.vala	2010-07-03 13:30:43 +0000
@@ -216,7 +216,7 @@
 
     private async void clicked_handler ()
     {
-      debug (@"Launching $uri");
+      global_shell.hide_unity ();
 
       if (uri.has_prefix ("application://"))
         {
 
=== modified file 'unity-private/places/places-place-bar.vala'
--- unity-private/places/places-place-bar.vala	2010-06-22 14:00:31 +0000
+++ unity-private/places/places-place-bar.vala	2010-07-03 13:30:43 +0000
@@ -46,7 +46,6 @@
       set_background (bg);
       bg.show ();
 
-      /* Enable once clutk bug is fixed */
       glow = new Ctk.EffectGlow ();
       glow.set_color ({ 255, 255, 255, 255 });
       glow.set_factor (1.0f);
 
=== modified file 'unity-private/places/places-place-model.vala'
--- unity-private/places/places-place-model.vala	2010-06-24 07:43:05 +0000
+++ unity-private/places/places-place-model.vala	2010-07-03 13:30:43 +0000
@@ -95,9 +95,12 @@
                 if (place is Place)
                   {
                     place.connect ();
-                    (place as GLib.Object).ref ();
-                    add (place);
-                    place_added (place);
+                    if (place.online == true)
+                      {
+                        (place as GLib.Object).ref ();
+                        add (place);
+                        place_added (place);
+                      }
                   }
               }
           }
 
=== modified file 'unity-private/testing/test-window.vala'
--- unity-private/testing/test-window.vala	2010-06-22 17:18:49 +0000
+++ unity-private/testing/test-window.vala	2010-07-03 13:30:43 +0000
@@ -312,6 +312,16 @@
       this.places.do_queue_redraw ();
     }
 
+    public void hide_unity ()
+    {
+      if (showing_places == false)
+        {
+          showing_places = true;
+          panel.set_indicator_mode (false);
+          places.opacity = 0;
+        }
+    }
+
     public void about_to_show_places ()
     {
       places.about_to_show ();
 
=== modified file 'unity/shell.vala'
--- unity/shell.vala	2010-06-22 17:18:49 +0000
+++ unity/shell.vala	2010-07-03 13:30:43 +0000
@@ -38,6 +38,7 @@
     public abstract ShellMode     get_mode ();
     public abstract Clutter.Stage get_stage ();
     public abstract void          show_unity ();
+    public abstract void          hide_unity ();
     public abstract int           get_indicators_width ();
     public abstract int           get_launcher_width_foobar (); // _foobar is used to avoid a symbol-clash
     public abstract int           get_panel_height_foobar ();   // with unity/targets/mutter/main.c