Indicator Applet

Merge lp:~charlesk/indicator-applet/lp-1049838 into lp:indicator-applet/12.10

  1. lp-1049838
  2. Merge into trunk.12.10
Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 404
Merged at revision: 404
Proposed branch: lp:~charlesk/indicator-applet/lp-1049838
Merge into: lp:indicator-applet/12.10
Diff against target: 37 lines (+15/-13)
1 file modified
src/applet-main.c (+15/-13)
To merge this branch: bzr merge lp:~charlesk/indicator-applet/lp-1049838
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve
Lars Karlitski (community) Approve
Review via email: mp+123968@code.launchpad.net

Commit message

Add position hint for Sync Indicator

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) wrote :

+1

review: Approve
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/indicator-applet-autolanding/2/

review: Needs Fixing (continuous-integration)
lp:~charlesk/indicator-applet/lp-1049838 updated
404. By Charles Kerr

copy indicator_order verbatim from unity/services/panel-service.c

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/indicator-applet-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-applet-ci/./label=quantal/1/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Apologies for Jenkins' false negative, correcting.

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/indicator-applet-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-applet-ci/./label=quantal/2/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/indicator-applet-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-applet-ci/./label=quantal/3/console

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/applet-main.c'
2--- src/applet-main.c 2012-09-12 02:20:14 +0000
3+++ src/applet-main.c 2012-09-13 06:48:18 +0000
4@@ -30,19 +30,21 @@
5 #include "libindicator/indicator-object.h"
6 #include "tomboykeybinder.h"
7
8-static gchar * indicator_order[][2] = {
9- {"libappmenu.so", NULL},
10- {"libapplication.so", NULL},
11- {"libapplication.so", "gst-keyboard-xkb"},
12- {"libmessaging.so", NULL},
13- {"libpower.so", NULL},
14- {"libapplication.so", "bluetooth-manager"},
15- {"libnetwork.so", NULL},
16- {"libnetworkmenu.so", NULL},
17- {"libapplication.so", "nm-applet"},
18- {"libsoundmenu.so", NULL},
19- {"libdatetime.so", NULL},
20- {"libsession.so", NULL},
21+static const gchar * indicator_order[][2] = {
22+ {"libappmenu.so", NULL}, /* indicator-appmenu" */
23+ {"libapplication.so", NULL}, /* indicator-application" */
24+ {"libprintersmenu.so", NULL}, /* indicator-printers */
25+ {"libsyncindicator.so", NULL}, /* indicator-sync */
26+ {"libapplication.so", "gsd-keyboard-xkb"}, /* keyboard layout selector */
27+ {"libmessaging.so", NULL}, /* indicator-messages */
28+ {"libpower.so", NULL}, /* indicator-power */
29+ {"libapplication.so", "bluetooth-manager"}, /* bluetooth manager */
30+ {"libnetwork.so", NULL}, /* indicator-network */
31+ {"libnetworkmenu.so", NULL}, /* indicator-network */
32+ {"libapplication.so", "nm-applet"}, /* network manager */
33+ {"libsoundmenu.so", NULL}, /* indicator-sound */
34+ {"libdatetime.so", NULL}, /* indicator-datetime */
35+ {"libsession.so", NULL}, /* indicator-session */
36 {NULL, NULL}
37 };
38

Subscribers

People subscribed via source and target branches