Merge lp:~mefrio-g/slingshot/fix-991888 into lp:~elementary-pantheon/slingshot/trunk

[Mario Guerriero]

[Cody Garver (codygarver)]

This patch is no longer necessary. Thanks anyway, Mario.

review: Disapprove

Unmerged revisions

179. By Mario Guerriero on 2012-05-04

fixed bug #991888

=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2012-04-25 09:06:16 +0000
+++ src/Widgets/CategoryView.vala	2012-05-04 16:05:22 +0000
@@ -149,7 +149,7 @@
             category_switcher.selection_changed.connect ((name, nth) => {
                 
                 string category = category_ids.get (nth);
-                
+
                 if (name == MOST_USED_APPS)
                     category = name;
                     

=== modified file 'src/Widgets/Sidebar.vala'
--- src/Widgets/Sidebar.vala	2012-04-25 09:06:16 +0000
+++ src/Widgets/Sidebar.vala	2012-05-04 16:05:22 +0000
@@ -27,7 +27,8 @@
         private TreeIter bookmarks_iter;
         private TreeIter category_iter;
         private TreeIter entry_iter;
-
+        private TreeIter? previous_iter = null;
+        
         private int cat_size {
             get {
                 return store.iter_n_children (category_iter);
@@ -122,11 +123,13 @@
                  * If it is, select the previous selected entry.
                  */
                 if (sel_iter == category_iter || sel_iter == bookmarks_iter) {
-                    selected = _selected;
+                    get_selection ().unselect_iter (sel_iter);
+                    get_selection ().select_iter (previous_iter); 
                 } else {
                     _selected = nth;
                     selection_changed (name, nth);
-                }
+                    previous_iter = sel_iter;
+                }            
             }
 
         }