Merge lp://qastaging/~cjcurran/indicator-session/migrate-to-new-apt-api into lp://qastaging/indicator-session/0.4

Proposed by Conor Curran
Status: Superseded
Proposed branch: lp://qastaging/~cjcurran/indicator-session/migrate-to-new-apt-api
Merge into: lp://qastaging/indicator-session/0.4
Diff against target: 1049 lines (+212/-719) (has conflicts)
7 files modified
configure.ac (+4/-2)
src/Makefile.am (+1/-3)
src/apt-transaction.c (+0/-263)
src/apt-transaction.h (+0/-49)
src/apt-watcher.c (+190/-397)
src/apt-watcher.h (+1/-1)
src/user-widget.c (+16/-4)
Text conflict in src/user-widget.c
To merge this branch: bzr merge lp://qastaging/~cjcurran/indicator-session/migrate-to-new-apt-api
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+92083@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-02-08.

This proposal has been superseded by a proposal from 2012-02-08.

Description of the change

Brings correctness to the apt menuitem.

To post a comment you must log in.
242. By Conor Curran

properly fix conflict and make sure to not check for updates 1 minute after starting the service or Pitti will kill me :)

243. By Conor Curran

merge request comments acted upon

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches