Merge lp://staging/~bcurtiswx/ubuntu/precise/empathy/3.4.2-0ubuntu1 into lp://staging/ubuntu/precise-proposed/empathy
Proposed by
Brian Curtis
| Status: | Merged |
|---|---|
| Merged at revision: | 186 |
| Proposed branch: | lp://staging/~bcurtiswx/ubuntu/precise/empathy/3.4.2-0ubuntu1 |
| Merge into: | lp://staging/ubuntu/precise-proposed/empathy |
| Diff against target: |
34672 lines (+5111/-23891) 62 files modified
.pc/.version (+0/-1) .pc/01_lpi.patch/configure.ac (+0/-656) .pc/01_lpi.patch/src/empathy-chat-window.c (+0/-2761) .pc/01_lpi.patch/src/empathy-chat-window.ui (+0/-229) .pc/01_lpi.patch/src/empathy-roster-window-menubar.ui (+0/-301) .pc/01_lpi.patch/src/empathy-roster-window.c (+0/-2754) .pc/10_use_notify_osd_icons.patch/libempathy-gtk/empathy-images.h (+0/-59) .pc/10_use_notify_osd_icons.patch/libempathy-gtk/empathy-ui-utils.c (+0/-2309) .pc/10_use_notify_osd_icons.patch/src/empathy-event-manager.c (+0/-1621) .pc/23_idomessagedialog_for_voip_and_ft.patch/configure.ac (+0/-657) .pc/23_idomessagedialog_for_voip_and_ft.patch/src/empathy-event-manager.c (+0/-1621) .pc/34_start_raised_execpt_in_session.patch/src/empathy-status-icon.c (+0/-536) .pc/37_facebook_default.patch/libempathy-gtk/empathy-protocol-chooser.c (+0/-641) .pc/38_lp_569289.patch/libempathy-gtk/empathy-irc-network-chooser.c (+0/-426) .pc/41_unity_launcher_progress.patch/configure.ac (+0/-659) .pc/41_unity_launcher_progress.patch/src/Makefile.am (+0/-236) .pc/41_unity_launcher_progress.patch/src/empathy-ft-manager.c (+0/-1186) .pc/42_shell_running.patch/src/empathy-chat-window.c (+0/-2767) .pc/43_quicklists.patch/data/empathy.desktop.in.in (+0/-16) .pc/applied-patches (+0/-9) ChangeLog (+104/-0) NEWS (+14/-0) config.h.in (+6/-0) configure (+20/-13) configure.ac (+5/-35) data/empathy-accounts.desktop (+1/-1) data/empathy-accounts.desktop.in (+1/-1) data/empathy.desktop (+2/-2) data/empathy.desktop.in (+1/-1) data/empathy.desktop.in.in (+1/-17) debian/changelog (+9/-0) debian/patches/01_lpi.patch (+24/-23) debian/patches/23_idomessagedialog_for_voip_and_ft.patch (+9/-9) debian/patches/41_unity_launcher_progress.patch (+13/-13) debian/patches/42_shell_running.patch (+9/-8) goa-mc-plugin/mcp-account-manager-goa.c (+1/-0) libempathy-gtk/empathy-account-widget-irc.ui (+1/-1) libempathy-gtk/empathy-chat.c (+2/-2) libempathy-gtk/empathy-contact-blocking-dialog.c (+1/-1) libempathy-gtk/empathy-images.h (+0/-1) libempathy-gtk/empathy-irc-network-chooser.c (+1/-1) libempathy-gtk/empathy-protocol-chooser.c (+0/-1) libempathy-gtk/empathy-ui-utils.c (+0/-3) libempathy/empathy-tp-chat.c (+1/-1) libempathy/empathy-tp-contact-factory.c (+1/-1) m4/intltool.m4 (+2/-2) po/Makefile.in.in (+2/-2) po/an.po (+2548/-1988) po/sk.po (+2289/-2041) src/Makefile.am (+0/-3) src/empathy-call-factory.c (+1/-1) src/empathy-call-observer.c (+1/-1) src/empathy-call-window.c (+3/-6) src/empathy-chat-window.c (+5/-60) src/empathy-chat-window.ui (+0/-1) src/empathy-event-manager.c (+27/-108) src/empathy-ft-manager.c (+0/-71) src/empathy-roster-window-menubar.ui (+0/-1) src/empathy-roster-window.c (+0/-6) src/empathy-status-icon.c (+2/-12) src/empathy-streamed-media-window.c (+3/-6) src/empathy-video-widget.c (+1/-2) |
| To merge this branch: | bzr merge lp://staging/~bcurtiswx/ubuntu/precise/empathy/3.4.2-0ubuntu1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Approve | ||
|
Review via email:
|
|||
Description of the change
* New upstream bug fix release.
- The buddy list window is very small by default
- IRC Edit Connection Parameters text alignment (LP: #996823)
- Translation updates.
To post a comment you must log in.
Revision history for this message
| Ken VanDine (ken-vandine) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
