Merge lp:~unity-team/unity/browser-stack-fixes into lp:~unity-team/unity/file-browsing

[Mikkel Kamstrup Erlandsen]

Fixes some the browsing back/forward stacks in libunity used by the place daemons (notable the files place's folder browsing mode) and adds unit tests for said feature

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2010-07-29 11:48:06 +0000
+++ tests/unit/Makefile.am	2010-08-02 07:43:51 +0000
@@ -59,6 +59,7 @@
   test-places-place.vala \
   test-places.vala \
   test-place.vala \
+  test-place-browser.vala \
   test-io.vala \
   test-appinfo-manager.vala \
   test-unity-pixbuf-cache.vala \

=== modified file 'tests/unit/test-unit.vala'
--- tests/unit/test-unit.vala	2010-07-15 13:19:02 +0000
+++ tests/unit/test-unit.vala	2010-08-02 07:43:51 +0000
@@ -36,6 +36,7 @@
     PlacesPlaceSuite places_place;
     PlacesSuite places;
     PlaceSuite place;
+    PlaceBrowserSuite place_browser;
     IOSuite io;
     AppInfoManagerSuite appinfo_manager;
 
@@ -59,6 +60,7 @@
     /* Places tests */
     places = new PlacesSuite ();
     place = new PlaceSuite ();
+    place_browser = new PlaceBrowserSuite ();
 
     /* IO utility tests */
     io = new IOSuite ();

=== modified file 'unity/unity-place-browser.vala'
--- unity/unity-place-browser.vala	2010-07-02 10:17:22 +0000
+++ unity/unity-place-browser.vala	2010-08-02 07:43:51 +0000
@@ -122,6 +122,8 @@
     private BrowserServiceImpl service;
     private Stack<State<E>> back_stack;
     private Stack<State<E>> forward_stack;
+   
+   	private State<E> current_state = null;
     
     public string dbus_path { get; private set; }
     
@@ -136,8 +138,8 @@
       forward_stack = new Stack<State<E>> ();
       
       /* Relay signals from backend service */
-      service.back.connect (on_back);
-      service.forward.connect (on_forward);
+      service.back.connect (go_back);
+      service.forward.connect (go_forward);
       
       update_service_state ();
     }
@@ -148,10 +150,15 @@
      */
     public void record_state (E state, string comment)
     {
+      if (current_state != null)
+        {
+          back_stack.push (current_state);
+        }
+    
       var s = new State<E>();
       s.state = state;
-      s.comment = comment;      
-      back_stack.push (s);
+      s.comment = comment;
+      current_state = s;
       update_service_state ();
     }
     
@@ -159,25 +166,29 @@
     {
       back_stack.clear ();
       forward_stack.clear ();
+      current_state = null;
     }
     
-    private void on_back ()
+    public void go_back ()
     {
       var state = back_stack.pop();
       if (state != null)
         {
-          forward_stack.push (state);
+          if (current_state != null)
+            forward_stack.push (current_state);
+          current_state = state;          
           update_service_state ();
           this.back (state.state, state.comment);
         }
     }
     
-    private void on_forward ()
+    public void go_forward ()
     {
       var state = forward_stack.pop();
       if (state != null)
         {
-          back_stack.push (state);
+          if (current_state != null)
+            back_stack.push (current_state);
           update_service_state ();
           this.forward (state.state, state.comment);
         }
@@ -213,7 +224,7 @@
   /**
    * Private shim class to have a propor stack api
    */
-  private class Stack<E>
+  public class Stack<E>
   {
     private LinkedList<E> list;