Merge lp:~xnox/indicator-applet/drop-u1 into lp:indicator-applet

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Charles Kerr
Approved revision: 429
Merged at revision: 428
Proposed branch: lp:~xnox/indicator-applet/drop-u1
Merge into: lp:indicator-applet
Diff against target: 23 lines (+0/-2)
2 files modified
debian/control (+0/-1)
src/applet-main.c (+0/-1)
To merge this branch: bzr merge lp:~xnox/indicator-applet/drop-u1
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+213873@code.launchpad.net

Commit message

Drop indicator-sync recommendation and references. (LP: #1300916)

Description of the change

Drop indicator-sync recommendation and references. (LP: #1300916)

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

xnox, thanks for the patch!

Since Jane's post says we won't have U1 support in Trusty, it feels we should also remove the reference to libsyncindicator.so in applet-main.c.

lp:~xnox/indicator-applet/drop-u1 updated
429. By Dimitri John Ledkov

Drop libsynindicator reference.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

> xnox, thanks for the patch!
>
> Since Jane's post says we won't have U1 support in Trusty, it feels we should
> also remove the reference to libsyncindicator.so in applet-main.c.

Good catch! updated.

Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Can this branch please be landed asap? even if just by itself?

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

in silo 11.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-08-21 15:32:36 +0000
+++ debian/control 2014-04-02 16:16:15 +0000
@@ -66,7 +66,6 @@
66 indicator-printers,66 indicator-printers,
67 indicator-session,67 indicator-session,
68 indicator-sound,68 indicator-sound,
69 indicator-sync
70Provides: indicator-renderer,69Provides: indicator-renderer,
71Description: Clone of the GNOME panel indicator applet70Description: Clone of the GNOME panel indicator applet
72 Indicator-applet is an applet to display information from71 Indicator-applet is an applet to display information from
7372
=== modified file 'src/applet-main.c'
--- src/applet-main.c 2014-03-20 19:07:49 +0000
+++ src/applet-main.c 2014-04-02 16:16:15 +0000
@@ -37,7 +37,6 @@
37 {"libappmenu.so", NULL}, /* indicator-appmenu" */37 {"libappmenu.so", NULL}, /* indicator-appmenu" */
38 {"libapplication.so", NULL}, /* indicator-application" */38 {"libapplication.so", NULL}, /* indicator-application" */
39 {"libprintersmenu.so", NULL}, /* indicator-printers */39 {"libprintersmenu.so", NULL}, /* indicator-printers */
40 {"libsyncindicator.so", NULL}, /* indicator-sync */
41 {"libapplication.so", "gsd-keyboard-xkb"}, /* keyboard layout selector */40 {"libapplication.so", "gsd-keyboard-xkb"}, /* keyboard layout selector */
42 {"libmessaging.so", NULL}, /* indicator-messages */41 {"libmessaging.so", NULL}, /* indicator-messages */
43 {"libbluetooth.so", NULL}, /* indicator-bluetooth */42 {"libbluetooth.so", NULL}, /* indicator-bluetooth */

Subscribers

People subscribed via source and target branches