Switchboard

Merge lp:~gero-bare/switchboard/fix-missing-navigation-bar into lp:~elementary-pantheon/switchboard/switchboard

  1. fix-missing-navigation-bar
  2. Merge into switchboard
Proposed by Gero.Bare
Status: Merged
Approved by: Danielle Foré
Approved revision: 613
Merged at revision: 613
Proposed branch: lp:~gero-bare/switchboard/fix-missing-navigation-bar
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 35 lines (+8/-6)
1 file modified
src/Switchboard.vala (+8/-6)
To merge this branch: bzr merge lp:~gero-bare/switchboard/fix-missing-navigation-bar
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+291549@code.launchpad.net

Commit message

Fix missing navigation button introduced in r612

Description of the change

Fix missing navigation button introduced in r612.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Switchboard.vala'
2--- src/Switchboard.vala 2016-04-10 19:57:21 +0000
3+++ src/Switchboard.vala 2016-04-11 20:03:43 +0000
4@@ -200,12 +200,6 @@
5 return false;
6 });
7
8- // Launch plug's executable
9- navigation_button.set_sensitive (true);
10- navigation_button.set_text (all_settings_label);
11- navigation_button.show ();
12- headerbar.title = plug.display_name;
13- current_plug = plug;
14
15 //FIXME lower priority for gcc plugs due crash bug #1528361
16 var priority = GLib.Priority.DEFAULT_IDLE;
17@@ -214,6 +208,13 @@
18 }
19
20 Idle.add (()=> {
21+ // Launch plug's executable
22+ navigation_button.set_sensitive (true);
23+ navigation_button.set_text (all_settings_label);
24+ navigation_button.show ();
25+ headerbar.title = plug.display_name;
26+ current_plug = plug;
27+
28 switch_to_plug (plug);
29 return false;
30 }, priority);
31@@ -587,3 +588,4 @@
32 _("Center;Control;Panel;Preferences;System;");
33 _("About System Settings");
34 #endif
35+

Subscribers

People subscribed via source and target branches

to all changes: