Slingshot

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

  1. fix-915052
  2. Merge into trunk
Proposed by Mario Guerriero
Status: Merged
Approved by: Victor Martinez
Approved revision: 183
Merged at revision: 183
Proposed branch: lp:~mefrio-g/slingshot/fix-915052
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 93 lines (+10/-10)
1 file modified
src/SlingshotView.vala (+10/-10)
To merge this branch: bzr merge lp:~mefrio-g/slingshot/fix-915052
Reviewer Review Type Date Requested Status
Victor Martinez (community) Approve
Review via email: mp+100443@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) wrote :

This is the most reasonable fix. Thanks for your work Mario!

review: Approve
Revision history for this message
Victor Martinez (victored) wrote :

I wonder what happened. I could have sworn I merged this branch :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/SlingshotView.vala'
2--- src/SlingshotView.vala 2012-04-25 09:06:16 +0000
3+++ src/SlingshotView.vala 2012-05-10 14:16:17 +0000
4@@ -309,7 +309,7 @@
5 case "KP_1":
6 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
7 page_switcher.set_active (0);
8- else if (modality == Modality.CATEGORY_VIEW)
9+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
10 category_view.switcher.set_active (0);
11 else
12 return base.key_press_event (event);
13@@ -319,7 +319,7 @@
14 case "KP_2":
15 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
16 page_switcher.set_active (1);
17- else if (modality == Modality.CATEGORY_VIEW)
18+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
19 category_view.switcher.set_active (1);
20 else
21 return base.key_press_event (event);
22@@ -329,7 +329,7 @@
23 case "KP_3":
24 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
25 page_switcher.set_active (2);
26- else if (modality == Modality.CATEGORY_VIEW)
27+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
28 category_view.switcher.set_active (2);
29 else
30 return base.key_press_event (event);
31@@ -339,7 +339,7 @@
32 case "KP_4":
33 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
34 page_switcher.set_active (3);
35- else if (modality == Modality.CATEGORY_VIEW)
36+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
37 category_view.switcher.set_active (3);
38 else
39 return base.key_press_event (event);
40@@ -349,7 +349,7 @@
41 case "KP_5":
42 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
43 page_switcher.set_active (4);
44- else if (modality == Modality.CATEGORY_VIEW)
45+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
46 category_view.switcher.set_active (4);
47 else
48 return base.key_press_event (event);
49@@ -359,7 +359,7 @@
50 case "KP_6":
51 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
52 page_switcher.set_active (5);
53- else if (modality == Modality.CATEGORY_VIEW)
54+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
55 category_view.switcher.set_active (5);
56 else
57 return base.key_press_event (event);
58@@ -369,7 +369,7 @@
59 case "KP_7":
60 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
61 page_switcher.set_active (6);
62- else if (modality == Modality.CATEGORY_VIEW)
63+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
64 category_view.switcher.set_active (6);
65 else
66 return base.key_press_event (event);
67@@ -379,7 +379,7 @@
68 case "KP_8":
69 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
70 page_switcher.set_active (7);
71- else if (modality == Modality.CATEGORY_VIEW)
72+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
73 category_view.switcher.set_active (7);
74 else
75 return base.key_press_event (event);
76@@ -389,7 +389,7 @@
77 case "KP_9":
78 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
79 page_switcher.set_active (8);
80- else if (modality == Modality.CATEGORY_VIEW)
81+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
82 category_view.switcher.set_active (8);
83 else
84 return base.key_press_event (event);
85@@ -399,7 +399,7 @@
86 case "KP_0":
87 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
88 page_switcher.set_active (9);
89- else if (modality == Modality.CATEGORY_VIEW)
90+ else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
91 category_view.switcher.set_active (9);
92 else
93 return base.key_press_event (event);

Subscribers

People subscribed via source and target branches