Merge lp:~unity-team/unity/places-fixes-2010-09-22 into lp:unity

[Neil J. Patel]

All bug reports linked

[Mikkel Kamstrup Erlandsen (kamstrup)]

CODE REVIEW:
unity-private/places/places-place-home.vala:
 You are using ObjectRegistry to look up the view. This seems like a pretty big hack, abusing the testing infrastructure..?

FUNCTIONAL REVIEW:

Bug #607821: Search Field does not behave as specified when the search fails
 - Fix confirmed

Bug #607829: Clicking a Place icon while viewing the same place in the Dash should return to the Home screen of that place and clear the search
 - Fix confirmed

Bug #612562: URI activation in global view
 - Fix confirmed

Bug #634364: unity crashed with SIGSEGV in unity_places_place_entry_remote_set_active()
 - I could reproduce this now. See http://paste.ubuntu.com/498597/. I can't exactly figure out where to insert the null checks. And frankly I am more concerned why u-p-a fails to come up...

Bug #637136: launchers should act like if the application was not focussed in the place views
 - Fix confirmed

Bug #638402: clicking on a category from CoFs does not directly take you to the desired category
 - Fix confirmed

Bug #638857: dash initial icons states
 - Fix confirmed

Bug #641554: cropping an image in shotwell crashes unity
 - Not tested

Bug #641669: Launcher loads 48 px icons instead of 32 px
 - Fix confirmed

Bug #641894: Clicking on the "Files & Folders" icon while a folder is already displayed in the overlay view causes unity to crash and re-start
 - I get a crash here still. 100% reproducible.

Bug #642669: mutter crashes when closing pop-up dialog
 - I still get very rare crashes when I close the 'bzr gcommit' dialog, in maximized state, when clicking the commit button

Bug #643627: mutter crashed with SIGSEGV in unity_places_place_entry_get_parent()
 -

Bug #644215: "Applications" and "Files & Folders" tooltips are not translatable
 - Fix confirmed

CONCLUSION
 * Can you recheck the fix for bug #641894?
 * Bug #634364 scares me a bit... I don't have a ready fix right now.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Bugs #634364, #641894, and #643627 have been removed from the fixes-list of this merge proposal and re-opened as agreed with Neil.

The ObjectRegistry hack was is acknowledged as a hack. We'll fix it properly for Natty.

Approved!

review: Approve

=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-09-22 04:36:17 +0000
+++ targets/mutter/plugin.vala	2010-09-22 16:03:41 +0000
@@ -844,10 +844,10 @@
                 {
                   window = actor as Mutter.Window;
 
-                  if (start_pan_window.get_window_type () != Mutter.MetaCompWindowType.NORMAL &&
-                      start_pan_window.get_window_type () != Mutter.MetaCompWindowType.DIALOG &&
-                      start_pan_window.get_window_type () != Mutter.MetaCompWindowType.MODAL_DIALOG &&
-                      start_pan_window.get_window_type () != Mutter.MetaCompWindowType.UTILITY)
+                  if (window.get_window_type () != Mutter.MetaCompWindowType.NORMAL &&
+                      window.get_window_type () != Mutter.MetaCompWindowType.DIALOG &&
+                      window.get_window_type () != Mutter.MetaCompWindowType.MODAL_DIALOG &&
+                      window.get_window_type () != Mutter.MetaCompWindowType.UTILITY)
                     window = null;
                 }
 

=== modified file 'unity-private/launcher/application-controller.vala'
--- unity-private/launcher/application-controller.vala	2010-09-02 10:59:56 +0000
+++ unity-private/launcher/application-controller.vala	2010-09-22 16:03:41 +0000
@@ -349,14 +349,18 @@
 
     public override void activate ()
     {
-      global_shell.hide_unity ();
-
       if (app is Bamf.Application)
         {
           if (app.is_active ())
             {
-              Array<uint32> xids = app.get_xids ();
-              global_shell.expose_xids (xids);
+              /* We only want to do expose if the window was _actually_
+               * active i.e. the dash wasn't showing.
+               */
+              if (global_shell.get_mode () == ShellMode.MINIMIZED)
+                {
+                  Array<uint32> xids = app.get_xids ();
+                  global_shell.expose_xids (xids);
+                }
             }
           else if (app.is_running ())
             {
@@ -384,6 +388,7 @@
               warning (e.message);
             }
         }
+      global_shell.hide_unity ();
     }
 
     private bool on_launch_timeout ()

=== modified file 'unity-private/places/places-controller.vala'
--- unity-private/places/places-controller.vala	2010-08-18 22:04:31 +0000
+++ unity-private/places/places-controller.vala	2010-09-22 16:03:41 +0000
@@ -119,6 +119,7 @@
         shell.show_unity ();
       }
      view.on_entry_view_activated (cont.entry, section_id);
+     view.search_bar.reset ();
     }
   }
 }

=== modified file 'unity-private/places/places-default-renderer-group.vala'
--- unity-private/places/places-default-renderer-group.vala	2010-09-22 09:51:13 +0000
+++ unity-private/places/places-default-renderer-group.vala	2010-09-22 16:03:41 +0000
@@ -72,7 +72,7 @@
     private bool last_result_timeout = false;
 
     public signal void activated (string uri, string mimetype);
-
+    
     private GLib.List<Tile?> cleanup_tiles = new GLib.List<Tile?> ();
     private uint cleanup_operation = 0;
 

=== modified file 'unity-private/places/places-default-renderer.vala'
--- unity-private/places/places-default-renderer.vala	2010-09-17 17:22:27 +0000
+++ unity-private/places/places-default-renderer.vala	2010-09-22 16:03:41 +0000
@@ -17,6 +17,8 @@
  *
  */
 
+using Unity.Testing;
+
 namespace Unity.Places
 {
   public class DefaultRenderer : LayeredBin, Unity.Place.Renderer
@@ -40,6 +42,7 @@
     private Ctk.VBox          box;
     private Dee.Model         groups_model;
     private Dee.Model         results_model;
+    private Places.View       place_view;
 
     private string[] expanded = null;
 
@@ -285,6 +288,8 @@
       box.homogeneous = false;
       scroll.add_actor (box);
       box.show ();
+
+      place_view = ObjectRegistry.get_default ().lookup ("UnityPlacesView")[0] as View;
     }
 
     /*
@@ -342,6 +347,8 @@
                             300,
                             "opacity", groups_box_opacity);
 
+      place_view.search_bar.search_fail = section_empty.active
+                                          || search_empty.active;
     }
 
     private void activate_default ()
@@ -687,4 +694,3 @@
     }
   }
 }
-

=== modified file 'unity-private/places/places-place-home-renderer.vala'
--- unity-private/places/places-place-home-renderer.vala	2010-09-14 08:50:05 +0000
+++ unity-private/places/places-place-home-renderer.vala	2010-09-22 16:03:41 +0000
@@ -183,7 +183,7 @@
     }
   }
 
-  public class HomeButton : Ctk.Button
+  public class HomeButton : Button
   {
     static const int ICON_SIZE = 128;
 
@@ -201,6 +201,7 @@
 
     construct
     {
+      padding = { 0.0f, 0.0f, 8.0f, 0.0f };
       get_image ().size = 128;
       get_image ().filename = icon;
       get_text ().text = name;

=== modified file 'unity-private/places/places-place-home.vala'
--- unity-private/places/places-place-home.vala	2010-08-26 11:14:00 +0000
+++ unity-private/places/places-place-home.vala	2010-09-22 16:03:41 +0000
@@ -17,6 +17,7 @@
  *
  */
 using Unity;
+using Unity.Testing;
 
 namespace Unity.Places
 {
@@ -62,6 +63,7 @@
     public PlaceModel place_model { get; set construct; }
 
     private Gee.HashMap<PlaceEntry?, uint> entry_group_map;
+    private Places.View place_view = null;
 
     public PlaceHomeEntry (Shell shell, PlaceModel model)
     {
@@ -131,6 +133,7 @@
                                           5, _model.get_string (it, 5),
                                           -1);
 
+            update_search_failed ();
             });
 
             entry.global_results_model.row_removed.connect ((it) => {
@@ -149,11 +152,28 @@
 
                 i = _model.next (i);
               }
+            
+            update_search_failed ();
             });
           });
         }
     }
 
+    private void update_search_failed ()
+    {
+      if (place_view == null)
+        place_view = ObjectRegistry.get_default ().lookup ("UnityPlacesView")[0] as View;
+        
+      if (entry_results_model.get_n_rows () > 0)
+        {
+          place_view.search_bar.search_fail = false;
+        }
+      else
+        {
+          place_view.search_bar.search_fail = true;
+        }
+    }
+
     /*
      * Public Methods
      */
@@ -168,7 +188,10 @@
 
       if (search == "" || search == null)
         {
+          if (place_view == null)
+            place_view = ObjectRegistry.get_default ().lookup ("UnityPlacesView")[0] as View;
           entry_renderer_name = "UnityHomeScreen";
+          place_view.search_bar.search_fail = false;
         }
       else
         {
@@ -202,6 +225,43 @@
     {
 
     }
+
+    public unowned PlaceEntry? get_entry_for_uri (string uri)
+    {
+      int entry_id = -1;
+
+      unowned Dee.ModelIter iter = entry_results_model.get_first_iter ();
+      while (!entry_results_model.is_last (iter))
+        {
+          if (uri == entry_results_model.get_string (iter, 0))
+            {
+              entry_id = (int) entry_results_model.get_uint (iter, 2);
+              break;
+            }
+
+          iter = entry_results_model.next (iter);
+        }
+
+      if (entry_id >= 0)
+        {
+          unowned PlaceEntry? ent = null;
+
+          foreach (Gee.Map.Entry<PlaceEntry, uint> e in entry_group_map.entries)
+            {
+              PlaceEntry? entry = e.key;
+
+              if (entry != null && entry_id == e.value)
+                {
+                  ent = entry;
+                  break;
+                }
+            }
+
+          if (ent is PlaceEntry)
+            return ent;
+        }
+
+      return null;
+    }
   }
 }
-

=== modified file 'unity-private/places/places-place-search-bar.vala'
--- unity-private/places/places-place-search-bar.vala	2010-09-16 14:35:22 +0000
+++ unity-private/places/places-place-search-bar.vala	2010-09-22 16:03:41 +0000
@@ -34,6 +34,19 @@
     public  PlaceSearchSectionsBar sections;
     public  PlaceSearchExtraAction extra_action;
 
+    private bool _search_fail = false;
+    public bool search_fail {
+      get { return _search_fail; }
+      set {
+        if (_search_fail != value)
+          {
+            _search_fail = value;
+            bg.search_empty = _search_fail;
+            bg.update_background ();
+          }
+      }
+    }
+
     public PlaceSearchBar ()
     {
       Object (orientation:Ctk.Orientation.HORIZONTAL,
@@ -83,6 +96,7 @@
 
     public void reset ()
     {
+      search_fail = false;
       entry.reset ();
     }
 
@@ -170,9 +184,10 @@
       active_entry = entry;
       bg.entry_position = x;
       sections.set_active_entry (entry);
-      if (section != 0)
+
+      if (!(sections.style == SectionStyle.BREADCRUMB && section ==0))
         {
-          Idle.add (() => {
+          Timeout.add (0, () => {
             sections.set_active_section (section);
             return false;
           });
@@ -224,6 +239,8 @@
     private Clutter.CairoTexture texture;
     private Ctk.EffectGlow       glow;
 
+    public bool search_empty { get; set; }
+
     public PlaceSearchNavigation navigation { get; construct; }
     public PlaceSearchEntry search_entry { get; construct; }
 
@@ -257,6 +274,8 @@
       glow.set_factor (1.0f);
       glow.set_margin (5);
       add_effect (glow);
+
+      search_empty = false;
     }
 
     private override void allocate (Clutter.ActorBox        box,
@@ -407,6 +426,13 @@
       cr.fill_preserve ();
 
       cr.set_operator  (Cairo.Operator.OVER);
+      
+      if (search_empty)
+        {
+          cr.set_source_rgba (1.0f, 0.0f, 0.0f, 0.3f);
+          cr.fill_preserve ();
+        }
+
       cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.6f);
       cr.stroke ();
 

=== modified file 'unity-private/places/places-place-search-navigation.vala'
--- unity-private/places/places-place-search-navigation.vala	2010-09-21 15:39:09 +0000
+++ unity-private/places/places-place-search-navigation.vala	2010-09-22 16:03:41 +0000
@@ -138,6 +138,9 @@
 
     private async void refresh_states ()
     {
+      if (remote == null)
+        return;
+
       try {
         var states = yield remote.get_state ();
         back_sensitive = states[0].sensitive;
@@ -150,6 +153,9 @@
 
     private async void go_forward ()
     {
+      if (remote == null)
+        return;
+
       try {
         var states = yield remote.go_forward ();
         back_sensitive = states[0].sensitive;
@@ -161,6 +167,9 @@
 
     private async void go_back ()
     {
+      if (remote == null)
+        return;
+
       try {       
         var states = yield remote.go_back ();
         back_sensitive = states[0].sensitive;

=== modified file 'unity-private/places/places-place.vala'
--- unity-private/places/places-place.vala	2010-09-16 12:42:01 +0000
+++ unity-private/places/places-place.vala	2010-09-22 16:03:41 +0000
@@ -377,9 +377,9 @@
               return null;
             }
 
-          name = file.get_string (group, "Name");
-          icon = file.get_string (group, "Icon");
-          desc = file.get_string (group, "Description");
+          name = file.get_locale_string (group, "Name", null);
+          icon = file.get_locale_string (group, "Icon", null);
+          desc = file.get_locale_string (group, "Description", null);
       } catch (Error e) {
         warning (@"Cannot load entry '$group': %s", e.message);
         return null;

=== modified file 'unity-private/places/places-view.vala'
--- unity-private/places/places-view.vala	2010-09-14 08:50:05 +0000
+++ unity-private/places/places-view.vala	2010-09-22 16:03:41 +0000
@@ -18,6 +18,7 @@
  *
  */
 using Unity;
+using Unity.Testing;
 
 namespace Unity.Places
 {
@@ -42,6 +43,8 @@
     public View (Shell shell, PlaceModel model)
     {
       Object (shell:shell, orientation:Ctk.Orientation.VERTICAL, model:model);
+
+      Testing.ObjectRegistry.get_default ().register ("UnityPlacesView", this);
     }
 
     construct
@@ -49,6 +52,8 @@
       about_to_show ();
 
       shell.get_stage ().captured_event.connect (on_stage_event_captured);
+
+
     }
 
     public void about_to_show ()
@@ -123,6 +128,8 @@
 
     private void update_views (PlaceEntry entry, uint section_id=0)
     {
+      search_bar.set_active_entry_view (entry, 0, section_id);
+
       /* Create the correct results view */
       if (renderer is Clutter.Actor)
         {
@@ -148,8 +155,6 @@
                            entry.entry_renderer_hints);
       renderer.show ();
       renderer.activated.connect (on_result_activated);
-
-      search_bar.set_active_entry_view (entry, 0, section_id);
     }
 
     private void on_entry_renderer_info_changed (PlaceEntry entry)
@@ -183,14 +188,29 @@
 
     private void on_result_activated (string uri, string mimetype)
     {
-      if (active_entry.parent is Place == false)
+      ActivationStatus result;
+
+      if (active_entry is PlaceHomeEntry)
+        {
+          var e = (active_entry as PlaceHomeEntry).get_entry_for_uri (uri);
+
+          if (e is PlaceEntry)
+            result = e.parent.activate (uri, mimetype);
+          else
+            {
+              Place.activate_fallback.begin (uri);
+              result = ActivationStatus.ACTIVATED_FALLBACK;
+            }
+        }
+      else if (active_entry == null || active_entry.parent == null)
         {
           Place.activate_fallback.begin (uri);
-          global_shell.hide_unity ();
-          return;
-        }
-
-      ActivationStatus result = active_entry.parent.activate (uri, mimetype);
+          result = ActivationStatus.ACTIVATED_FALLBACK;
+        }
+      else
+        {
+          result = active_entry.parent.activate (uri, mimetype);
+        }
       
       switch (result)
       {

=== modified file 'unity-private/unity-utils.c'
--- unity-private/unity-utils.c	2010-08-21 11:26:06 +0000
+++ unity-private/unity-utils.c	2010-09-22 16:03:41 +0000
@@ -240,6 +240,7 @@
   XChangeProperty (display, window, net_wm_strut_partial,
                    XA_CARDINAL, 32, PropModeReplace,
                    (guchar *) &struts, 12);
+  gdk_flush ();
   gdk_error_trap_pop ();
 }
 

=== modified file 'unity/theme.vala'
--- unity/theme.vala	2010-07-29 11:48:06 +0000
+++ unity/theme.vala	2010-09-22 16:03:41 +0000
@@ -66,7 +66,7 @@
       if (theme.has_icon (icon_name))
         {
           var info = theme.lookup_icon (icon_name,
-                                             48,
+                                             32,
                                              0);
           if (info != null)
             {