Merge lp://staging/~bcurtiswx/ubuntu/precise/empathy/3.4.2.3-0ubuntu1 into lp://staging/ubuntu/precise-proposed/empathy
Proposed by
Brian Curtis
| Status: | Merged |
|---|---|
| Merged at revision: | 190 |
| Proposed branch: | lp://staging/~bcurtiswx/ubuntu/precise/empathy/3.4.2.3-0ubuntu1 |
| Merge into: | lp://staging/ubuntu/precise-proposed/empathy |
| Diff against target: |
90848 lines (+9925/-28942) 74 files modified
.pc/01_lpi.patch/configure.ac (+0/-660) .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/-661) .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/-663) .pc/41_unity_launcher_progress.patch/src/Makefile.am (+0/-241) .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 (+7975/-7846) Makefile.in (+54/-26) NEWS (+18/-0) aclocal.m4 (+286/-234) config.guess (+136/-115) config.sub (+125/-64) configure (+222/-106) configure.ac (+1/-34) data/Makefile.in (+33/-26) data/empathy-accounts.desktop (+1/-1) data/empathy-accounts.desktop.in (+1/-1) data/empathy.desktop (+1/-1) data/empathy.desktop.in (+1/-1) data/empathy.desktop.in.in (+1/-17) data/icons/Makefile.in (+23/-11) debian/changelog (+12/-0) depcomp (+66/-8) extensions/Makefile.in (+39/-33) goa-mc-plugin/Makefile.in (+41/-27) help/Makefile.in (+22/-11) install-sh (+18/-11) libempathy-gtk/Makefile.in (+43/-30) libempathy-gtk/empathy-account-widget.c (+0/-11) libempathy-gtk/empathy-chat.c (+33/-11) 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/Makefile.in (+44/-33) libempathy/empathy-client-factory.c (+1/-5) libempathy/empathy-ft-factory.c (+4/-2) libempathy/empathy-tp-chat.c (+11/-40) libempathy/empathy-tp-chat.h (+0/-1) ltmain.sh (+56/-37) m4/intltool.m4 (+46/-25) m4/libtool.m4 (+208/-57) m4/ltoptions.m4 (+17/-2) m4/ltversion.m4 (+5/-5) missing (+4/-49) nautilus-sendto-plugin/Makefile.in (+41/-27) po/Makefile.in.in (+9/-4) src/Makefile.am (+0/-3) src/Makefile.in (+167/-214) src/empathy-auth-client.c (+2/-2) src/empathy-chat-window.c (+5/-60) src/empathy-chat-window.ui (+0/-1) src/empathy-event-manager.c (+23/-104) 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) tests/Makefile.in (+42/-34) tests/interactive/Makefile.in (+41/-33) tests/xml/Makefile.in (+22/-11) tools/Makefile.in (+22/-11) |
| To merge this branch: | bzr merge lp://staging/~bcurtiswx/ubuntu/precise/empathy/3.4.2.3-0ubuntu1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Pending | ||
|
Review via email:
|
|||
Description of the change
empathy (3.4.2.3-0ubuntu1) UNRELEASED; urgency=low
* New upstream release (LP: #1018784).
- Use a weak reference while loading the logs asynchronously to detect when the object has been destroyed
- irc connection parameters dialog: "apply" button stays unsensitive (Guillaume Desmottes)
- empathy-chat crashed with SIGSEGV in _tp_base_
-- Brian Curtis <email address hidden> Thu, 28 Jun 2012 11:45:02 -0400
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
