Merge lp://staging/~alphapapa/pithos/907496 into lp://staging/~kevin-mehall/pithos/trunk
Proposed by
Adam Porter
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~alphapapa/pithos/907496 |
| Merge into: | lp://staging/~kevin-mehall/pithos/trunk |
| Diff against target: |
616 lines (+299/-68) 9 files modified
.bzrignore (+2/-0) bin/pithos (+38/-10) data/ui/PithosWindow.ui (+2/-2) data/ui/PreferencesPithosDialog.ui (+36/-21) pithos/PreferencesPithosDialog.py (+6/-3) pithos/dbus_service.py (+5/-1) pithos/plugins/notification_icon.py (+37/-27) pithos/plugins/notify.py (+30/-4) pithos/plugins/status_icon.py (+143/-0) |
| To merge this branch: | bzr merge lp://staging/~alphapapa/pithos/907496 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kevin Mehall | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 198. By Adam Porter
-
Make title in notification bigger than artist and album. Easier to read and looks better.
- 197. By Adam Porter
-
Fix love/unlove menu item changing.
- 196. By Adam Porter
-
Add separators back.
- 195. By Adam Porter
-
Just a bunch of changes and fixes from other branches. Some branches have other changes to notification_icon based on changes not made in this branch yet. This is getting too complicated. I hope Kevin merges into trunk soon.
- 194. By Adam Porter
-
Fix...
- 193. By Adam Porter
-
Add unlove item.
Use cancel icon for ban, not heartbroken icon. - 192. By Adam Porter
-
Use Gtk stock or filename image.
- 191. By Adam Porter
-
Changed love/ban to heart/broken-heart icons from 908389 branch.
- 190. By Adam Porter
-
Merged
- 189. By Adam Porter
-
UGH.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
