lp://qastaging/~indicator-applet-developers/indicator-messages/consolidate
Created by
Lars Karlitski
and last modified
- Get this branch:
- bzr branch lp://qastaging/~indicator-applet-developers/indicator-messages/consolidate
Members of
Indicator Applet Developers
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
1 branch
dependent on this one.
Merged
into
lp://qastaging/~indicator-applet-developers/indicator-messages/trunk.13.10
at
revision 356
- Sebastien Bacher: Approve
- PS Jenkins bot (community): Approve (continuous-integration)
-
Diff: 10261 lines (+5533/-3772)54 files modifiedCOPYING.GPLv3 (+674/-0)
Makefile.am (+1/-0)
autogen.sh (+11/-5)
common/Makefile.am (+32/-0)
common/com.canonical.indicator.messages.application.xml (+39/-0)
configure.ac (+22/-27)
data/Makefile.am (+4/-1)
data/com.canonical.indicator.messages (+10/-0)
debian/control (+7/-7)
debian/indicator-messages.install (+1/-1)
debian/libmessaging-menu-dev.install (+1/-0)
debian/libmessaging-menu0.symbols (+15/-0)
debian/source/format (+1/-0)
doc/reference/Makefile.am (+1/-2)
doc/reference/messaging-menu-docs.xml.in (+2/-1)
libmessaging-menu/Makefile.am (+33/-22)
libmessaging-menu/gtupleaction.c (+0/-354)
libmessaging-menu/gtupleaction.h (+0/-40)
libmessaging-menu/messaging-menu-app.c (+503/-270)
libmessaging-menu/messaging-menu-app.h (+17/-2)
libmessaging-menu/messaging-menu-message.c (+547/-0)
libmessaging-menu/messaging-menu-message.h (+70/-0)
libmessaging-menu/messaging-menu.h (+25/-0)
po/POTFILES.in (+13/-1)
po/indicator-messages.pot (+0/-46)
src/Makefile.am (+13/-60)
src/app-section.c (+279/-175)
src/dbus-data.h (+16/-1)
src/gactionmuxer.c (+8/-0)
src/gactionmuxer.h (+3/-0)
src/gmenuutils.c (+1/-1)
src/ido-detail-label.c (+0/-401)
src/ido-detail-label.h (+0/-59)
src/ido-menu-item.c (+0/-439)
src/ido-menu-item.h (+0/-54)
src/im-app-menu-item.c (+0/-354)
src/im-app-menu-item.h (+0/-54)
src/im-application-list.c (+1237/-0)
src/im-application-list.h (+62/-0)
src/im-desktop-menu.c (+303/-0)
src/im-desktop-menu.h (+35/-0)
src/im-menu.c (+198/-0)
src/im-menu.h (+64/-0)
src/im-phone-menu.c (+318/-0)
src/im-phone-menu.h (+68/-0)
src/im-source-menu-item.c (+0/-407)
src/im-source-menu-item.h (+0/-54)
src/indicator-desktop-shortcuts.c (+680/-0)
src/indicator-desktop-shortcuts.h (+80/-0)
src/indicator-messages.c (+0/-382)
src/messages-service.c (+98/-550)
test/Makefile.am (+3/-2)
test/indicator-messages-service-activate.c (+4/-0)
test/test-gactionmuxer.cpp (+34/-0)
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)