diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-09-29 20:08:45 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-09-29 20:08:45 +0800 |
| commit | e3e5702a683c468ccc1742515b4033f32c7d1083 (patch) | |
| tree | 9036ec7c855079e59ec6b67128ee37134bb79abf /doc | |
| parent | f5490a416f103d552344f7df0238a39c1e76b537 (diff) | |
| download | gsoc2013-empathy-e3e5702a683c468ccc1742515b4033f32c7d1083.tar gsoc2013-empathy-e3e5702a683c468ccc1742515b4033f32c7d1083.tar.gz gsoc2013-empathy-e3e5702a683c468ccc1742515b4033f32c7d1083.tar.bz2 gsoc2013-empathy-e3e5702a683c468ccc1742515b4033f32c7d1083.tar.lz gsoc2013-empathy-e3e5702a683c468ccc1742515b4033f32c7d1083.tar.xz gsoc2013-empathy-e3e5702a683c468ccc1742515b4033f32c7d1083.tar.zst gsoc2013-empathy-e3e5702a683c468ccc1742515b4033f32c7d1083.zip | |
Initial Voice+Video support Fixes bug #468204 (Elliot Fairweather, Xavier
2007-09-29 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-call-window.c:
* libempathy-gtk/empathy-call-window.h:
* libempathy-gtk/empathy-contact-list-view.c:
* libempathy-gtk/empathy-call-window.glade:
* libempathy-gtk/Makefile.am:
* libempathy-gtk/empathy-chat-window.c:
* src/empathy-call-chandler.c:
* src/empathy-call.chandler:
* src/org.gnome.Empathy.Call.service.in:
* src/Makefile.am:
* libempathy/empathy-utils.c:
* libempathy/empathy-utils.h:
* libempathy/empathy-tp-call.c:
* libempathy/empathy-tp-call.h:
* libempathy/Makefile.am:
* libempathy/tp-stream-engine.xml:
* configure.ac:
* doc/libempathy-gtk/libempathy-gtk-docs.sgml:
* doc/libempathy/libempathy.types:
* doc/libempathy/libempathy-docs.sgml:
* doc/libempathy/Makefile.am:
* doc/libempathy/tmpl/empathy-utils.sgml: Initial Voice+Video support
Fixes bug #468204 (Elliot Fairweather, Xavier Claessens).
svn path=/trunk/; revision=339
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/libempathy-gtk/libempathy-gtk-docs.sgml | 1 | ||||
| -rw-r--r-- | doc/libempathy/Makefile.am | 6 | ||||
| -rw-r--r-- | doc/libempathy/libempathy-docs.sgml | 1 | ||||
| -rw-r--r-- | doc/libempathy/libempathy.types | 2 | ||||
| -rw-r--r-- | doc/libempathy/tmpl/empathy-utils.sgml | 8 |
5 files changed, 17 insertions, 1 deletions
diff --git a/doc/libempathy-gtk/libempathy-gtk-docs.sgml b/doc/libempathy-gtk/libempathy-gtk-docs.sgml index 05f9bd2bc..f66ffa1f4 100644 --- a/doc/libempathy-gtk/libempathy-gtk-docs.sgml +++ b/doc/libempathy-gtk/libempathy-gtk-docs.sgml @@ -43,5 +43,6 @@ <xi:include href="xml/empathy-contact-groups.xml"/> <xi:include href="xml/empathy-log-window.xml"/> <xi:include href="xml/empathy-spell-dialog.xml"/> + <xi:include href="xml/empathy-call-window.xml"/> </chapter> </book> diff --git a/doc/libempathy/Makefile.am b/doc/libempathy/Makefile.am index 0988c364f..206e2218a 100644 --- a/doc/libempathy/Makefile.am +++ b/doc/libempathy/Makefile.am @@ -43,7 +43,11 @@ CFILE_GLOB=$(top_srcdir)/libempathy/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES=empathy-filter-glue.h empathy-debug.h empathy-marshal.h +IGNORE_HFILES= \ + empathy-filter-glue.h \ + empathy-debug.h \ + empathy-marshal.h \ + tp-stream-engine-gen.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/doc/libempathy/libempathy-docs.sgml b/doc/libempathy/libempathy-docs.sgml index 6c1bd79d1..942c5f21d 100644 --- a/doc/libempathy/libempathy-docs.sgml +++ b/doc/libempathy/libempathy-docs.sgml @@ -19,6 +19,7 @@ <xi:include href="xml/empathy-tp-contact-list.xml"/> <xi:include href="xml/empathy-tp-chat.xml"/> <xi:include href="xml/empathy-tp-chatroom.xml"/> + <xi:include href="xml/empathy-tp-call.xml"/> <xi:include href="xml/empathy-contact-factory.xml"/> <xi:include href="xml/empathy-chatroom.xml"/> <xi:include href="xml/empathy-chatroom-manager.xml"/> diff --git a/doc/libempathy/libempathy.types b/doc/libempathy/libempathy.types index 3f8d7bf01..dbebb0bc0 100644 --- a/doc/libempathy/libempathy.types +++ b/doc/libempathy/libempathy.types @@ -17,6 +17,7 @@ #include <libempathy/empathy-tp-chatroom.h> #include <libempathy/empathy-enum-types.h> #include <libempathy/empathy-contact-factory.h> +#include <libempathy/empathy-tp-call.h> empathy_avatar_get_type empathy_chatroom_manager_get_type @@ -38,4 +39,5 @@ empathy_tp_chatroom_get_type empathy_reg_ex_type_get_type empathy_message_type_get_type empathy_contact_factory_get_type +empathy_tp_call_get_type diff --git a/doc/libempathy/tmpl/empathy-utils.sgml b/doc/libempathy/tmpl/empathy-utils.sgml index fb8edba30..f25e0f6a3 100644 --- a/doc/libempathy/tmpl/empathy-utils.sgml +++ b/doc/libempathy/tmpl/empathy-utils.sgml @@ -188,3 +188,11 @@ empathy-utils @Returns: +<!-- ##### FUNCTION empathy_call_contact ##### --> +<para> + +</para> + +@contact: + + |