Unity

Merge lp:~jconti/unity/indicator_order_width into lp:unity

  1. indicator_order_width
  2. Merge into trunk
Proposed by Jason Conti
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 1745
Proposed branch: lp:~jconti/unity/indicator_order_width
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
services/panel-service.c (+1/-1)
To merge this branch: bzr merge lp:~jconti/unity/indicator_order_width
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+83458@code.launchpad.net

Description of the change

The array indicator_order in services/panel-service.c has 2 columns but specifies 13 columns. It does have 13 rows though, which is probably where the current value originated.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Yes, indeed.

review: Approve
Revision history for this message
Andrea Azzarone (azzar1) wrote :

It makes sense.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'services/panel-service.c'
2--- services/panel-service.c 2011-10-13 16:46:47 +0000
3+++ services/panel-service.c 2011-11-25 23:26:25 +0000
4@@ -93,7 +93,7 @@
5
6 static guint32 _service_signals[LAST_SIGNAL] = { 0 };
7
8-static const gchar * indicator_order[][13] = {
9+static const gchar * indicator_order[][2] = {
10 {"libappmenu.so", NULL}, /* indicator-appmenu" */
11 {"libapplication.so", NULL}, /* indicator-application" */
12 {"libapplication.so", "gsd-keyboard-xkb"}, /* keyboard layout selector */