| Summary: | include telepathy-farstream 1.0 in telepathy-glib | ||
|---|---|---|---|
| Product: | Telepathy | Reporter: | Simon McVittie <smcv> |
| Component: | tp-farstream | Assignee: | Simon McVittie <smcv> |
| Status: | RESOLVED FIXED | QA Contact: | Telepathy bugs list <telepathy-bugs> |
| Severity: | normal | ||
| Priority: | medium | CC: | olivier.crete |
| Version: | git master | ||
| Hardware: | Other | ||
| OS: | All | ||
| Whiteboard: | |||
| i915 platform: | i915 features: | ||
| Bug Depends on: | |||
| Bug Blocks: | 73551 | ||
| Attachments: |
[tp-glib, before merge] COPYING: delete unused BSD licenses
[tpfs 1/8] Update tools from telepathy-glib [tpfs 2/8] Catch up with GLib deprecations [tpfs 3/8] Link g-i bindings to the correct telepathy-glib version [tpfs 4/8] TfCallStream: include missing header [tpfs 5/8] TfCallContent: compile with -Werror=shadow [tpfs 8/8] Remove unused Autoconf macros [tp-glib, after merge] Flatten telepathy-farstream/README into the top-level README |
||
|
Description
Simon McVittie
2014-01-08 20:36:14 UTC
Created attachment 91698 [details] [review] [tp-glib, before merge] COPYING: delete unused BSD licenses We had a prefix and suffix for non-LGPL licenses, but we no longer ship the BSD-licensed code, so we don't need those any more. (Also, this project is telepathy-glib, not Gabble.) Created attachment 91699 [details] [review] [tpfs 1/8] Update tools from telepathy-glib Created attachment 91700 [details] [review] [tpfs 2/8] Catch up with GLib deprecations Created attachment 91701 [details] [review] [tpfs 3/8] Link g-i bindings to the correct telepathy-glib version Created attachment 91702 [details] [review] [tpfs 4/8] TfCallStream: include missing header This fixes compilation with -Werror=missing-prototypes. Created attachment 91703 [details] [review] [tpfs 5/8] TfCallContent: compile with -Werror=shadow tp_asv_get_boolean() is documented to return FALSE in the "not valid" case, so there's no need to check it separately here. This avoids shadowing a variable named valid at function scope. j was previously named i, shadowing another i at function scope. Created attachment 91704 [details] [review] [tpfs 8/8] Remove unused Autoconf macros We still use AS_COMPILER_FLAG for now. tpfs 6/8: http://cgit.freedesktop.org/~smcv/telepathy-glib/commit/?h=merge-tp-fs&id=c0f6432c8de302d83a670943deac44b3817e0a7b tpfs 7/8: http://cgit.freedesktop.org/~smcv/telepathy-glib/commit/?h=merge-tp-fs&id=93f18ce1c28735cc15bdd171322d8b6ce05ebd0b The merge: http://cgit.freedesktop.org/~smcv/telepathy-glib/commit/?h=merge-tp-fs&id=a4779f6d9dc7f649ea453ea7508cb84917562a18 Created attachment 91705 [details] [review] [tp-glib, after merge] Flatten telepathy-farstream/README into the top-level README Also drop parts of telepathy-logger/README that are redundant with the top-level README. All the patches look good to me, merge 'em all ! I assume you ran the python example and they still work? (In reply to comment #10) > I assume you ran the python example and they still work? Not yet - I don't have a full-stack Telepathy 1.0 setup yet, apart from individual modules' "make check", since MC and the Logger still share some directory names between 0.x and 1.0. Which examples should I expect to work? examples/python/ don't look as though they're going to work (telepathy-python, Gst 0.10 and static bindings - Bug #69435). I don't intend to upgrade telepathy-python to Telepathy 1.0 since it's already obsolete. If I can expect call-handler.c to work, I can test that on a spare machine at some point, using examples/client/python/dialler.py from telepathy-glib... I was thinking of call-handler. If the python examples no longer work and you don't intend to port them, then feel free to delete them. Since my available time for Tp 1.0 is erratic, and it isn't a stable or necessarily even functional branch yet, I'm going to merge this untested, and worry about testing later: it's not as if this is a functionality regression. I'll clone a bug for "make sure it actually works"... Included in telepathy-glib 0.99.6 |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.