aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/libempathy-gtk/Makefile.am4
-rw-r--r--docs/libempathy-gtk/libempathy-gtk-docs.sgml57
-rw-r--r--docs/libempathy-gtk/libempathy-gtk.types27
-rw-r--r--docs/libempathy/Makefile.am12
-rw-r--r--docs/libempathy/libempathy-docs.sgml34
-rw-r--r--docs/libempathy/libempathy.types29
6 files changed, 92 insertions, 71 deletions
diff --git a/docs/libempathy-gtk/Makefile.am b/docs/libempathy-gtk/Makefile.am
index a44a2861d..2e8f2020d 100644
--- a/docs/libempathy-gtk/Makefile.am
+++ b/docs/libempathy-gtk/Makefile.am
@@ -18,7 +18,9 @@ HFILE_GLOB=$(top_srcdir)/libempathy-gtk/*.h
CFILE_GLOB=$(top_srcdir)/libempathy-gtk/*.c
# Headers to ignore
-IGNORE_HFILES= \
+IGNORE_HFILES= \
+ empathy-gtk-enum-types.h \
+ stamp-empathy-gtk-enum-types.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 18ba0d642..6c9fab9d8 100644
--- a/docs/libempathy-gtk/libempathy-gtk-docs.sgml
+++ b/docs/libempathy-gtk/libempathy-gtk-docs.sgml
@@ -17,41 +17,46 @@
<chapter id="libempathy_api">
<title>libempathy-gtk API reference</title>
<xi:include href="xml/empathy-about-dialog.xml"/>
- <xi:include href="xml/empathy-cell-renderer-text.xml"/>
- <xi:include href="xml/empathy-contact-list-store.xml"/>
- <xi:include href="xml/empathy-main-window.xml"/>
- <xi:include href="xml/empathy-spell.xml"/>
<xi:include href="xml/empathy-account-chooser.xml"/>
- <xi:include href="xml/empathy-chat.xml"/>
- <xi:include href="xml/empathy-contact-list-view.xml"/>
- <xi:include href="xml/empathy-new-chatroom-dialog.xml"/>
- <xi:include href="xml/empathy-status-icon.xml"/>
<xi:include href="xml/empathy-accounts-dialog.xml"/>
- <xi:include href="xml/empathy-chatrooms-window.xml"/>
- <xi:include href="xml/empathy-contact-widget.xml"/>
- <xi:include href="xml/empathy-preferences.xml"/>
- <xi:include href="xml/empathy-status-presets.xml"/>
<xi:include href="xml/empathy-account-widget-generic.xml"/>
- <xi:include href="xml/empathy-smiley-manager.xml"/>
- <xi:include href="xml/empathy-chat-view.xml"/>
- <xi:include href="xml/empathy-geometry.xml"/>
- <xi:include href="xml/empathy-presence-chooser.xml"/>
- <xi:include href="xml/empathy-theme-manager.xml"/>
<xi:include href="xml/empathy-account-widget-jabber.xml"/>
- <xi:include href="xml/empathy-chat-window.xml"/>
- <xi:include href="xml/empathy-group-chat.xml"/>
- <xi:include href="xml/empathy-private-chat.xml"/>
- <xi:include href="xml/empathy-ui-utils.xml"/>
<xi:include href="xml/empathy-account-widget-msn.xml"/>
- <xi:include href="xml/empathy-contact-dialogs.xml"/>
- <xi:include href="xml/empathy-images.xml"/>
- <xi:include href="xml/empathy-profile-chooser.xml"/>
- <xi:include href="xml/ephy-spinner.xml"/>
+ <xi:include href="xml/empathy-account-widget-salut.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"/>
+ <xi:include href="xml/empathy-cell-renderer-activatable.xml"/>
<xi:include href="xml/empathy-cell-renderer-expander.xml"/>
+ <xi:include href="xml/empathy-cell-renderer-text.xml"/>
+ <xi:include href="xml/empathy-chatrooms-window.xml"/>
+ <xi:include href="xml/empathy-chat.xml"/>
+ <xi:include href="xml/empathy-chat-view.xml"/>
+ <xi:include href="xml/empathy-chat-window.xml"/>
+ <xi:include href="xml/empathy-contact-dialogs.xml"/>
<xi:include href="xml/empathy-contact-groups.xml"/>
+ <xi:include href="xml/empathy-contact-list-store.xml"/>
+ <xi:include href="xml/empathy-contact-list-view.xml"/>
+ <xi:include href="xml/empathy-contact-widget.xml"/>
+ <xi:include href="xml/empathy-geometry.xml"/>
+ <xi:include href="xml/empathy-group-chat.xml"/>
+ <xi:include href="xml/empathy-images.xml"/>
<xi:include href="xml/empathy-log-window.xml"/>
+ <xi:include href="xml/empathy-main-window.xml"/>
+ <xi:include href="xml/empathy-new-chatroom-dialog.xml"/>
+ <xi:include href="xml/empathy-new-message-dialog.xml"/>
+ <xi:include href="xml/empathy-preferences.xml"/>
+ <xi:include href="xml/empathy-presence-chooser.xml"/>
+ <xi:include href="xml/empathy-private-chat.xml"/>
+ <xi:include href="xml/empathy-profile-chooser.xml"/>
+ <xi:include href="xml/empathy-smiley-manager.xml"/>
<xi:include href="xml/empathy-spell-dialog.xml"/>
- <xi:include href="xml/empathy-call-window.xml"/>
+ <xi:include href="xml/empathy-spell.xml"/>
+ <xi:include href="xml/empathy-status-icon.xml"/>
+ <xi:include href="xml/empathy-status-presets.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 0be447042..ed611c993 100644
--- a/docs/libempathy-gtk/libempathy-gtk.types
+++ b/docs/libempathy-gtk/libempathy-gtk.types
@@ -1,15 +1,26 @@
-empathy_cell_renderer_text_get_type
empathy_account_chooser_get_type
+empathy_avatar_chooser_get_type
+empathy_avatar_image_get_type
+empathy_cell_renderer_activatable_get_type
+empathy_cell_renderer_expander_get_type
+empathy_cell_renderer_text_get_type
empathy_chat_get_type
+empathy_chat_view_get_type
empathy_chat_window_get_type
-empathy_contact_list_view_get_type
empathy_contact_list_store_get_type
-empathy_status_icon_get_type
-empathy_chat_view_get_type
-empathy_presence_chooser_get_type
-empathy_theme_manager_get_type
+empathy_contact_list_view_get_type
empathy_group_chat_get_type
+empathy_contact_widget_flags_get_type
+empathy_contact_list_store_sort_get_type
+empathy_contact_list_store_col_get_type
+empathy_chat_view_block_get_type
+empathy_presence_chooser_get_type
empathy_private_chat_get_type
-ephy_spinner_get_type
-empathy_cell_renderer_expander_get_type
empathy_smiley_manager_get_type
+empathy_status_icon_get_type
+empathy_theme_boxes_get_type
+empathy_theme_get_type
+empathy_theme_irc_get_type
+empathy_theme_manager_get_type
+ephy_spinner_get_type
+
diff --git a/docs/libempathy/Makefile.am b/docs/libempathy/Makefile.am
index 5192a0556..7cf0108c2 100644
--- a/docs/libempathy/Makefile.am
+++ b/docs/libempathy/Makefile.am
@@ -18,11 +18,13 @@ HFILE_GLOB=$(top_srcdir)/libempathy/*.h
CFILE_GLOB=$(top_srcdir)/libempathy/*.c
# Headers to ignore
-IGNORE_HFILES= \
- empathy-filter-glue.h \
- empathy-debug.h \
- empathy-marshal.h \
- tp-stream-engine-gen.h \
+IGNORE_HFILES= \
+ empathy-filter-glue.h \
+ empathy-debug.h \
+ empathy-marshal.h \
+ tp-stream-engine-gen.h \
+ stamp-empathy-enum-types.h \
+ empathy-chandler-glue.h \
$(NULL)
# CFLAGS and LDFLAGS for compiling scan program. Only needed
diff --git a/docs/libempathy/libempathy-docs.sgml b/docs/libempathy/libempathy-docs.sgml
index e74d48df7..f0f49869e 100644
--- a/docs/libempathy/libempathy-docs.sgml
+++ b/docs/libempathy/libempathy-docs.sgml
@@ -16,25 +16,29 @@
<title>API Reference</title>
<chapter id="libempathy_api">
<title>libempathy API reference</title>
- <xi:include href="xml/empathy-time.xml"/>
- <xi:include href="xml/empathy-conf.xml"/>
<xi:include href="xml/empathy-avatar.xml"/>
- <xi:include href="xml/empathy-message.xml"/>
- <xi:include href="xml/empathy-presence.xml"/>
- <xi:include href="xml/empathy-contact.xml"/>
- <xi:include href="xml/empathy-contact-list.xml"/>
- <xi:include href="xml/empathy-tp-group.xml"/>
- <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-chandler.xml"/>
<xi:include href="xml/empathy-chatroom-manager.xml"/>
- <xi:include href="xml/empathy-log-manager.xml"/>
+ <xi:include href="xml/empathy-chatroom.xml"/>
+ <xi:include href="xml/empathy-conf.xml"/>
+ <xi:include href="xml/empathy-contact-factory.xml"/>
+ <xi:include href="xml/empathy-contact-list.xml"/>
+ <xi:include href="xml/empathy-contact-manager.xml"/>
+ <xi:include href="xml/empathy-contact.xml"/>
+ <xi:include href="xml/empathy-enum-types.xml"/>
<xi:include href="xml/empathy-filter.xml"/>
- <xi:include href="xml/empathy-chandler.xml"/>
<xi:include href="xml/empathy-idle.xml"/>
+ <xi:include href="xml/empathy-log-manager.xml"/>
+ <xi:include href="xml/empathy-message.xml"/>
+ <xi:include href="xml/empathy-presence.xml"/>
+ <xi:include href="xml/empathy-time.xml"/>
+ <xi:include href="xml/empathy-tp-call.xml"/>
+ <xi:include href="xml/empathy-tp-chatroom.xml"/>
+ <xi:include href="xml/empathy-tp-chat.xml"/>
+ <xi:include href="xml/empathy-tp-contact-factory.xml"/>
+ <xi:include href="xml/empathy-tp-contact-list.xml"/>
+ <xi:include href="xml/empathy-tp-group.xml"/>
+ <xi:include href="xml/empathy-tp-roomlist.xml"/>
<xi:include href="xml/empathy-utils.xml"/>
</chapter>
</part>
diff --git a/docs/libempathy/libempathy.types b/docs/libempathy/libempathy.types
index 6c46c40a4..e056cc834 100644
--- a/docs/libempathy/libempathy.types
+++ b/docs/libempathy/libempathy.types
@@ -1,22 +1,19 @@
-empathy_avatar_get_type
-empathy_chatroom_manager_get_type
+empathy_contact_list_get_type
empathy_contact_manager_get_type
+empathy_reg_ex_type_get_type
+empathy_message_type_get_type
+empathy_capabilities_get_type
+empathy_tp_call_status_get_type
+empathy_filter_get_type
empathy_idle_get_type
-empathy_presence_get_type
-empathy_tp_contact_list_get_type
-empathy_conf_get_type
empathy_log_manager_get_type
-empathy_tp_group_get_type
-empathy_chandler_get_type
-empathy_contact_get_type
-empathy_tp_chat_get_type
-empathy_chatroom_get_type
-empathy_contact_list_get_type
-empathy_filter_get_type
empathy_message_get_gtype
-empathy_tp_chatroom_get_type
-empathy_reg_ex_type_get_type
-empathy_message_type_get_type
-empathy_contact_factory_get_type
+empathy_presence_get_type
empathy_tp_call_get_type
+empathy_tp_chat_get_type
+empathy_tp_chatroom_get_type
+empathy_tp_contact_factory_get_type
+empathy_tp_contact_list_get_type
+empathy_tp_group_get_type
+empathy_tp_roomlist_get_type