diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2008-02-11 03:15:03 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2008-02-11 03:15:03 +0800 |
| commit | 0242d77256a8455f8e042bd82e499bee58fbfa00 (patch) | |
| tree | b159356b226c280d99d32e2d8773b4d46c63269c /docs | |
| parent | 5af1142965e18c7bfa7ac9286aa54a466da4dc1a (diff) | |
| parent | 374ef859079592419f4914c872c0c17b2aeea1a8 (diff) | |
| download | gsoc2013-empathy-0242d77256a8455f8e042bd82e499bee58fbfa00.tar gsoc2013-empathy-0242d77256a8455f8e042bd82e499bee58fbfa00.tar.gz gsoc2013-empathy-0242d77256a8455f8e042bd82e499bee58fbfa00.tar.bz2 gsoc2013-empathy-0242d77256a8455f8e042bd82e499bee58fbfa00.tar.lz gsoc2013-empathy-0242d77256a8455f8e042bd82e499bee58fbfa00.tar.xz gsoc2013-empathy-0242d77256a8455f8e042bd82e499bee58fbfa00.tar.zst gsoc2013-empathy-0242d77256a8455f8e042bd82e499bee58fbfa00.zip | |
Merge branch 'master' into ircGeneric
Conflicts:
libempathy-gtk/Makefile.am
libempathy-gtk/empathy-accounts-dialog.c
libempathy/Makefile.am
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libempathy-gtk/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/libempathy-gtk/libempathy-gtk-docs.sgml | 6 | ||||
| -rw-r--r-- | docs/libempathy-gtk/libempathy-gtk.types | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/docs/libempathy-gtk/Makefile.am b/docs/libempathy-gtk/Makefile.am index 2e8f2020d..ef71cdc85 100644 --- a/docs/libempathy-gtk/Makefile.am +++ b/docs/libempathy-gtk/Makefile.am @@ -21,6 +21,7 @@ CFILE_GLOB=$(top_srcdir)/libempathy-gtk/*.c IGNORE_HFILES= \ empathy-gtk-enum-types.h \ stamp-empathy-gtk-enum-types.h \ + ephy-spinner.h \ $(NULL) # CFLAGS and LDFLAGS for compiling scan program. Only needed diff --git a/docs/libempathy-gtk/libempathy-gtk-docs.sgml b/docs/libempathy-gtk/libempathy-gtk-docs.sgml index 774f05146..e2f09b5ca 100644 --- a/docs/libempathy-gtk/libempathy-gtk-docs.sgml +++ b/docs/libempathy-gtk/libempathy-gtk-docs.sgml @@ -19,10 +19,7 @@ <xi:include href="xml/empathy-about-dialog.xml"/> <xi:include href="xml/empathy-account-chooser.xml"/> <xi:include href="xml/empathy-accounts-dialog.xml"/> - <xi:include href="xml/empathy-account-widget-generic.xml"/> - <xi:include href="xml/empathy-account-widget-jabber.xml"/> - <xi:include href="xml/empathy-account-widget-msn.xml"/> - <xi:include href="xml/empathy-account-widget-salut.xml"/> + <xi:include href="xml/empathy-account-widget.xml"/> <xi:include href="xml/empathy-avatar-chooser.xml"/> <xi:include href="xml/empathy-avatar-image.xml"/> <xi:include href="xml/empathy-call-window.xml"/> @@ -55,7 +52,6 @@ <xi:include href="xml/empathy-status-icon.xml"/> <xi:include href="xml/empathy-theme-manager.xml"/> <xi:include href="xml/empathy-ui-utils.xml"/> - <xi:include href="xml/ephy-spinner.xml"/> </chapter> </part> diff --git a/docs/libempathy-gtk/libempathy-gtk.types b/docs/libempathy-gtk/libempathy-gtk.types index ed611c993..5cfb7b21a 100644 --- a/docs/libempathy-gtk/libempathy-gtk.types +++ b/docs/libempathy-gtk/libempathy-gtk.types @@ -22,5 +22,4 @@ empathy_theme_boxes_get_type empathy_theme_get_type empathy_theme_irc_get_type empathy_theme_manager_get_type -ephy_spinner_get_type |