[evolution] Finish adding symbols to libeutil API docs.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Finish adding symbols to libeutil API docs.
- Date: Sat, 15 Dec 2012 13:16:45 +0000 (UTC)
commit 5e2efa2cd4ac7891fdf316dafd9ab249086e842a
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Dec 14 07:25:24 2012 -0500
Finish adding symbols to libeutil API docs.
doc/reference/libeutil/Makefile.am | 9 +-
doc/reference/libeutil/libeutil-docs.sgml | 127 +-
doc/reference/libeutil/libeutil-sections.txt | 2979 +++++++++++++++++++++++++-
doc/reference/libeutil/libeutil.types | 1 +
e-util/e-action-combo-box.c | 12 +-
e-util/e-action-combo-box.h | 6 +-
e-util/e-activity-bar.h | 2 +-
e-util/e-activity-proxy.h | 2 +-
e-util/e-activity.h | 2 +-
e-util/e-alert-bar.h | 2 +-
e-util/e-alert-dialog.h | 2 +-
e-util/e-alert-sink.h | 2 +-
e-util/e-alert.h | 2 +-
e-util/e-attachment-bar.h | 2 +-
e-util/e-attachment-button.h | 2 +-
e-util/e-attachment-dialog.h | 2 +-
e-util/e-attachment-handler-image.h | 2 +-
e-util/e-attachment-handler-sendto.h | 2 +-
e-util/e-attachment-handler.h | 2 +-
e-util/e-attachment-icon-view.h | 2 +-
e-util/e-attachment-paned.h | 2 +-
e-util/e-attachment-store.h | 2 +-
e-util/e-attachment-tree-view.h | 2 +-
e-util/e-attachment-view.h | 2 +-
e-util/e-attachment.h | 2 +-
e-util/e-bit-array.c | 2 +-
e-util/e-bit-array.h | 120 +-
e-util/e-calendar-item.h | 2 +-
e-util/e-calendar.h | 2 +-
e-util/e-canvas.h | 2 +-
e-util/e-categories-dialog.h | 2 +-
e-util/e-categories-editor.h | 2 +-
e-util/e-categories-selector.h | 2 +-
e-util/e-category-completion.h | 2 +-
e-util/e-category-editor.h | 2 +-
e-util/e-cell-renderer-color.h | 2 +-
e-util/e-cell.h | 2 -
e-util/e-charset-combo-box.h | 2 +-
e-util/e-config.h | 2 +-
e-util/e-contact-store.h | 8 +-
e-util/e-dateedit.h | 2 +-
e-util/e-datetime-format.h | 32 +-
e-util/e-destination-store.h | 2 +-
e-util/e-event.h | 4 +-
e-util/e-filter-code.h | 2 +-
e-util/e-filter-color.h | 2 +-
e-util/e-filter-datespec.h | 2 +-
e-util/e-filter-element.c | 2 +
e-util/e-filter-element.h | 4 +-
e-util/e-filter-file.h | 2 +-
e-util/e-filter-input.h | 2 +-
e-util/e-filter-int.h | 2 +-
e-util/e-filter-option.h | 2 +-
e-util/e-filter-part.h | 2 +-
e-util/e-filter-rule.h | 2 +-
e-util/e-focus-tracker.h | 2 +-
e-util/e-image-chooser.h | 2 +-
e-util/e-import-assistant.h | 2 +-
e-util/e-import.h | 2 +-
e-util/e-interval-chooser.c | 4 +-
e-util/e-interval-chooser.h | 4 +-
e-util/e-map.h | 2 +-
e-util/e-menu-tool-action.h | 2 +-
e-util/e-menu-tool-button.h | 2 +-
e-util/e-misc-utils.h | 3 +
e-util/e-name-selector-dialog.h | 2 +-
e-util/e-name-selector-entry.h | 2 +-
e-util/e-name-selector-list.h | 2 +-
e-util/e-name-selector-model.h | 2 +-
e-util/e-name-selector.h | 2 +-
e-util/e-online-button.h | 2 +-
e-util/e-paned.h | 2 +-
e-util/e-picture-gallery.h | 2 +-
e-util/e-plugin-ui.h | 2 +-
e-util/e-plugin.h | 20 +-
e-util/e-popup-action.h | 2 +-
e-util/e-preferences-window.h | 2 +-
e-util/e-preview-pane.h | 2 +-
e-util/e-printable.c | 7 +-
e-util/e-printable.h | 114 +-
e-util/e-reflow-model.h | 118 +-
e-util/e-reflow.h | 2 +-
e-util/e-rule-context.h | 2 +-
e-util/e-rule-editor.h | 2 +-
e-util/e-search-bar.h | 11 +-
e-util/e-selectable.h | 2 +-
e-util/e-selection-model-array.c | 8 +-
e-util/e-selection-model-array.h | 87 +-
e-util/e-selection-model-simple.c | 4 +-
e-util/e-selection-model-simple.h | 75 +-
e-util/e-selection-model.c | 2 +-
e-util/e-selection-model.h | 15 +-
e-util/e-send-options.h | 67 +-
e-util/e-sorter-array.c | 4 +-
e-util/e-sorter-array.h | 80 +-
e-util/e-sorter.c | 2 +-
e-util/e-sorter.h | 97 +-
e-util/e-source-combo-box.h | 2 +-
e-util/e-source-selector-dialog.h | 2 +-
e-util/e-source-selector.h | 2 +-
e-util/e-spell-entry.h | 55 +-
e-util/e-stock-request.h | 2 +-
e-util/e-table-config.h | 2 +-
e-util/e-table-extras.h | 3 +-
e-util/e-table-field-chooser-item.h | 28 +-
e-util/e-table-group-container.h | 4 +-
e-util/e-table-header-item.h | 2 +-
e-util/e-table-item.h | 136 +-
e-util/e-table-memory-callbacks.h | 18 +-
e-util/e-table-memory-store.h | 12 +-
e-util/e-table-selection-model.c | 5 +-
e-util/e-table-sorter.c | 2 +-
e-util/e-table.h | 2 +-
e-util/e-text-event-processor-emacs-like.c | 4 +-
e-util/e-text-event-processor-emacs-like.h | 50 +-
e-util/e-text-event-processor-types.h | 6 +-
e-util/e-text-event-processor.h | 58 +-
e-util/e-text-model.h | 155 +-
e-util/e-text.c | 2 +-
e-util/e-text.h | 78 +-
e-util/e-timezone-dialog.h | 2 +-
e-util/e-tree-model-generator.h | 2 +-
e-util/e-tree-model.h | 11 +-
e-util/e-tree.c | 52 +-
e-util/e-tree.h | 11 +-
e-util/e-ui-manager.h | 2 +-
e-util/e-unicode.h | 49 +-
e-util/e-url-entry.h | 42 +-
e-util/e-web-view-gtkhtml.h | 181 +-
e-util/e-web-view-preview.c | 20 +-
e-util/e-web-view-preview.h | 6 +-
e-util/e-web-view.h | 28 +-
e-util/gal-define-views-dialog.c | 2 +-
e-util/gal-define-views-model.c | 13 +-
e-util/gal-define-views-model.h | 63 +-
e-util/gal-view-collection.c | 2 +-
e-util/gal-view-collection.h | 162 +-
e-util/gal-view-factory-etable.h | 2 +-
e-util/gal-view-instance-save-as-dialog.c | 2 +-
e-util/gal-view-instance.c | 2 +-
e-util/gal-view-instance.h | 107 +-
e-util/gal-view-new-dialog.c | 2 +-
e-util/gal-view-new-dialog.h | 56 +-
143 files changed, 4433 insertions(+), 1174 deletions(-)
---
diff --git a/doc/reference/libeutil/Makefile.am b/doc/reference/libeutil/Makefile.am
index 4239299..f987bcb 100644
--- a/doc/reference/libeutil/Makefile.am
+++ b/doc/reference/libeutil/Makefile.am
@@ -16,17 +16,22 @@ CFILE_GLOB = $(top_srcdir)/e-util/*.c
# Ignore all accessiblity headers.
IGNORE_HFILES = \
+ e-marshal.h \
+ e-table-col-dnd.h \
+ e-table-defines.h \
+ e-util-enumtypes.h \
+ e-util-private.h \
ea-calendar-cell.h \
ea-calendar-item.h \
ea-cell-table.h \
ea-factory.h \
ea-widgets.h \
+ gal-a11y-e-cell.h \
+ gal-a11y-e-cell-popup.h \
gal-a11y-e-cell-registry.h \
gal-a11y-e-cell-toggle.h \
gal-a11y-e-cell-tree.h \
gal-a11y-e-cell-vbox.h \
- gal-a11y-e-cell.h \
- gal-a11y-e-popup.h \
gal-a11y-e-table-click-to-add-factory.h \
gal-a11y-e-table-click-to-add.h \
gal-a11y-e-table-column-header.h \
diff --git a/doc/reference/libeutil/libeutil-docs.sgml b/doc/reference/libeutil/libeutil-docs.sgml
index 329047b..2206b11 100644
--- a/doc/reference/libeutil/libeutil-docs.sgml
+++ b/doc/reference/libeutil/libeutil-docs.sgml
@@ -5,7 +5,7 @@
]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude";>
<bookinfo>
- <title>Evolution Utilities (libeutil)</title>
+ <title>Evolution Utilities Reference Manual</title>
<releaseinfo>
The latest version of this documentation can be found on-line at
<ulink role="online-location" url="http://library.gnome.org/devel/libeutil/";>http://library.gnome.org/devel/libeutil/</ulink>.
@@ -14,22 +14,35 @@
<chapter>
<title>Basic Utility Functions</title>
- <xi:include href="xml/e-alert.xml"/>
<xi:include href="xml/e-datetime-format.xml"/>
<xi:include href="xml/e-html-utils.xml"/>
<xi:include href="xml/e-misc-utils.xml"/>
- <xi:include href="xml/e-poolv.xml"/>
<xi:include href="xml/e-print.xml"/>
<xi:include href="xml/e-selection.xml"/>
+ <xi:include href="xml/e-unicode.xml"/>
<xi:include href="xml/e-xml-utils.xml"/>
- <xi:include href="xml/e-bit-array.xml"/>
<xi:include href="xml/e-dialog-utils.xml"/>
<xi:include href="xml/e-icon-factory.xml"/>
<xi:include href="xml/e-passwords.xml"/>
</chapter>
<chapter>
- <title>Attachment Management</title>
+ <title>Activities</title>
+ <xi:include href="xml/e-activity.xml"/>
+ <xi:include href="xml/e-activity-bar.xml"/>
+ <xi:include href="xml/e-activity-proxy.xml"/>
+ </chapter>
+
+ <chapter>
+ <title>Alerts</title>
+ <xi:include href="xml/e-alert.xml"/>
+ <xi:include href="xml/e-alert-bar.xml"/>
+ <xi:include href="xml/e-alert-dialog.xml"/>
+ <xi:include href="xml/e-alert-sink.xml"/>
+ </chapter>
+
+ <chapter>
+ <title>Attachments</title>
<xi:include href="xml/e-attachment.xml"/>
<xi:include href="xml/e-attachment-bar.xml"/>
<xi:include href="xml/e-attachment-button.xml"/>
@@ -43,13 +56,21 @@
</chapter>
<chapter>
- <title>Category Management</title>
- <xi:include href="xml/e-categories-config.xml"/>
+ <title>Canvas Drawing</title>
+ <xi:include href="xml/e-canvas.xml"/>
+ <xi:include href="xml/e-canvas-background.xml"/>
+ <xi:include href="xml/e-canvas-vbox.xml"/>
+ <xi:include href="xml/e-canvas-utils.xml"/>
+ </chapter>
+
+ <chapter>
+ <title>Categories</title>
<xi:include href="xml/e-categories-dialog.xml"/>
<xi:include href="xml/e-categories-editor.xml"/>
<xi:include href="xml/e-categories-selector.xml"/>
<xi:include href="xml/e-category-completion.xml"/>
<xi:include href="xml/e-category-editor.xml"/>
+ <xi:include href="xml/e-categories-config.xml"/>
</chapter>
<chapter>
@@ -69,14 +90,31 @@
</chapter>
<chapter>
+ <title>HTML Rendering</title>
+ <xi:include href="xml/e-web-view.xml"/>
+ <xi:include href="xml/e-web-view-preview.xml"/>
+ <xi:include href="xml/e-web-view-gtkhtml.xml"/>
+ <xi:include href="xml/e-file-request.xml"/>
+ <xi:include href="xml/e-stock-request.xml"/>
+ </chapter>
+
+ <chapter>
+ <title>Mail Signatures</title>
+ <xi:include href="xml/e-mail-signature-combo-box.xml"/>
+ <xi:include href="xml/e-mail-signature-editor.xml"/>
+ <xi:include href="xml/e-mail-signature-manager.xml"/>
+ <xi:include href="xml/e-mail-signature-preview.xml"/>
+ <xi:include href="xml/e-mail-signature-script-dialog.xml"/>
+ <xi:include href="xml/e-mail-signature-tree-view.xml"/>
+ </chapter>
+
+ <chapter>
<title>Tables and Trees</title>
<xi:include href="xml/e-table.xml"/>
<xi:include href="xml/e-table-click-to-add.xml"/>
- <xi:include href="xml/e-table-col-dnd.xml"/>
<xi:include href="xml/e-table-col.xml"/>
<xi:include href="xml/e-table-column-specification.xml"/>
<xi:include href="xml/e-table-config.xml"/>
- <xi:include href="xml/e-table-defines.xml"/>
<xi:include href="xml/e-table-extras.xml"/>
<xi:include href="xml/e-table-field-chooser-dialog.xml"/>
<xi:include href="xml/e-table-field-chooser-item.xml"/>
@@ -85,7 +123,6 @@
<xi:include href="xml/e-table-group-leaf.xml"/>
<xi:include href="xml/e-table-group.xml"/>
<xi:include href="xml/e-table-header-item.xml"/>
- <xi:include href="xml/e-table-header-utils.xml"/>
<xi:include href="xml/e-table-header.xml"/>
<xi:include href="xml/e-table-item.xml"/>
<xi:include href="xml/e-table-memory-callbacks.xml"/>
@@ -132,13 +169,26 @@
</chapter>
<chapter>
+ <title>ESource Support</title>
+ <xi:include href="xml/e-source-config.xml"/>
+ <xi:include href="xml/e-book-source-config.xml"/>
+ <xi:include href="xml/e-cal-source-config.xml"/>
+ <xi:include href="xml/e-source-config-backend.xml"/>
+ <xi:include href="xml/e-source-config-dialog.xml"/>
+ <xi:include href="xml/e-source-selector.xml"/>
+ <xi:include href="xml/e-alarm-selector.xml"/>
+ <xi:include href="xml/e-autocomplete-selector.xml"/>
+ <xi:include href="xml/e-source-selector-dialog.xml"/>
+ <xi:include href="xml/e-source-combo-box.xml"/>
+ <xi:include href="xml/e-source-util.xml"/>
+ </chapter>
+
+ <chapter>
<title>Text Processing</title>
<xi:include href="xml/e-text.xml"/>
<xi:include href="xml/e-text-model.xml"/>
- <xi:include href="xml/e-text-model-repos.xml"/>
<xi:include href="xml/e-text-event-processor.xml"/>
<xi:include href="xml/e-text-event-processor-emacs-like.xml"/>
- <xi:include href="xml/e-text-event-processor-types.xml"/>
<xi:include href="xml/e-reflow.xml"/>
<xi:include href="xml/e-reflow-model.xml"/>
</chapter>
@@ -158,54 +208,36 @@
</chapter>
<chapter>
+ <title>Plugins (Legacy)</title>
+ <xi:include href="xml/e-plugin.xml"/>
+ <xi:include href="xml/e-plugin-ui.xml"/>
+ <xi:include href="xml/e-config.xml"/>
+ <xi:include href="xml/e-event.xml"/>
+ <xi:include href="xml/e-import.xml"/>
+ </chapter>
+
+ <chapter>
<title>(Unsorted Sections)</title>
<xi:include href="xml/e-action-combo-box.xml"/>
- <xi:include href="xml/e-activity-bar.xml"/>
- <xi:include href="xml/e-activity-proxy.xml"/>
- <xi:include href="xml/e-activity.xml"/>
- <xi:include href="xml/e-alarm-selector.xml"/>
- <xi:include href="xml/e-alert-bar.xml"/>
- <xi:include href="xml/e-alert-dialog.xml"/>
- <xi:include href="xml/e-alert-sink.xml"/>
<xi:include href="xml/e-auth-combo-box.xml"/>
- <xi:include href="xml/e-autocomplete-selector.xml"/>
- <xi:include href="xml/e-book-source-config.xml"/>
+ <xi:include href="xml/e-bit-array.xml"/>
<xi:include href="xml/e-buffer-tagger.xml"/>
- <xi:include href="xml/e-cal-source-config.xml"/>
<xi:include href="xml/e-calendar-item.xml"/>
<xi:include href="xml/e-calendar.xml"/>
- <xi:include href="xml/e-canvas-background.xml"/>
- <xi:include href="xml/e-canvas-utils.xml"/>
- <xi:include href="xml/e-canvas-vbox.xml"/>
- <xi:include href="xml/e-canvas.xml"/>
<xi:include href="xml/e-cell-renderer-color.xml"/>
<xi:include href="xml/e-charset-combo-box.xml"/>
- <xi:include href="xml/e-charset.xml"/>
<xi:include href="xml/e-client-utils.xml"/>
- <xi:include href="xml/e-config.xml"/>
<xi:include href="xml/e-contact-store.xml"/>
<xi:include href="xml/e-dateedit.xml"/>
<xi:include href="xml/e-destination-store.xml"/>
- <xi:include href="xml/e-dialog-widgets.xml"/>
- <xi:include href="xml/e-event.xml"/>
- <xi:include href="xml/e-file-request.xml"/>
- <xi:include href="xml/e-file-utils.xml"/>
<xi:include href="xml/e-focus-tracker.xml"/>
<xi:include href="xml/e-image-chooser.xml"/>
<xi:include href="xml/e-import-assistant.xml"/>
- <xi:include href="xml/e-import.xml"/>
<xi:include href="xml/e-interval-chooser.xml"/>
<xi:include href="xml/e-mail-identity-combo-box.xml"/>
- <xi:include href="xml/e-mail-signature-combo-box.xml"/>
- <xi:include href="xml/e-mail-signature-editor.xml"/>
- <xi:include href="xml/e-mail-signature-manager.xml"/>
- <xi:include href="xml/e-mail-signature-preview.xml"/>
- <xi:include href="xml/e-mail-signature-script-dialog.xml"/>
- <xi:include href="xml/e-mail-signature-tree-view.xml"/>
<xi:include href="xml/e-map.xml"/>
<xi:include href="xml/e-menu-tool-action.xml"/>
<xi:include href="xml/e-menu-tool-button.xml"/>
- <xi:include href="xml/e-mktemp.xml"/>
<xi:include href="xml/e-name-selector-dialog.xml"/>
<xi:include href="xml/e-name-selector-entry.xml"/>
<xi:include href="xml/e-name-selector-list.xml"/>
@@ -214,8 +246,7 @@
<xi:include href="xml/e-online-button.xml"/>
<xi:include href="xml/e-paned.xml"/>
<xi:include href="xml/e-picture-gallery.xml"/>
- <xi:include href="xml/e-plugin-ui.xml"/>
- <xi:include href="xml/e-plugin.xml"/>
+ <xi:include href="xml/e-poolv.xml"/>
<xi:include href="xml/e-popup-action.xml"/>
<xi:include href="xml/e-port-entry.xml"/>
<xi:include href="xml/e-preferences-window.xml"/>
@@ -229,23 +260,11 @@
<xi:include href="xml/e-send-options.xml"/>
<xi:include href="xml/e-sorter-array.xml"/>
<xi:include href="xml/e-sorter.xml"/>
- <xi:include href="xml/e-source-combo-box.xml"/>
- <xi:include href="xml/e-source-config-backend.xml"/>
- <xi:include href="xml/e-source-config-dialog.xml"/>
- <xi:include href="xml/e-source-config.xml"/>
- <xi:include href="xml/e-source-selector-dialog.xml"/>
- <xi:include href="xml/e-source-selector.xml"/>
- <xi:include href="xml/e-source-util.xml"/>
<xi:include href="xml/e-spell-entry.xml"/>
- <xi:include href="xml/e-stock-request.xml"/>
<xi:include href="xml/e-timezone-dialog.xml"/>
<xi:include href="xml/e-tree-model-generator.xml"/>
<xi:include href="xml/e-ui-manager.xml"/>
- <xi:include href="xml/e-unicode.xml"/>
<xi:include href="xml/e-url-entry.xml"/>
- <xi:include href="xml/e-web-view-gtkhtml.xml"/>
- <xi:include href="xml/e-web-view-preview.xml"/>
- <xi:include href="xml/e-web-view.xml"/>
</chapter>
<chapter>
diff --git a/doc/reference/libeutil/libeutil-sections.txt b/doc/reference/libeutil/libeutil-sections.txt
index 98b9398..2c0ef0a 100644
--- a/doc/reference/libeutil/libeutil-sections.txt
+++ b/doc/reference/libeutil/libeutil-sections.txt
@@ -42,6 +42,7 @@ e_activity_get_state
e_activity_set_state
e_activity_get_text
e_activity_set_text
+e_activity_handle_cancellation
<SUBSECTION Standard>
E_ACTIVITY
E_IS_ACTIVITY
@@ -81,6 +82,7 @@ EActivityBarPrivate
EActivityProxy
e_activity_proxy_new
e_activity_proxy_get_activity
+e_activity_proxy_set_activity
<SUBSECTION Standard>
E_ACTIVITY_PROXY
E_IS_ACTIVITY_PROXY
@@ -121,6 +123,7 @@ E_ALERT_NO_LOAD_FILE
EAlert
e_alert_new
e_alert_new_valist
+e_alert_new_array
e_alert_get_default_response
e_alert_set_default_response
e_alert_get_message_type
@@ -227,6 +230,7 @@ e_attachment_get_file
e_attachment_set_file
e_attachment_get_file_info
e_attachment_set_file_info
+e_attachment_get_mime_type
e_attachment_get_icon
e_attachment_get_loading
e_attachment_get_mime_part
@@ -247,10 +251,13 @@ e_attachment_is_rfc822
e_attachment_list_apps
e_attachment_load_async
e_attachment_load_finish
+e_attachment_load
e_attachment_open_async
e_attachment_open_finish
+e_attachment_open
e_attachment_save_async
e_attachment_save_finish
+e_attachment_save
e_attachment_load_handle_error
e_attachment_open_handle_error
e_attachment_save_handle_error
@@ -296,6 +303,7 @@ EAttachmentBarPrivate
EAttachmentButton
e_attachment_button_new
e_attachment_button_get_view
+e_attachment_button_set_view
e_attachment_button_get_attachment
e_attachment_button_set_attachment
e_attachment_button_get_expandable
@@ -404,6 +412,8 @@ e_attachment_paned_get_active_view
e_attachment_paned_set_active_view
e_attachment_paned_get_expanded
e_attachment_paned_set_expanded
+e_attachment_paned_get_resize_toplevel
+e_attachment_paned_set_resize_toplevel
e_attachment_paned_drag_data_received
e_attachment_paned_get_controls_container
e_attachment_paned_get_view_combo
@@ -428,6 +438,7 @@ EAttachmentStore
e_attachment_store_new
e_attachment_store_add_attachment
e_attachment_store_remove_attachment
+e_attachment_store_remove_all
e_attachment_store_add_to_multipart
e_attachment_store_get_attachments
e_attachment_store_get_num_attachments
@@ -481,10 +492,13 @@ e_attachment_view_dispose
e_attachment_view_finalize
e_attachment_view_get_private
e_attachment_view_get_store
+e_attachment_view_get_dragging
+e_attachment_view_set_dragging
e_attachment_view_get_editable
e_attachment_view_set_editable
e_attachment_view_get_target_list
e_attachment_view_get_drag_actions
+e_attachment_view_add_drag_actions
e_attachment_view_get_selected_attachments
e_attachment_view_open_path
e_attachment_view_remove_selected
@@ -521,9 +535,9 @@ e_attachment_view_update_actions
E_ATTACHMENT_VIEW
E_IS_ATTACHMENT_VIEW
E_TYPE_ATTACHMENT_VIEW
-E_ATTACHMENT_VIEW_IFACE
-E_IS_ATTACHMENT_VIEW_IFACE
-E_ATTACHMENT_VIEW_GET_IFACE
+E_ATTACHMENT_VIEW_INTERFACE
+E_IS_ATTACHMENT_VIEW_INTERFACE
+E_ATTACHMENT_VIEW_GET_INTERFACE
EAttachmentViewIface
e_attachment_view_get_type
<SUBSECTION Private>
@@ -571,7 +585,7 @@ EAutocompleteSelectorPrivate
<SECTION>
<FILE>e-bit-array</FILE>
-<TITLE>Bit Arrays (Legacy)</TITLE>
+<TITLE>EBitArray</TITLE>
EBitArray
e_bit_array_new
e_bit_array_value_at
@@ -591,9 +605,10 @@ e_bit_array_move_row
<SUBSECTION Standard>
E_BIT_ARRAY
E_IS_BIT_ARRAY
-E_BIT_ARRAY_TYPE
+E_TYPE_BIT_ARRAY
E_BIT_ARRAY_CLASS
E_IS_BIT_ARRAY_CLASS
+E_BIT_ARRAY_GET_CLASS
EBitArrayClass
e_bit_array_get_type
</SECTION>
@@ -618,6 +633,14 @@ EBookSourceConfigPrivate
</SECTION>
<SECTION>
+<FILE>e-buffer-tagger</FILE>
+<TITLE>GtkTextBuffer Tagging</TITLE>
+e_buffer_tagger_connect
+e_buffer_tagger_disconnect
+e_buffer_tagger_update_tags
+</SECTION>
+
+<SECTION>
<FILE>e-cal-source-config</FILE>
<TITLE>ECalSourceConfig</TITLE>
ECalSourceConfig
@@ -662,6 +685,8 @@ e_calendar_get_type
<TITLE>ECalendarItem</TITLE>
E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME
E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME
+E_CALENDAR_ROWS_PER_MONTH
+E_CALENDAR_COLS_PER_MONTH
E_CALENDAR_ITEM_MARK_BOLD
E_CALENDAR_ITEM_MARK_ITALIC
E_CALENDAR_ITEM_MIN_CELL_XPAD
@@ -734,7 +759,7 @@ E_IS_CANVAS
E_TYPE_CANVAS
E_CANVAS_CLASS
E_IS_CANVAS_CLASS
-E_TYPE_CANVAS_CLASS
+E_CANVAS_GET_CLASS
ECanvasClass
e_canvas_get_type
</SECTION>
@@ -757,6 +782,15 @@ ECanvasBackgroundPrivate
</SECTION>
<SECTION>
+<FILE>e-canvas-utils</FILE>
+<TITLE>Canvas Utilities</TITLE>
+e_canvas_item_move_absolute
+e_canvas_item_show_area
+e_canvas_item_show_area_delayed
+e_canvas_item_area_shown
+</SECTION>
+
+<SECTION>
<FILE>e-canvas-vbox</FILE>
<TITLE>ECanvasVbox</TITLE>
ECanvasVbox
@@ -775,7 +809,7 @@ e_canvas_vbox_get_type
<SECTION>
<FILE>e-categories-config</FILE>
-<TITLE>Categories</TITLE>
+<TITLE>Category Utilities</TITLE>
e_categories_config_get_icon_for
e_categories_config_open_dialog_for_entry
</SECTION>
@@ -885,15 +919,211 @@ ECategoryEditorPrivate
</SECTION>
<SECTION>
+<FILE>e-cell</FILE>
+<TITLE>ECell</TITLE>
+ECell
+ECellView
+e_cell_new_view
+e_cell_kill_view
+ECellFlags
+ECellActions
+e_cell_event
+e_cell_realize
+e_cell_unrealize
+e_cell_draw
+e_cell_print
+e_cell_print_height
+e_cell_max_width
+e_cell_max_width_by_row
+e_cell_max_width_by_row_implemented
+e_cell_get_bg_color
+e_cell_style_set
+e_cell_focus
+e_cell_unfocus
+e_cell_height
+e_cell_enter_edit
+e_cell_leave_edit
+e_cell_save_state
+e_cell_load_state
+e_cell_free_state
+<SUBSECTION Standard>
+E_CELL
+E_IS_CELL
+E_TYPE_CELL
+E_CELL_CLASS
+E_IS_CELL_CLASS
+E_CELL_GET_CLASS
+ECellClass
+e_cell_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-checkbox</FILE>
+<TITLE>ECellCheckbox</TITLE>
+ECellCheckbox
+e_cell_checkbox_new
+<SUBSECTION Standard>
+E_CELL_CHECKBOX
+E_IS_CELL_CHECKBOX
+E_TYPE_CELL_CHECKBOX
+E_CELL_CHECKBOX_CLASS
+E_IS_CELL_CHECKBOX_CLASS
+E_CELL_CHECKBOX_GET_CLASS
+ECellCheckboxClass
+e_cell_checkbox_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-combo</FILE>
+<TITLE>ECellCombo</TITLE>
+ECellCombo
+e_cell_combo_new
+e_cell_combo_set_popdown_strings
+<SUBSECTION Standard>
+E_CELL_COMBO
+E_IS_CELL_COMBO
+E_TYPE_CELL_COMBO
+E_CELL_COMBO_CLASS
+E_IS_CELL_COMBO_CLASS
+E_CELL_COMBO_GET_CLASS
+ECellComboClass
+e_cell_combo_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-date</FILE>
+<TITLE>ECellDate</TITLE>
+ECellDate
+e_cell_date_new
+e_cell_date_set_format_component
+<SUBSECTION Standard>
+E_CELL_DATE
+E_IS_CELL_DATE
+E_TYPE_CELL_DATE
+E_CELL_DATE_CLASS
+E_IS_CELL_DATE_CLASS
+E_CELL_DATE_GET_CLASS
+ECellDateClass
+e_cell_date_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-date-edit</FILE>
+<TITLE>ECellDateEdit</TITLE>
+ECellDateEdit
+e_cell_date_edit_new
+e_cell_date_edit_freeze
+e_cell_date_edit_thaw
+ECellDateEditGetTimeCallback
+e_cell_date_edit_set_get_time_callback
+<SUBSECTION Standard>
+E_CELL_DATE_EDIT
+E_IS_CELL_DATE_EDIT
+E_TYPE_CELL_DATE_EDIT
+E_CELL_DATE_EDIT_CLASS
+E_IS_CELL_DATE_EDIT_CLASS
+E_CELL_DATE_EDIT_GET_CLASS
+ECellDateEditClass
+e_cell_date_edit_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-hbox</FILE>
+<TITLE>ECellHbox</TITLE>
+ECellHbox
+ECellHboxView
+e_cell_hbox_new
+e_cell_hbox_append
+<SUBSECTION Standard>
+E_CELL_HBOX
+E_IS_CELL_HBOX
+E_TYPE_CELL_HBOX
+E_CELL_HBOX_CLASS
+E_IS_CELL_HBOX_CLASS
+E_CELL_HBOX_GET_CLASS
+ECellHboxClass
+e_cell_hbox_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-number</FILE>
+<TITLE>ECellNumber</TITLE>
+ECellNumber
+e_cell_number_new
+<SUBSECTION Standard>
+E_CELL_NUMBER
+E_IS_CELL_NUMBER
+E_TYPE_CELL_NUMBER
+E_CELL_NUMBER_CLASS
+E_IS_CELL_NUMBER_CLASS
+E_CELL_NUMBER_GET_CLASS
+ECellNumberClass
+e_cell_number_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-percent</FILE>
+<TITLE>ECellPercent</TITLE>
+ECellPercent
+e_cell_percent_new
+<SUBSECTION Standard>
+E_CELL_PERCENT
+E_IS_CELL_PERCENT
+E_TYPE_CELL_PERCENT
+E_CELL_PERCENT_CLASS
+E_IS_CELL_PERCENT_CLASS
+E_CELL_PERCENT_GET_CLASS
+ECellPercentClass
+e_cell_percent_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-pixbuf</FILE>
+<TITLE>ECellPixbuf</TITLE>
+ECellPixbuf
+e_cell_pixbuf_new
+<SUBSECTION Standard>
+E_CELL_PIXBUF
+E_IS_CELL_PIXBUF
+E_TYPE_CELL_PIXBUF
+E_CELL_PIXBUF_CLASS
+E_IS_CELL_PIXBUF_CLASS
+E_CELL_PIXBUF_GET_CLASS
+ECellPixbufClass
+e_cell_pixbuf_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-popup</FILE>
+<TITLE>ECellPopup</TITLE>
+ECellPopup
+ECellPopupView
+e_cell_popup_new
+e_cell_popup_get_child
+e_cell_popup_set_child
+e_cell_popup_set_shown
+e_cell_popup_queue_cell_redraw
+<SUBSECTION Standard>
+E_CELL_POPUP
+E_IS_CELL_POPUP
+E_TYPE_CELL_POPUP
+E_CELL_POPUP_CLASS
+E_IS_CELL_POPUP_CLASS
+E_CELL_POPUP_GET_CLASS
+ECellPopupClass
+e_cell_popup_get_type
+</SECTION>
+
+<SECTION>
<FILE>e-cell-renderer-color</FILE>
<TITLE>ECellRendererColor</TITLE>
ECellRendererColor
e_cell_renderer_color_new
<SUBSECTION Standard>
-E_TYPE_CELL_RENDERER_COLOR
E_CELL_RENDERER_COLOR
-E_CELL_RENDERER_COLOR_CLASS
E_IS_CELL_RENDERER_COLOR
+E_TYPE_CELL_RENDERER_COLOR
+E_CELL_RENDERER_COLOR_CLASS
E_IS_CELL_RENDERER_COLOR_CLASS
E_CELL_RENDERER_COLOR_GET_CLASS
ECellRendererColorClass
@@ -903,6 +1133,104 @@ ECellRendererColorPrivate
</SECTION>
<SECTION>
+<FILE>e-cell-size</FILE>
+<TITLE>ECellSize</TITLE>
+ECellSize
+e_cell_size_new
+<SUBSECTION Standard>
+E_CELL_SIZE
+E_IS_CELL_SIZE
+E_TYPE_CELL_SIZE
+E_CELL_SIZE_CLASS
+E_IS_CELL_SIZE_CLASS
+E_CELL_SIZE_GET_CLASS
+ECellSizeClass
+e_cell_size_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-text</FILE>
+<TITLE>ECellText</TITLE>
+ECellText
+e_cell_text_new
+e_cell_text_construct
+e_cell_text_get_text
+e_cell_text_free_text
+e_cell_text_set_value
+e_cell_text_set_selection
+e_cell_text_get_selection
+e_cell_text_copy_clipboard
+e_cell_text_paste_clipboard
+e_cell_text_delete_selection
+e_cell_text_get_text_by_view
+<SUBSECTION Standard>
+E_CELL_TEXT
+E_IS_CELL_TEXT
+E_TYPE_CELL_TEXT
+E_CELL_TEXT_CLASS
+E_IS_CELL_TEXT_CLASS
+E_CELL_TEXT_GET_CLASS
+ECellTextClass
+e_cell_text_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-toggle</FILE>
+<TITLE>ECellToggle</TITLE>
+ECellToggle
+e_cell_toggle_new
+e_cell_toggle_construct
+e_cell_toggle_get_pixbufs
+<SUBSECTION Standard>
+E_CELL_TOGGLE
+E_IS_CELL_TOGGLE
+E_TYPE_CELL_TOGGLE
+E_CELL_TOGGLE_CLASS
+E_IS_CELL_TOGGLE_CLASS
+E_CELL_TOGGLE_GET_CLASS
+ECellToggleClass
+e_cell_toggle_get_type
+<SUBSECTION Private>
+ECellTogglePrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-tree</FILE>
+<TITLE>ECellTree</TITLE>
+ECellTree
+e_cell_tree_new
+e_cell_tree_construct
+e_cell_tree_view_get_subcell_view
+<SUBSECTION Standard>
+E_CELL_TREE
+E_IS_CELL_TREE
+E_TYPE_CELL_TREE
+E_CELL_TREE_CLASS
+E_IS_CELL_TREE_CLASS
+E_CELL_TREE_GET_CLASS
+ECellTreeClass
+e_cell_tree_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cell-vbox</FILE>
+<TITLE>ECellVbox</TITLE>
+ECellVbox
+ECellVboxView
+e_cell_vbox_new
+e_cell_vbox_append
+<SUBSECTION Standard>
+E_CELL_VBOX
+E_IS_CELL_VBOX
+E_TYPE_CELL_VBOX
+E_CELL_VBOX_CLASS
+E_IS_CELL_VBOX_CLASS
+E_CELL_VBOX_GET_CLASS
+ECellVboxClass
+e_cell_vbox_get_type
+</SECTION>
+
+<SECTION>
<FILE>e-charset-combo-box</FILE>
<TITLE>ECharsetComboBox</TITLE>
ECharsetComboBox
@@ -932,6 +1260,61 @@ e_client_utils_open_new_finish
</SECTION>
<SECTION>
+<FILE>e-config</FILE>
+<TITLE>EConfig</TITLE>
+EConfig
+EConfigItem
+EConfigFactory
+EConfigTarget
+EConfigFactoryFunc
+EConfigCheckFunc
+EConfigItemsFunc
+EConfigItemFactoryFunc
+e_config_class_add_factory
+e_config_class_remove_factory
+e_config_construct
+e_config_add_items
+e_config_add_page_check
+e_config_set_page_is_finish
+e_config_add_skip_check
+e_config_set_target
+e_config_create_widget
+e_config_create_window
+e_config_target_changed
+e_config_page_check
+e_config_page_get
+e_config_page_next
+e_config_page_prev
+e_config_abort
+e_config_commit
+e_config_target_new
+e_config_target_free
+EConfigHookGroup
+EConfigHook
+EConfigHookTargetMap
+EConfigHookTargetMask
+EConfigHookItemFactoryData
+EConfigHookPageCheckData
+EConfigHookFunc
+EConfigHookItemFactoryFunc
+e_config_hook_class_add_target_map
+<SUBSECTION Standard>
+E_CONFIG
+E_IS_CONFIG
+E_TYPE_CONFIG
+E_CONFIG_CLASS
+E_IS_CONFIG_CLASS
+E_CONFIG_GET_CLASS
+EConfigClass
+e_config_get_type
+<SUBSECTION Standard>
+EConfigHookClass
+e_config_hook_get_type
+<SUBSECTION Private>
+EConfigPrivate
+</SECTION>
+
+<SECTION>
<FILE>e-contact-store</FILE>
<TITLE>EContactStore</TITLE>
EContactStore
@@ -958,7 +1341,7 @@ EContactStorePrivate
</SECTION>
<SECTION>
-<FILE>e-date-edit</FILE>
+<FILE>e-dateedit</FILE>
<TITLE>EDateEdit</TITLE>
EDateEditGetTimeCallback
e_date_edit_new
@@ -1012,6 +1395,7 @@ DTFormatKind
e_datetime_format_add_setup_widget
e_datetime_format_format
e_datetime_format_format_tm
+e_datetime_format_includes_day_name
</SECTION>
<SECTION>
@@ -1051,6 +1435,49 @@ e_dialog_combo_box_get
</SECTION>
<SECTION>
+<FILE>e-event</FILE>
+<TITLE>EEvent</TITLE>
+EEvent
+EEventItem
+EEventFactory
+EEventTarget
+EEventItemsFunc
+EEventFunc
+EEventFactoryFunc
+e_event_construct
+e_event_add_items
+e_event_remove_items
+e_event_emit
+e_event_target_new
+e_event_target_free
+EEventHook
+EEventHookTargetMap
+EEventHookTargetMask
+EEventHookFunc
+e_event_hook_class_add_target_map
+<SUBSECTION Standard>
+E_EVENT
+E_IS_EVENT
+E_TYPE_EVENT
+E_EVENT_CLASS
+E_IS_EVENT_CLASS
+E_EVENT_GET_CLASS
+EEventClass
+e_event_get_type
+<SUBSECTION Standard>
+E_EVENT_HOOK
+E_IS_EVENT_HOOK
+E_TYPE_EVENT_HOOK
+E_EVENT_HOOK_CLASS
+E_IS_EVENT_HOOK_CLASS
+E_EVENT_HOOK_GET_CLASS
+EEventHookClass
+e_event_hook_get_type
+<SUBSECTION Private>
+EEventPrivate
+</SECTION>
+
+<SECTION>
<FILE>e-file-request</FILE>
<TITLE>EFileRequest</TITLE>
EFileRequest
@@ -1101,7 +1528,7 @@ EFilterColorClass
e_filter_color_get_type
<SUBSECTION Private>
EFilterColorPrivate
-</SUBSECTION>
+</SECTION>
<SECTION>
<FILE>e-filter-datespec</FILE>
@@ -1120,7 +1547,7 @@ EFilterDatespecClass
e_filter_datespec_get_type
<SUBSECTION Private>
EFilterDatespecPrivate
-</SUBSECTION>
+</SECTION>
<SECTION>
<FILE>e-filter-element</FILE>
@@ -1184,7 +1611,7 @@ E_IS_FILTER_INPUT
E_TYPE_FILTER_INPUT
E_FILTER_INPUT_CLASS
E_IS_FILTER_INPUT_CLASS
-E_TYPE_FILTER_INPUT_CLASS
+E_FILTER_INPUT_GET_CLASS
EFilterInputClass
e_filter_input_get_type
<SUBSECTION Private>
@@ -1364,6 +1791,123 @@ e_icon_factory_create_thumbnail
</SECTION>
<SECTION>
+<FILE>e-image-chooser</FILE>
+<TITLE>EImageChooser</TITLE>
+EImageChooser
+e_image_chooser_new
+e_image_chooser_get_icon_name
+e_image_chooser_set_from_file
+e_image_chooser_set_image_data
+e_image_chooser_get_image_data
+<SUBSECTION Standard>
+E_IMAGE_CHOOSER
+E_IS_IMAGE_CHOOSER
+E_TYPE_IMAGE_CHOOSER
+E_IMAGE_CHOOSER_CLASS
+E_IS_IMAGE_CHOOSER_CLASS
+E_IMAGE_CHOOSER_GET_CLASS
+EImageChooserClass
+e_image_chooser_get_type
+<SUBSECTION Private>
+EImageChooserPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-import</FILE>
+<TITLE>EImport</TITLE>
+EImport
+EImportImporter
+EImportFactory
+EImportTarget
+EImportCompleteFunc
+EImportStatusFunc
+EImportFactoryFunc
+EImportImporterFunc
+EImportSupportedFunc
+EImportWidgetFunc
+EImportImportFunc
+EImportTargetURI
+EImportTargetHome
+e_import_new
+e_import_class_add_importer
+e_import_get_importers
+e_import_construct
+e_import_import
+e_import_cancel
+e_import_get_widget
+e_import_get_preview_widget
+e_import_status
+e_import_complete
+e_import_target_new
+e_import_target_free
+e_import_target_new_uri
+e_import_target_new_home
+EImportHook
+EImportHookTargetMap
+EImportHookTargetMask
+EImportHookImporter
+e_import_hook_class_add_target_map
+<SUBSECTION Standard>
+E_IMPORT
+E_IS_IMPORT
+E_TYPE_IMPORT
+E_IMPORT_CLASS
+E_IS_IMPORT_CLASS
+E_IMPORT_GET_CLASS
+EImportClass
+e_import_get_type
+<SUBSECTION Standard>
+E_IMPORT_HOOK
+E_IS_IMPORT_HOOK
+E_TYPE_IMPORT_HOOK
+E_IMPORT_HOOK_CLASS
+E_IS_IMPORT_HOOK_CLASS
+E_IMPORT_HOOK_GET_CLASS
+EImportHookClass
+e_import_hook_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-import-assistant</FILE>
+<TITLE>EImportAssistant</TITLE>
+EImportAssistant
+e_import_assistant_new
+e_import_assistant_new_simple
+<SUBSECTION Standard>
+E_IMPORT_ASSISTANT
+E_IS_IMPORT_ASSISTANT
+E_TYPE_IMPORT_ASSISTANT
+E_IMPORT_ASSISTANT_CLASS
+E_IS_IMPORT_ASSISTANT_CLASS
+E_IMPORT_ASSISTANT_GET_CLASS
+EImportAssistantClass
+e_import_assistant_get_type
+<SUBSECTION Private>
+EImportAssistantPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-interval-chooser</FILE>
+<TITLE>EIntervalChooser</TITLE>
+EIntervalChooser
+EDurationType
+e_interval_chooser_new
+e_interval_chooser_get_interval_minutes
+e_interval_chooser_set_interval_minutes
+<SUBSECTION Standard>
+E_INTERVAL_CHOOSER
+E_IS_INTERVAL_CHOOSER
+E_TYPE_INTERVAL_CHOOSER
+E_INTERVAL_CHOOSER_CLASS
+E_IS_INTERVAL_CHOOSER_CLASS
+E_INTERVAL_CHOOSER_GET_CLASS
+EIntervalChooserClass
+e_interval_chooser_get_type
+<SUBSECTION Private>
+EIntervalChooserPrivate
+</SECTION>
+
+<SECTION>
<FILE>e-mail-identity-combo-box</FILE>
<TITLE>EMailIdentityComboBox</TITLE>
EMailIdentityComboBox
@@ -1384,16 +1928,239 @@ EMailIdentityComboBoxPrivate
</SECTION>
<SECTION>
+<FILE>e-mail-signature-combo-box</FILE>
+<TITLE>EMailSignatureComboBox</TITLE>
+E_MAIL_SIGNATURE_AUTOGENERATED_UID
+EMailSignatureComboBox
+e_mail_signature_combo_box_new
+e_mail_signature_combo_box_refresh
+e_mail_signature_combo_box_get_registry
+e_mail_signature_combo_box_get_identity_uid
+e_mail_signature_combo_box_set_identity_uid
+e_mail_signature_combo_box_load_selected
+e_mail_signature_combo_box_load_selected_finish
+<SUBSECTION Standard>
+E_MAIL_SIGNATURE_COMBO_BOX
+E_IS_MAIL_SIGNATURE_COMBO_BOX
+E_TYPE_MAIL_SIGNATURE_COMBO_BOX
+E_MAIL_SIGNATURE_COMBO_BOX_CLASS
+E_IS_MAIL_SIGNATURE_COMBO_BOX_CLASS
+E_MAIL_SIGNATURE_COMBO_BOX_GET_CLASS
+EMailSignatureComboBoxClass
+e_mail_signature_combo_box_get_type
+<SUBSECTION Private>
+EMailSignatureComboBoxPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-mail-signature-editor</FILE>
+<TITLE>EMailSignatureEditor</TITLE>
+EMailSignatureEditor
+e_mail_signature_editor_new
+e_mail_signature_editor_get_focus_tracker
+e_mail_signature_editor_get_registry
+e_mail_signature_editor_get_source
+e_mail_signature_editor_commit
+e_mail_signature_editor_commit_finish
+<SUBSECTION Standard>
+E_MAIL_SIGNATURE_EDITOR
+E_IS_MAIL_SIGNATURE_EDITOR
+E_TYPE_MAIL_SIGNATURE_EDITOR
+E_MAIL_SIGNATURE_EDITOR_CLASS
+E_IS_MAIL_SIGNATURE_EDITOR_CLASS
+E_MAIL_SIGNATURE_EDITOR_GET_CLASS
+EMailSignatureEditorClass
+e_mail_signature_editor_get_type
+<SUBSECTION Private>
+EMailSignatureEditorPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-mail-signature-manager</FILE>
+<TITLE>EMailSignatureManager</TITLE>
+EMailSignatureManager
+e_mail_signature_manager_new
+e_mail_signature_manager_add_signature
+e_mail_signature_manager_add_signature_script
+e_mail_signature_manager_edit_signature
+e_mail_signature_manager_remove_signature
+e_mail_signature_manager_get_prefer_html
+e_mail_signature_manager_set_prefer_html
+e_mail_signature_manager_get_registry
+<SUBSECTION Standard>
+E_MAIL_SIGNATURE_MANAGER
+E_IS_MAIL_SIGNATURE_MANAGER
+E_TYPE_MAIL_SIGNATURE_MANAGER
+E_MAIL_SIGNATURE_MANAGER_CLASS
+E_IS_MAIL_SIGNATURE_MANAGER_CLASS
+E_MAIL_SIGNATURE_MANAGER_GET_CLASS
+EMailSignatureManagerClass
+e_mail_signature_manager_get_type
+<SUBSECTION Private>
+EMailSignatureManagerPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-mail-signature-preview</FILE>
+<TITLE>EMailSignaturePreview</TITLE>
+EMailSignaturePreview
+e_mail_signature_preview_new
+e_mail_signature_preview_refresh
+e_mail_signature_preview_get_registry
+e_mail_signature_preview_get_source_uid
+e_mail_signature_preview_set_source_uid
+<SUBSECTION Standard>
+E_MAIL_SIGNATURE_PREVIEW
+E_IS_MAIL_SIGNATURE_PREVIEW
+E_TYPE_MAIL_SIGNATURE_PREVIEW
+E_MAIL_SIGNATURE_PREVIEW_CLASS
+E_IS_MAIL_SIGNATURE_PREVIEW_CLASS
+E_MAIL_SIGNATURE_PREVIEW_GET_CLASS
+EMailSignaturePreviewClass
+e_mail_signature_preview_get_type
+<SUBSECTION Private>
+EMailSignaturePreviewPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-mail-signature-script-dialog</FILE>
+<TITLE>EMailSignatureScriptDialog</TITLE>
+EMailSignatureScriptDialog
+e_mail_signature_script_dialog_new
+e_mail_signature_script_dialog_get_registry
+e_mail_signature_script_dialog_get_source
+e_mail_signature_script_dialog_get_symlink_target
+e_mail_signature_script_dialog_set_symlink_target
+e_mail_signature_script_dialog_commit
+e_mail_signature_script_dialog_commit_finish
+<SUBSECTION Standard>
+E_MAIL_SIGNATURE_SCRIPT_DIALOG
+E_IS_MAIL_SIGNATURE_SCRIPT_DIALOG
+E_TYPE_MAIL_SIGNATURE_SCRIPT_DIALOG
+E_MAIL_SIGNATURE_SCRIPT_DIALOG_CLASS
+E_IS_MAIL_SIGNATURE_SCRIPT_DIALOG_CLASS
+E_MAIL_SIGNATURE_SCRIPT_DIALOG_GET_CLASS
+EMailSignatureScriptDialogClass
+e_mail_signature_script_dialog_get_type
+<SUBSECTION Private>
+EMailSignatureScriptDialogPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-mail-signature-tree-view</FILE>
+<TITLE>EMailSignatureTreeView</TITLE>
+EMailSignatureTreeView
+e_mail_signature_tree_view_new
+e_mail_signature_tree_view_refresh
+e_mail_signature_tree_view_get_registry
+e_mail_signature_tree_view_ref_selected_source
+e_mail_signature_tree_view_set_selected_source
+<SUBSECTION Standard>
+E_MAIL_SIGNATURE_TREE_VIEW
+E_IS_MAIL_SIGNATURE_TREE_VIEW
+E_TYPE_MAIL_SIGNATURE_TREE_VIEW
+E_MAIL_SIGNATURE_TREE_VIEW_CLASS
+E_IS_MAIL_SIGNATURE_TREE_VIEW_CLASS
+E_MAIL_SIGNATURE_TREE_VIEW_GET_CLASS
+EMailSignatureTreeViewClass
+e_mail_signature_tree_view_get_type
+<SUBSECTION Private>
+EMailSignatureTreeViewPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-map</FILE>
+<TITLE>EMap</TITLE>
+EMap
+EMapPoint
+e_map_new
+e_map_freeze
+e_map_thaw
+e_map_window_to_world
+e_map_world_to_window
+e_map_get_magnification
+e_map_set_smooth_zoom
+e_map_get_smooth_zoom
+e_map_zoom_to_location
+e_map_zoom_out
+e_map_add_point
+e_map_remove_point
+e_map_point_get_location
+e_map_point_get_name
+e_map_point_get_color_rgba
+e_map_point_set_color_rgba
+e_map_point_set_data
+e_map_point_get_data
+e_map_point_is_in_view
+e_map_get_closest_point
+<SUBSECTION Standard>
+E_MAP
+E_IS_MAP
+E_TYPE_MAP
+E_MAP_CLASS
+E_IS_MAP_CLASS
+E_MAP_GET_CLASS
+EMapClass
+e_map_get_type
+<SUBSECTION Private>
+EMapPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-menu-tool-action</FILE>
+<TITLE>EMenuToolAction</TITLE>
+EMenuToolAction
+e_menu_tool_action_new
+<SUBSECTION Standard>
+E_MENU_TOOL_ACTION
+E_IS_MENU_TOOL_ACTION
+E_TYPE_MENU_TOOL_ACTION
+E_MENU_TOOL_ACTION_CLASS
+E_IS_MENU_TOOL_ACTION_CLASS
+E_MENU_TOOL_ACTION_GET_CLASS
+EMenuToolActionClass
+e_menu_tool_action_get_type
+<SUBSECTION Private>
+EMenuToolActionPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-menu-tool-button</FILE>
+<TITLE>EMenuToolButton</TITLE>
+EMenuToolButton
+e_menu_tool_button_new
+e_menu_tool_button_set_prefer_item
+e_menu_tool_button_get_prefer_item
+<SUBSECTION Standard>
+E_MENU_TOOL_BUTTON
+E_IS_MENU_TOOL_BUTTON
+E_TYPE_MENU_TOOL_BUTTON
+E_MENU_TOOL_BUTTON_CLASS
+E_IS_MENU_TOOL_BUTTON_CLASS
+E_MENU_TOOL_BUTTON_GET_CLASS
+EMenuToolButtonClass
+e_menu_tool_button_get_type
+<SUBSECTION Private>
+EMenuToolButtonPrivate
+</SECTION>
+
+<SECTION>
<FILE>e-misc-utils</FILE>
<TITLE>Miscellaneous Utilities</TITLE>
+EForeachFunc
e_get_accels_filename
e_show_uri
e_display_help
+ERestoreWindowFlags
+e_restore_window
e_lookup_action
e_lookup_action_group
e_action_compare_by_label
e_action_group_remove_all_actions
e_radio_action_get_current_action
+e_action_group_add_actions_localized
+e_builder_get_widget
+e_load_ui_builder_definition
e_categories_add_change_hook
e_str_without_underscores
e_str_compare
@@ -1401,6 +2168,7 @@ e_str_case_compare
e_collate_compare
e_int_compare
e_color_to_value
+e_rgba_to_value
e_format_number
ESortCompareFunc
e_bsearch
@@ -1409,12 +2177,14 @@ e_utf8_strftime_fix_am_pm
e_get_month_name
e_get_weekday_name
e_flexible_strtod
+E_ASCII_DTOSTR_BUF_SIZE
e_ascii_dtostr
e_file_lock_create
e_file_lock_destroy
e_file_lock_exists
e_util_guess_mime_type
e_util_get_category_filter_options
+e_util_get_searchable_categories
e_binding_transform_color_to_string
e_binding_transform_string_to_color
e_binding_transform_source_to_uid
@@ -1556,6 +2326,52 @@ ENameSelectorModelPrivate
</SECTION>
<SECTION>
+<FILE>e-online-button</FILE>
+<TITLE>EOnlineButton</TITLE>
+EOnlineButton
+e_online_button_new
+e_online_button_get_online
+e_online_button_set_online
+<SUBSECTION Standard>
+E_ONLINE_BUTTON
+E_IS_ONLINE_BUTTON
+E_TYPE_ONLINE_BUTTON
+E_ONLINE_BUTTON_CLASS
+E_IS_ONLINE_BUTTON_CLASS
+E_ONLINE_BUTTON_GET_CLASS
+EOnlineButtonClass
+e_online_button_get_type
+<SUBSECTION Private>
+EOnlineButtonPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-paned</FILE>
+<TITLE>EPaned</TITLE>
+EPaned
+e_paned_new
+e_paned_get_hposition
+e_paned_set_hposition
+e_paned_get_vposition
+e_paned_set_vposition
+e_paned_get_proportion
+e_paned_set_proportion
+e_paned_get_fixed_resize
+e_paned_set_fixed_resize
+<SUBSECTION Standard>
+E_PANED
+E_IS_PANED
+E_TYPE_PANED
+E_PANED_CLASS
+E_IS_PANED_CLASS
+E_PANED_GET_CLASS
+EPanedClass
+e_paned_get_type
+<SUBSECTION Private>
+EPanedPrivate
+</SECTION>
+
+<SECTION>
<FILE>e-passwords</FILE>
<TITLE>Password Utilities (Legacy)</TITLE>
e_passwords_init
@@ -1573,6 +2389,92 @@ e_passwords_ask_password
</SECTION>
<SECTION>
+<FILE>e-picture-gallery</FILE>
+<TITLE>EPictureGallery</TITLE>
+EPictureGallery
+e_picture_gallery_new
+e_picture_gallery_get_path
+<SUBSECTION Standard>
+E_PICTURE_GALLERY
+E_IS_PICTURE_GALLERY
+E_TYPE_PICTURE_GALLERY
+E_PICTURE_GALLERY_CLASS
+E_IS_PICTURE_GALLERY_CLASS
+E_PICTURE_GALLERY_GET_CLASS
+EPictureGalleryClass
+e_picture_gallery_get_type
+<SUBSECTION Private>
+EPictureGalleryPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-plugin</FILE>
+<TITLE>EPlugin</TITLE>
+E_PLUGIN_CLASSID
+EPluginAuthor
+EPluginFlags
+EPlugin
+e_plugin_construct
+e_plugin_load_plugins
+e_plugin_list_plugins
+e_plugin_get_symbol
+e_plugin_invoke
+e_plugin_enable
+e_plugin_get_configure_widget
+e_plugin_xml_prop
+e_plugin_xml_prop_domain
+e_plugin_xml_int
+e_plugin_xml_content
+e_plugin_xml_content_domain
+EPluginHook
+EPluginHookTargetMap
+EPluginHookTargetKey
+e_plugin_hook_new
+e_plugin_hook_enable
+e_plugin_hook_mask
+e_plugin_hook_id
+<SUBSECTION Standard>
+E_PLUGIN
+E_IS_PLUGIN
+E_TYPE_PLUGIN
+E_PLUGIN_CLASS
+E_IS_PLUGIN_CLASS
+E_PLUGIN_GET_CLASS
+EPluginClass
+e_plugin_get_type
+<SUBSECTION Standard>
+E_PLUGIN_HOOK
+E_IS_PLUGIN_HOOK
+E_TYPE_PLUGIN_HOOK
+E_PLUGIN_HOOK_CLASS
+E_IS_PLUGIN_HOOK_CLASS
+E_PLUGIN_HOOK_GET_CLASS
+EPluginHookClass
+e_plugin_hook_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-plugin-ui</FILE>
+<TITLE>EPluginUI</TITLE>
+EPluginUIHook
+EPluginUIInitFunc
+e_plugin_ui_register_manager
+e_plugin_ui_enable_manager
+e_plugin_ui_disable_manager
+<SUBSECTION Standard>
+E_PLUGIN_UI_HOOK
+E_IS_PLUGIN_UI_HOOK
+E_TYPE_PLUGIN_UI_HOOK
+E_PLUGIN_UI_HOOK_CLASS
+E_IS_PLUGIN_UI_HOOK_CLASS
+E_PLUGIN_UI_HOOK_GET_CLASS
+EPluginUIHookClass
+e_plugin_ui_hook_get_type
+<SUBSECTION Private>
+EPluginUIHookPrivate
+</SECTION>
+
+<SECTION>
<FILE>e-poolv</FILE>
<TITLE>EPoolv</TITLE>
EPoolv
@@ -1603,6 +2505,88 @@ EPopupActionPrivate
</SECTION>
<SECTION>
+<FILE>e-popup-menu</FILE>
+<TITLE>Popup Menus (Legacy)</TITLE>
+EPopupMenu
+E_POPUP_SEPARATOR
+E_POPUP_TERMINATOR
+E_POPUP_ITEM
+e_popup_menu_create_with_domain
+</SECTION>
+
+<SECTION>
+<FILE>e-port-entry</FILE>
+<TITLE>EPortEntry</TITLE>
+EPortEntry
+e_port_entry_new
+e_port_entry_set_camel_entries
+e_port_entry_get_port
+e_port_entry_set_port
+e_port_entry_is_valid
+e_port_entry_get_security_method
+e_port_entry_set_security_method
+e_port_entry_activate_secured_port
+e_port_entry_activate_nonsecured_port
+<SUBSECTION Standard>
+E_PORT_ENTRY
+E_IS_PORT_ENTRY
+E_TYPE_PORT_ENTRY
+E_PORT_ENTRY_CLASS
+E_IS_PORT_ENTRY_CLASS
+E_PORT_ENTRY_GET_CLASS
+EPortEntryClass
+e_port_entry_get_type
+<SUBSECTION Private>
+EPortEntryPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-preferences-window</FILE>
+<TITLE>EPreferencesWindow</TITLE>
+EPreferencesWindow
+EPreferencesWindowCreatePageFn
+e_preferences_window_new
+e_preferences_window_get_shell
+e_preferences_window_setup
+e_preferences_window_add_page
+e_preferences_window_show_page
+e_preferences_window_filter_page
+<SUBSECTION Standard>
+E_PREFERENCES_WINDOW
+E_IS_PREFERENCES_WINDOW
+E_TYPE_PREFERENCES_WINDOW
+E_PREFERENCES_WINDOW_CLASS
+E_IS_PREFERENCES_WINDOW_CLASS
+E_PREFERENCES_WINDOW_GET_CLASS
+EPreferencesWindowClass
+e_preferences_window_get_type
+<SUBSECTION Private>
+EPreferencesWindowPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-preview-pane</FILE>
+<TITLE>EPreviewPane</TITLE>
+EPreviewPane
+e_preview_pane_new
+e_preview_pane_get_web_view
+e_preview_pane_get_search_bar
+e_preview_pane_clear_alerts
+e_preview_pane_show_search_bar
+<SUBSECTION Standard>
+E_PREVIEW_PANE
+E_IS_PREVIEW_PANE
+E_TYPE_PREVIEW_PANE
+E_PREVIEW_PANE_CLASS
+E_IS_PREVIEW_PANE_CLASS
+E_PREVIEW_PANE_GET_CLASS
+EPreviewPaneClass
+e_preview_pane_get_type
+<SUBSECTION Private>
+EPreviewPanePrivate
+</SECTION>
+
+<SECTION>
<FILE>e-print</FILE>
<TITLE>Printing</TITLE>
e_print_operation_new
@@ -1610,6 +2594,71 @@ e_print_run_page_setup_dialog
</SECTION>
<SECTION>
+<FILE>e-printable</FILE>
+<TITLE>EPrintable</TITLE>
+EPrintable
+e_printable_new
+e_printable_print_page
+e_printable_data_left
+e_printable_reset
+e_printable_height
+e_printable_will_fit
+<SUBSECTION Standard>
+E_PRINTABLE
+E_IS_PRINTABLE
+E_TYPE_PRINTABLE
+E_PRINTABLE_CLASS
+E_IS_PRINTABLE_CLASS
+E_PRINTABLE_GET_CLASS
+EPrintableClass
+e_printable_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-reflow</FILE>
+<TITLE>EReflow</TITLE>
+EReflow
+<SUBSECTION Standard>
+E_REFLOW
+E_IS_REFLOW
+E_TYPE_REFLOW
+E_REFLOW_CLASS
+E_IS_REFLOW_CLASS
+E_REFLOW_GET_CLASS
+EReflowClass
+e_reflow_get_type
+<SUBSECTION Private>
+EReflowPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-reflow-model</FILE>
+<TITLE>EReflowModel</TITLE>
+EReflowModel
+e_reflow_model_set_width
+e_reflow_model_count
+e_reflow_model_height
+e_reflow_model_incarnate
+e_reflow_model_create_cmp_cache
+e_reflow_model_compare
+e_reflow_model_reincarnate
+e_reflow_model_changed
+e_reflow_model_comparison_changed
+e_reflow_model_items_inserted
+e_reflow_model_item_removed
+e_reflow_model_item_changed
+<SUBSECTION Standard>
+E_REFLOW_MODEL
+E_IS_REFLOW_MODEL
+E_TYPE_REFLOW_MODEL
+E_REFLOW_MODEL_CLASS
+E_IS_REFLOW_MODEL_CLASS
+E_REFLOW_MODEL_GET_CLASS
+EReflowModelClass
+e_reflow_model_get_type
+</SECTION>
+
+<SECTION>
<FILE>e-rule-context</FILE>
<TITLE>ERuleContext</TITLE>
ERuleContext
@@ -1677,26 +2726,242 @@ ERuleEditorPrivate
</SECTION>
<SECTION>
+<FILE>e-search-bar</FILE>
+<TITLE>ESearchBar</TITLE>
+ESearchBar
+e_search_bar_new
+e_search_bar_clear
+e_search_bar_changed
+e_search_bar_get_web_view
+e_search_bar_get_active_search
+e_search_bar_get_case_sensitive
+e_search_bar_set_case_sensitive
+e_search_bar_get_text
+e_search_bar_set_text
+<SUBSECTION Standard>
+E_SEARCH_BAR
+E_IS_SEARCH_BAR
+E_TYPE_SEARCH_BAR
+E_SEARCH_BAR_CLASS
+E_IS_SEARCH_BAR_CLASS
+E_SEARCH_BAR_GET_CLASS
+ESearchBarClass
+e_search_bar_get_type
+<SUBSECTION Private>
+ESearchBarPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-selectable</FILE>
+<TITLE>ESelectable</TITLE>
+ESelectable
+e_selectable_update_actions
+e_selectable_cut_clipboard
+e_selectable_copy_clipboard
+e_selectable_paste_clipboard
+e_selectable_delete_selection
+e_selectable_select_all
+e_selectable_get_copy_target_list
+e_selectable_get_paste_target_list
+<SUBSECTION Standard>
+E_SELECTABLE
+E_IS_SELECTABLE
+E_TYPE_SELECTABLE
+E_SELECTABLE_GET_INTERFACE
+ESelectableInterface
+e_selectable_get_type
+</SECTION>
+
+<SECTION>
<FILE>e-selection</FILE>
<TITLE>Selections</TITLE>
e_target_list_add_calendar_targets
e_target_list_add_directory_targets
+e_target_list_add_html_targets
e_selection_data_set_calendar
e_selection_data_set_directory
+e_selection_data_set_html
e_selection_data_get_calendar
e_selection_data_get_directory
+e_selection_data_get_html
e_selection_data_targets_include_calendar
e_selection_data_targets_include_directory
+e_selection_data_targets_include_html
e_targets_include_calendar
e_targets_include_directory
+e_targets_include_html
e_clipboard_set_calendar
e_clipboard_set_directory
+e_clipboard_set_html
e_clipboard_request_calendar
e_clipboard_request_directory
+e_clipboard_request_html
e_clipboard_wait_for_calendar
e_clipboard_wait_for_directory
+e_clipboard_wait_for_html
e_clipboard_wait_is_calendar_available
e_clipboard_wait_is_directory_available
+e_clipboard_wait_is_html_available
+e_drag_dest_add_calendar_targets
+e_drag_dest_add_directory_targets
+e_drag_dest_add_html_targets
+e_drag_source_add_calendar_targets
+e_drag_source_add_directory_targets
+e_drag_source_add_html_targets
+</SECTION>
+
+<SECTION>
+<FILE>e-selection-model</FILE>
+<TITLE>ESelectionModel</TITLE>
+ECursorMode
+ESelectionModel
+e_selection_model_do_something
+e_selection_model_maybe_do_something
+e_selection_model_right_click_down
+e_selection_model_right_click_up
+e_selection_model_key_press
+e_selection_model_select_as_key_press
+e_selection_model_is_row_selected
+e_selection_model_foreach
+e_selection_model_clear
+e_selection_model_selected_count
+e_selection_model_select_all
+e_selection_model_invert_selection
+e_selection_model_row_count
+e_selection_model_change_one_row
+e_selection_model_change_cursor
+e_selection_model_cursor_row
+e_selection_model_cursor_col
+e_selection_model_select_single_row
+e_selection_model_toggle_single_row
+e_selection_model_move_selection_end
+e_selection_model_set_selection_end
+e_selection_model_cursor_changed
+e_selection_model_cursor_activated
+e_selection_model_selection_row_changed
+e_selection_model_selection_changed
+<SUBSECTION Standard>
+E_SELECTION_MODEL
+E_IS_SELECTION_MODEL
+E_TYPE_SELECTION_MODEL
+E_SELECTION_MODEL_CLASS
+E_IS_SELECTION_MODEL_CLASS
+E_SELECTION_MODEL_GET_CLASS
+ESelectionModelClass
+e_selection_model_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-selection-model-array</FILE>
+<TITLE>ESelectionModelArray</TITLE>
+ESelectionModelArray
+e_selection_model_array_insert_rows
+e_selection_model_array_delete_rows
+e_selection_model_array_move_row
+e_selection_model_array_confirm_row_count
+e_selection_model_array_get_row_count
+<SUBSECTION Standard>
+E_SELECTION_MODEL_ARRAY
+E_IS_SELECTION_MODEL_ARRAY
+E_TYPE_SELECTION_MODEL_ARRAY
+E_SELECTION_MODEL_ARRAY_CLASS
+E_IS_SELECTION_MODEL_ARRAY_CLASS
+E_SELECTION_MODEL_ARRAY_GET_CLASS
+ESelectionModelArrayClass
+e_selection_model_array_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-selection-model-simple</FILE>
+<TITLE>ESelectionModelSimple</TITLE>
+ESelectionModelSimple
+e_selection_model_simple_new
+e_selection_model_simple_insert_rows
+e_selection_model_simple_delete_rows
+e_selection_model_simple_move_row
+e_selection_model_simple_set_row_count
+<SUBSECTION Standard>
+E_SELECTION_MODEL_SIMPLE
+E_IS_SELECTION_MODEL_SIMPLE
+E_TYPE_SELECTION_MODEL_SIMPLE
+E_SELECTION_MODEL_SIMPLE_CLASS
+E_IS_SELECTION_MODEL_SIMPLE_CLASS
+E_SELECTION_MODEL_SIMPLE_GET_CLASS
+ESelectionModelSimpleClass
+e_selection_model_simple_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-send-options</FILE>
+<TITLE>ESendOptions</TITLE>
+Item_type
+ESendOptionsPriority
+ESendOptionsSecurity
+ESendOptionsReturnNotify
+TrackInfo
+ESendOptionsGeneral
+ESendOptionsStatusTracking
+ESendOptionsData
+ESendOptionsDialog
+e_send_options_dialog_new
+e_send_options_set_need_general_options
+e_send_options_get_need_general_options
+e_send_options_dialog_run
+e_send_options_set_global
+<SUBSECTION Standard>
+E_SEND_OPTIONS_DIALOG
+E_IS_SEND_OPTIONS_DIALOG
+E_TYPE_SEND_OPTIONS_DIALOG
+E_SEND_OPTIONS_DIALOG_CLASS
+E_IS_SEND_OPTIONS_DIALOG_CLASS
+E_SEND_OPTIONS_DIALOG_GET_CLASS
+ESendOptionsDialogClass
+e_send_options_dialog_get_type
+<SUBSECTION Private>
+ESendOptionsDialogPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-sorter</FILE>
+<TITLE>ESorter</TITLE>
+ESorter
+e_sorter_new
+e_sorter_model_to_sorted
+e_sorter_sorted_to_model
+e_sorter_get_model_to_sorted_array
+e_sorter_get_sorted_to_model_array
+e_sorter_needs_sorting
+<SUBSECTION Standard>
+E_SORTER
+E_IS_SORTER
+E_TYPE_SORTER
+E_SORTER_CLASS
+E_IS_SORTER_CLASS
+E_SORTER_GET_CLASS
+ESorterClass
+e_sorter_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-sorter-array</FILE>
+<TITLE>ESorterArray</TITLE>
+ESorterArray
+ECreateCmpCacheFunc
+ECompareRowsFunc
+e_sorter_array_construct
+e_sorter_array_new
+e_sorter_array_clean
+e_sorter_array_set_count
+e_sorter_array_append
+<SUBSECTION Standard>
+E_SORTER_ARRAY
+E_IS_SORTER_ARRAY
+E_TYPE_SORTER_ARRAY
+E_SORTER_ARRAY_CLASS
+E_IS_SORTER_ARRAY_CLASS
+E_SORTER_ARRAY_GET_CLASS
+ESorterArrayClass
+e_sorter_array_get_type
</SECTION>
<SECTION>
@@ -1726,6 +2991,80 @@ ESourceComboBoxPrivate
</SECTION>
<SECTION>
+<FILE>e-source-config</FILE>
+<TITLE>ESourceConfig</TITLE>
+ESourceConfig
+e_source_config_new
+e_source_config_insert_widget
+e_source_config_get_page
+e_source_config_get_backend_extension_name
+e_source_config_list_eligible_collections
+e_source_config_check_complete
+e_source_config_get_original_source
+e_source_config_get_collection_source
+e_source_config_get_registry
+e_source_config_resize_window
+e_source_config_commit
+e_source_config_commit_finish
+e_source_config_add_refresh_interval
+e_source_config_add_secure_connection
+e_source_config_add_secure_connection_for_webdav
+e_source_config_add_user_entry
+<SUBSECTION Standard>
+E_SOURCE_CONFIG
+E_IS_SOURCE_CONFIG
+E_TYPE_SOURCE_CONFIG
+E_SOURCE_CONFIG_CLASS
+E_IS_SOURCE_CONFIG_CLASS
+E_SOURCE_CONFIG_GET_CLASS
+ESourceConfigClass
+e_source_config_get_type
+<SUBSECTION Private>
+ESourceConfigPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-source-config-backend</FILE>
+<TITLE>ESourceConfigBackend</TITLE>
+ESourceConfigBackend
+e_source_config_backend_get_config
+e_source_config_backend_allow_creation
+e_source_config_backend_insert_widgets
+e_source_config_backend_check_complete
+e_source_config_backend_commit_changes
+<SUBSECTION Standard>
+E_SOURCE_CONFIG_BACKEND
+E_IS_SOURCE_CONFIG_BACKEND
+E_TYPE_SOURCE_CONFIG_BACKEND
+E_SOURCE_CONFIG_BACKEND_CLASS
+E_IS_SOURCE_CONFIG_BACKEND_CLASS
+E_SOURCE_CONFIG_BACKEND_GET_CLASS
+ESourceConfigBackendClass
+e_source_config_backend_get_type
+<SUBSECTION Private>
+ESourceConfigBackendPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-source-config-dialog</FILE>
+<TITLE>ESourceConfigDialog</TITLE>
+ESourceConfigDialog
+e_source_config_dialog_new
+e_source_config_dialog_get_config
+<SUBSECTION Standard>
+E_SOURCE_CONFIG_DIALOG
+E_IS_SOURCE_CONFIG_DIALOG
+E_TYPE_SOURCE_CONFIG_DIALOG
+E_SOURCE_CONFIG_DIALOG_CLASS
+E_IS_SOURCE_CONFIG_DIALOG_CLASS
+E_SOURCE_CONFIG_DIALOG_GET_CLASS
+ESourceConfigDialogClass
+e_source_config_dialog_get_type
+<SUBSECTION Private>
+ESourceConfigDialogPrivate
+</SECTION>
+
+<SECTION>
<FILE>e-source-selector</FILE>
<TITLE>ESourceSelector</TITLE>
ESourceSelector
@@ -1784,7 +3123,1140 @@ ESourceSelectorDialogPrivate
</SECTION>
<SECTION>
-<FILE>e-tree-model-generator</FILE>
+<FILE>e-source-util</FILE>
+<TITLE>ESource Utilities</TITLE>
+e_source_util_remove
+e_source_util_write
+e_source_util_remote_delete
+</SECTION>
+
+<SECTION>
+<FILE>e-spell-entry</FILE>
+<TITLE>ESpellEntry</TITLE>
+ESpellEntry
+e_spell_entry_new
+e_spell_entry_set_languages
+e_spell_entry_get_checking_enabled
+e_spell_entry_set_checking_enabled
+<SUBSECTION Standard>
+E_SPELL_ENTRY
+E_IS_SPELL_ENTRY
+E_TYPE_SPELL_ENTRY
+E_SPELL_ENTRY_CLASS
+E_IS_SPELL_ENTRY_CLASS
+E_SPELL_ENTRY_GET_CLASS
+ESpellEntryClass
+e_spell_entry_get_type
+<SUBSECTION Private>
+ESpellEntryPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-stock-request</FILE>
+<TITLE>EStockRequest</TITLE>
+EStockRequest
+<SUBSECTION Standard>
+E_STOCK_REQUEST
+E_IS_STOCK_REQUEST
+E_TYPE_STOCK_REQUEST
+E_STOCK_REQUEST_CLASS
+E_IS_STOCK_REQUEST_CLASS
+E_STOCK_REQUEST_GET_CLASS
+EStockRequestClass
+e_stock_request_get_type
+<SUBSECTION Private>
+EStockRequestPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-table</FILE>
+<TITLE>ETable</TITLE>
+ETableDragSourceSite
+ETableCursorLoc
+ETable
+e_table_construct
+e_table_new
+e_table_construct_from_spec_file
+e_table_new_from_spec_file
+e_table_get_state
+e_table_save_state
+e_table_get_state_object
+e_table_set_state
+e_table_set_state_object
+e_table_load_state
+e_table_set_cursor_row
+e_table_get_cursor_row
+e_table_selected_row_foreach
+e_table_selected_count
+e_table_get_printable
+e_table_get_next_row
+e_table_get_prev_row
+e_table_model_to_view_row
+e_table_view_to_model_row
+e_table_get_cell_at
+e_table_get_mouse_over_cell
+e_table_get_cell_geometry
+e_table_get_selection_model
+e_table_drag_get_data
+e_table_drag_highlight
+e_table_drag_unhighlight
+e_table_drag_dest_set
+e_table_drag_dest_set_proxy
+e_table_drag_dest_unset
+e_table_drag_source_set
+e_table_drag_source_unset
+e_table_drag_begin
+e_table_select_all
+e_table_invert_selection
+e_table_right_click_up
+e_table_commit_click_to_add
+e_table_freeze_state_change
+e_table_thaw_state_change
+<SUBSECTION Standard>
+E_TABLE
+E_IS_TABLE
+E_TYPE_TABLE
+E_TABLE_CLASS
+E_IS_TABLE_CLASS
+E_TABLE_GET_CLASS
+ETableClass
+e_table_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-click-to-add</FILE>
+<TITLE>ETableClickToAdd</TITLE>
+ETableClickToAdd
+e_table_click_to_add_commit
+<SUBSECTION Standard>
+E_TABLE_CLICK_TO_ADD
+E_IS_TABLE_CLICK_TO_ADD
+E_TYPE_TABLE_CLICK_TO_ADD
+E_TABLE_CLICK_TO_ADD_CLASS
+E_IS_TABLE_CLICK_TO_ADD_CLASS
+E_TABLE_CLICK_TO_ADD_GET_CLASS
+ETableClickToAddClass
+e_table_click_to_add_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-col</FILE>
+<TITLE>ETableCol</TITLE>
+ETableCol
+e_table_col_new
+<SUBSECTION Standard>
+E_TABLE_COL
+E_IS_TABLE_COL
+E_TYPE_TABLE_COL
+E_TABLE_COL_CLASS
+E_IS_TABLE_COL_CLASS
+E_TABLE_COL_GET_CLASS
+ETableColClass
+e_table_col_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-column-specification</FILE>
+<TITLE>ETableColumnSpecification</TITLE>
+ETableColumnSpecification
+e_table_column_specification_new
+e_table_column_specification_load_from_node
+e_table_column_specification_save_to_node
+<SUBSECTION Standard>
+E_TABLE_COLUMN_SPECIFICATION
+E_IS_TABLE_COLUMN_SPECIFICATION
+E_TYPE_TABLE_COLUMN_SPECIFICATION
+E_TABLE_COLUMN_SPECIFICATION_CLASS
+E_IS_TABLE_COLUMN_SPECIFICATION_CLASS
+E_TABLE_COLUMN_SPECIFICATION_GET_CLASS
+ETableColumnSpecificationClass
+e_table_column_specification_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-config</FILE>
+<TITLE>ETableConfig</TITLE>
+ETableConfigSortWidgets
+ETableConfig
+e_table_config_new
+e_table_config_construct
+e_table_config_raise
+<SUBSECTION Standard>
+E_TABLE_CONFIG
+E_IS_TABLE_CONFIG
+E_TYPE_TABLE_CONFIG
+E_TABLE_CONFIG_CLASS
+E_IS_TABLE_CONFIG_CLASS
+E_TABLE_CONFIG_GET_CLASS
+ETableConfigClass
+e_table_config_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-extras</FILE>
+<TITLE>ETableExtras</TITLE>
+ETableExtras
+e_table_extras_new
+e_table_extras_add_cell
+e_table_extras_get_cell
+e_table_extras_add_compare
+e_table_extras_get_compare
+ETableSearchFunc
+e_table_extras_add_search
+e_table_extras_get_search
+e_table_extras_add_icon_name
+e_table_extras_get_icon_name
+<SUBSECTION Standard>
+E_TABLE_EXTRAS
+E_IS_TABLE_EXTRAS
+E_TYPE_TABLE_EXTRAS
+E_TABLE_EXTRAS_CLASS
+E_IS_TABLE_EXTRAS_CLASS
+E_TABLE_EXTRAS_GET_CLASS
+ETableExtrasClass
+e_table_extras_get_type
+<SUBSECTION Private>
+ETableExtrasPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-table-field-chooser</FILE>
+<TITLE>ETableFieldChooser</TITLE>
+ETableFieldChooser
+e_table_field_chooser_new
+<SUBSECTION Standard>
+E_TABLE_FIELD_CHOOSER
+E_IS_TABLE_FIELD_CHOOSER
+E_TYPE_TABLE_FIELD_CHOOSER
+E_TABLE_FIELD_CHOOSER_CLASS
+E_IS_TABLE_FIELD_CHOOSER_CLASS
+E_TABLE_FIELD_CHOOSER_GET_CLASS
+ETableFieldChooserClass
+e_table_field_chooser_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-field-chooser-dialog</FILE>
+<TITLE>ETableFieldChooserDialog</TITLE>
+ETableFieldChooserDialog
+e_table_field_chooser_dialog_new
+<SUBSECTION Standard>
+E_TABLE_FIELD_CHOOSER_DIALOG
+E_IS_TABLE_FIELD_CHOOSER_DIALOG
+E_TYPE_TABLE_FIELD_CHOOSER_DIALOG
+E_TABLE_FIELD_CHOOSER_DIALOG_CLASS
+E_IS_TABLE_FIELD_CHOOSER_DIALOG_CLASS
+E_TABLE_FIELD_CHOOSER_DIALOG_GET_CLASS
+ETableFieldChooserDialogClass
+e_table_field_chooser_dialog_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-field-chooser-item</FILE>
+<TITLE>ETableFieldChooserItem</TITLE>
+ETableFieldChooserItem
+<SUBSECTION Standard>
+E_TABLE_FIELD_CHOOSER_ITEM
+E_IS_TABLE_FIELD_CHOOSER_ITEM
+E_TYPE_TABLE_FIELD_CHOOSER_ITEM
+E_TABLE_FIELD_CHOOSER_ITEM_CLASS
+E_IS_TABLE_FIELD_CHOOSER_ITEM_CLASS
+E_TABLE_FIELD_CHOOSER_ITEM_GET_CLASS
+ETableFieldChooserItemClass
+e_table_field_chooser_item_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-group</FILE>
+<TITLE>ETableGroup</TITLE>
+ETableGroup
+e_table_group_new
+e_table_group_construct
+e_table_group_add
+e_table_group_add_array
+e_table_group_add_all
+e_table_group_remove
+e_table_group_increment
+e_table_group_decrement
+e_table_group_row_count
+EFocus
+e_table_group_set_focus
+e_table_group_get_focus
+e_table_group_get_focus_column
+e_table_group_get_header
+e_table_group_get_printable
+e_table_group_compute_location
+e_table_group_get_mouse_over
+e_table_group_get_cell_geometry
+e_table_group_cursor_change
+e_table_group_cursor_activated
+e_table_group_double_click
+e_table_group_right_click
+e_table_group_click
+e_table_group_key_press
+e_table_group_start_drag
+ETableGroupLeafFn
+e_table_group_apply_to_leafs
+<SUBSECTION Standard>
+E_TABLE_GROUP
+E_IS_TABLE_GROUP
+E_TYPE_TABLE_GROUP
+E_TABLE_GROUP_CLASS
+E_IS_TABLE_GROUP_CLASS
+E_TABLE_GROUP_GET_CLASS
+ETableGroupClass
+e_table_group_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-group-container</FILE>
+<TITLE>ETableGroupContainer</TITLE>
+ETableGroupContainerChildNode
+ETableGroupContainer
+e_table_group_container_new
+e_table_group_container_construct
+<SUBSECTION Standard>
+E_TABLE_GROUP_CONTAINER
+E_IS_TABLE_GROUP_CONTAINER
+E_TYPE_TABLE_GROUP_CONTAINER
+E_TABLE_GROUP_CONTAINER_CLASS
+E_IS_TABLE_GROUP_CONTAINER_CLASS
+E_TABLE_GROUP_CONTAINER_GET_CLASS
+ETableGroupContainerClass
+e_table_group_container_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-group-leaf</FILE>
+<TITLE>ETableGroupLeaf</TITLE>
+ETableGroupLeaf
+e_table_group_leaf_new
+<SUBSECTION Standard>
+E_TABLE_GROUP_LEAF
+E_IS_TABLE_GROUP_LEAF
+E_TYPE_TABLE_GROUP_LEAF
+E_TABLE_GROUP_LEAF_CLASS
+E_IS_TABLE_GROUP_LEAF_CLASS
+E_TABLE_GROUP_LEAF_GET_CLASS
+ETableGroupClass
+e_table_group_leaf_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-header</FILE>
+<TITLE>ETableHeader</TITLE>
+ETableHeader
+e_table_header_new
+e_table_header_add_column
+e_table_header_get_column
+e_table_header_get_column_by_col_idx
+e_table_header_count
+e_table_header_index
+e_table_header_get_index_at
+e_table_header_get_columns
+e_table_header_get_selected
+e_table_header_total_width
+e_table_header_min_width
+e_table_header_move
+e_table_header_remove
+e_table_header_set_size
+e_table_header_set_selection
+e_table_header_col_diff
+e_table_header_calc_widths
+e_table_header_get_selected_indexes
+e_table_header_update_horizontal
+e_table_header_prioritized_column
+ETableColCheckFunc
+e_table_header_prioritized_column_selected
+e_table_header_compute_height
+e_table_header_width_extras
+ETableColArrow
+e_table_header_draw_button
+<SUBSECTION Standard>
+E_TABLE_HEADER
+E_IS_TABLE_HEADER
+E_TYPE_TABLE_HEADER
+E_TABLE_HEADER_CLASS
+E_IS_TABLE_HEADER_CLASS
+E_TABLE_HEADER_GET_CLASS
+ETableHeaderClass
+e_table_header_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-header-item</FILE>
+<TITLE>ETableHeaderItem</TITLE>
+ETableHeaderItem
+ethi_change_sort_state
+<SUBSECTION Standard>
+E_TABLE_HEADER_ITEM
+E_IS_TABLE_HEADER_ITEM
+E_TYPE_TABLE_HEADER_ITEM
+E_TABLE_HEADER_ITEM_CLASS
+E_IS_TABLE_HEADER_ITEM_CLASS
+E_TABLE_HEADER_ITEM_GET_CLASS
+ETableHeaderItemClass
+e_table_header_item_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-item</FILE>
+<TITLE>ETableItem</TITLE>
+ETableItem
+e_table_item_set_cursor
+e_table_item_get_focused_column
+e_table_item_leave_edit
+e_table_item_enter_edit
+e_table_item_redraw_range
+e_table_item_get_printable
+e_table_item_compute_location
+e_table_item_compute_mouse_over
+e_table_item_get_cell_geometry
+e_table_item_row_diff
+<SUBSECTION Standard>
+E_TABLE_ITEM
+E_IS_TABLE_ITEM
+E_TYPE_TABLE_ITEM
+E_TABLE_ITEM_CLASS
+E_IS_TABLE_ITEM_CLASS
+E_TABLE_ITEM_GET_CLASS
+ETableItemClass
+e_table_item_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-memory</FILE>
+<TITLE>ETableMemory</TITLE>
+ETableMemory
+e_table_memory_new
+e_table_memory_construct
+e_table_memory_insert
+e_table_memory_remove
+e_table_memory_clear
+e_table_memory_freeze
+e_table_memory_thaw
+e_table_memory_get_data
+e_table_memory_set_data
+<SUBSECTION Standard>
+E_TABLE_MEMORY
+E_IS_TABLE_MEMORY
+E_TYPE_TABLE_MEMORY
+E_TABLE_MEMORY_CLASS
+E_IS_TABLE_MEMORY_CLASS
+E_TABLE_MEMORY_GET_CLASS
+ETableMemoryClass
+e_table_memory_get_type
+<SUBSECTION Private>
+ETableMemoryPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-table-memory-callbacks</FILE>
+<TITLE>ETableMemoryCallbacks</TITLE>
+ETableMemoryCallbacks
+ETableMemoryCallbacksColumnCountFn
+ETableMemoryCallbacksAppendRowFn
+ETableMemoryCallbacksValueAtFn
+ETableMemoryCallbacksSetValueAtFn
+ETableMemoryCallbacksIsCellEditableFn
+ETableMemoryCallbacksDuplicateValueFn
+ETableMemoryCallbacksFreeValueFn
+ETableMemoryCallbacksInitializeValueFn
+ETableMemoryCallbacksValueIsEmptyFn
+ETableMemoryCallbacksValueToStringFn
+e_table_memory_callbacks_new
+<SUBSECTION Standard>
+E_TABLE_MEMORY_CALLBACKS
+E_IS_TABLE_MEMORY_CALLBACKS
+E_TYPE_TABLE_MEMORY_CALLBACKS
+E_TABLE_MEMORY_CALLBACKS_CLASS
+E_IS_TABLE_MEMORY_CALLBACKS_CLASS
+E_TABLE_MEMORY_CALLBACKS_GET_CLASS
+ETableMemoryCallbacksClass
+e_table_memory_callbacks_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-memory-store</FILE>
+<TITLE>ETableMemoryStore</TITLE>
+ETableMemoryStore
+ETableMemoryStoreColumnType
+ETableMemoryStoreCustomColumn
+ETableMemoryStoreColumnInfo
+E_TABLE_MEMORY_STORE_TERMINATOR
+E_TABLE_MEMORY_STORE_INTEGER
+E_TABLE_MEMORY_STORE_STRING
+e_table_memory_store_new
+e_table_memory_store_construct
+e_table_memory_store_adopt_value_at
+e_table_memory_store_insert_array
+e_table_memory_store_insert
+e_table_memory_store_insert_adopt
+e_table_memory_store_insert_adopt_array
+e_table_memory_store_change_array
+e_table_memory_store_change
+e_table_memory_store_change_adopt
+e_table_memory_store_change_adopt_array
+e_table_memory_store_remove
+e_table_memory_store_clear
+<SUBSECTION Standard>
+E_TABLE_MEMORY_STORE
+E_IS_TABLE_MEMORY_STORE
+E_TYPE_TABLE_MEMORY_STORE
+E_TABLE_MEMORY_STORE_CLASS
+E_IS_TABLE_MEMORY_STORE_CLASS
+E_TABLE_MEMORY_STORE_GET_CLASS
+ETableMemoryStoreClass
+e_table_memory_store_get_type
+<SUBSECTION Private>
+ETableMemoryStorePrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-table-model</FILE>
+<TITLE>ETableModel</TITLE>
+ETableModel
+e_table_model_column_count
+e_table_model_column_name
+e_table_model_row_count
+e_table_model_append_row
+e_table_model_value_at
+e_table_model_set_value_at
+e_table_model_is_cell_editable
+e_table_model_has_save_id
+e_table_model_get_save_id
+e_table_model_has_change_pending
+e_table_model_duplicate_value
+e_table_model_free_value
+e_table_model_initialize_value
+e_table_model_value_is_empty
+e_table_model_value_to_string
+e_table_model_pre_change
+e_table_model_no_change
+e_table_model_changed
+e_table_model_row_changed
+e_table_model_cell_changed
+e_table_model_rows_inserted
+e_table_model_rows_deleted
+e_table_model_row_inserted
+e_table_model_row_deleted
+e_table_model_freeze
+e_table_model_thaw
+<SUBSECTION Standard>
+E_TABLE_MODEL
+E_IS_TABLE_MODEL
+E_TYPE_TABLE_MODEL
+E_TABLE_MODEL_CLASS
+E_IS_TABLE_MODEL_CLASS
+E_TABLE_MODEL_GET_CLASS
+ETableModelClass
+e_table_model_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-one</FILE>
+<TITLE>ETableOne</TITLE>
+e_table_one_new
+e_table_one_commit
+<SUBSECTION Standard>
+E_TABLE_ONE
+E_IS_TABLE_ONE
+E_TYPE_TABLE_ONE
+E_TABLE_ONE_CLASS
+E_IS_TABLE_ONE_CLASS
+E_TABLE_ONE_GET_CLASS
+ETableOneClass
+e_table_one_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-search</FILE>
+<TITLE>ETableSearch</TITLE>
+ETableSearchFlags
+ETableSearch
+e_table_search_new
+e_table_search_input_character
+e_table_search_backspace
+e_table_search_cancel
+<SUBSECTION Standard>
+E_TABLE_SEARCH
+E_IS_TABLE_SEARCH
+E_TYPE_TABLE_SEARCH
+E_TABLE_SEARCH_CLASS
+E_IS_TABLE_SEARCH_CLASS
+E_TABLE_SEARCH_GET_CLASS
+ETableSearchClass
+e_table_search_get_type
+<SUBSECTION Private>
+ETableSearchPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-table-selection-model</FILE>
+<TITLE>ETableSelectionModel</TITLE>
+ETableSelectionModel
+e_table_selection_model_new
+<SUBSECTION Standard>
+E_TABLE_SELECTION_MODEL
+E_IS_TABLE_SELECTION_MODEL
+E_TYPE_TABLE_SELECTION_MODEL
+E_TABLE_SELECTION_MODEL_CLASS
+E_IS_TABLE_SELECTION_MODEL_CLASS
+E_TABLE_SELECTION_MODEL_GET_CLASS
+ETableSelectionModelClass
+e_table_selection_model_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-sorted</FILE>
+<TITLE>ETableSorted</TITLE>
+ETableSorted
+e_table_sorted_new
+<SUBSECTION Standard>
+E_TABLE_SORTED
+E_IS_TABLE_SORTED
+E_TYPE_TABLE_SORTED
+E_TABLE_SORTED_CLASS
+E_IS_TABLE_SORTED_CLASS
+E_TABLE_SORTED_GET_CLASS
+ETableSortedClass
+e_table_sorted_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-sorted-variable</FILE>
+<TITLE>ETableSortedVariable</TITLE>
+ETableSortedVariable
+e_table_sorted_variable_new
+<SUBSECTION Standard>
+E_TABLE_SORTED_VARIABLE
+E_IS_TABLE_SORTED_VARIABLE
+E_TYPE_TABLE_SORTED_VARIABLE
+E_TABLE_SORTED_VARIABLE_CLASS
+E_IS_TABLE_SORTED_VARIABLE_CLASS
+E_TABLE_SORTED_VARIABLE_GET_CLASS
+ETableSortedVariableClass
+e_table_sorted_variable_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-sorter</FILE>
+<TITLE>ETableSorter</TITLE>
+ETableSorter
+e_table_sorter_new
+<SUBSECTION Standard>
+E_TABLE_SORTER
+E_IS_TABLE_SORTER
+E_TYPE_TABLE_SORTER
+E_TABLE_SORTER_CLASS
+E_IS_TABLE_SORTER_CLASS
+E_TABLE_SORTER_GET_CLASS
+ETableSorterClass
+e_table_sorter_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-sort-info</FILE>
+<TITLE>ETableSortInfo</TITLE>
+ETableSortInfo
+e_table_sort_info_freeze
+e_table_sort_info_thaw
+e_table_sort_info_grouping_get_count
+e_table_sort_info_grouping_truncate
+ETableSortColumn
+e_table_sort_info_grouping_get_nth
+e_table_sort_info_grouping_set_nth
+e_table_sort_info_sorting_get_count
+e_table_sort_info_sorting_truncate
+e_table_sort_info_sorting_get_nth
+e_table_sort_info_sorting_set_nth
+e_table_sort_info_new
+e_table_sort_info_load_from_node
+e_table_sort_info_save_to_node
+e_table_sort_info_duplicate
+e_table_sort_info_set_can_group
+e_table_sort_info_get_can_group
+<SUBSECTION Standard>
+E_TABLE_SORT_INFO
+E_IS_TABLE_SORT_INFO
+E_TYPE_TABLE_SORT_INFO
+E_TABLE_SORT_INFO_CLASS
+E_IS_TABLE_SORT_INFO_CLASS
+E_TABLE_SORT_INFO_GET_CLASS
+ETableSortInfoClass
+e_table_sort_info_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-sorting-utils</FILE>
+<TITLE>Sorting Utilities</TITLE>
+e_table_sorting_utils_affects_sort
+e_table_sorting_utils_sort
+e_table_sorting_utils_insert
+e_table_sorting_utils_check_position
+e_table_sorting_utils_tree_sort
+e_table_sorting_utils_tree_check_position
+e_table_sorting_utils_tree_insert
+e_table_sorting_utils_create_cmp_cache
+e_table_sorting_utils_free_cmp_cache
+e_table_sorting_utils_add_to_cmp_cache
+e_table_sorting_utils_lookup_cmp_cache
+</SECTION>
+
+<SECTION>
+<FILE>e-table-specification</FILE>
+<TITLE>ETableSpecification</TITLE>
+ETableSpecification
+e_table_specification_new
+e_table_specification_load_from_file
+e_table_specification_load_from_string
+e_table_specification_load_from_node
+e_table_specification_save_to_file
+e_table_specification_save_to_string
+e_table_specification_save_to_node
+e_table_specification_duplicate
+<SUBSECTION Standard>
+E_TABLE_SPECIFICATION
+E_IS_TABLE_SPECIFICATION
+E_TYPE_TABLE_SPECIFICATION
+E_TABLE_SPECIFICATION_CLASS
+E_IS_TABLE_SPECIFICATION_CLASS
+E_TABLE_SPECIFICATION_GET_CLASS
+ETableSpecificationClass
+e_table_specification_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-state</FILE>
+<TITLE>ETableState</TITLE>
+ETableState
+e_table_state_new
+e_table_state_vanilla
+e_table_state_load_from_file
+e_table_state_load_from_string
+e_table_state_load_from_node
+e_table_state_save_to_file
+e_table_state_save_to_string
+e_table_state_save_to_node
+e_table_state_duplicate
+<SUBSECTION Standard>
+E_TABLE_STATE
+E_IS_TABLE_STATE
+E_TYPE_TABLE_STATE
+E_TABLE_STATE_CLASS
+E_IS_TABLE_STATE_CLASS
+E_TABLE_STATE_GET_CLASS
+ETableStateClass
+e_table_state_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-subset</FILE>
+<TITLE>ETableSubset</TITLE>
+ETableSubset
+e_table_subset_new
+e_table_subset_construct
+e_table_subset_model_to_view_row
+e_table_subset_view_to_model_row
+e_table_subset_get_toplevel
+e_table_subset_print_debugging
+<SUBSECTION Standard>
+E_TABLE_SUBSET
+E_IS_TABLE_SUBSET
+E_TYPE_TABLE_SUBSET
+E_TABLE_SUBSET_CLASS
+E_IS_TABLE_SUBSET_CLASS
+E_TABLE_SUBSET_GET_CLASS
+ETableSubsetClass
+e_table_subset_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-subset-variable</FILE>
+<TITLE>ETableSubsetVariable</TITLE>
+ETableSubsetVariable
+e_table_subset_variable_new
+e_table_subset_variable_construct
+e_table_subset_variable_add
+e_table_subset_variable_add_array
+e_table_subset_variable_add_all
+e_table_subset_variable_remove
+e_table_subset_variable_clear
+e_table_subset_variable_increment
+e_table_subset_variable_decrement
+e_table_subset_variable_set_allocation
+<SUBSECTION Standard>
+E_TABLE_SUBSET_VARIABLE
+E_IS_TABLE_SUBSET_VARIABLE
+E_TYPE_TABLE_SUBSET_VARIABLE
+E_TABLE_SUBSET_VARIABLE_CLASS
+E_IS_TABLE_SUBSET_VARIABLE_CLASS
+E_TABLE_SUBSET_VARIABLE_GET_CLASS
+ETableSubsetVariableClass
+e_table_subset_variable_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-table-utils</FILE>
+<TITLE>Miscellaneous Table Utilities</TITLE>
+e_table_state_to_header
+e_table_spec_to_full_header
+e_table_util_calculate_current_search_col
+</SECTION>
+
+<SECTION>
+<FILE>e-table-without</FILE>
+<TITLE>ETableWithout</TITLE>
+ETableWithout
+ETableWithoutGetKeyFunc
+ETableWithoutDuplicateKeyFunc
+ETableWithoutFreeKeyFunc
+e_table_without_new
+e_table_without_construct
+e_table_without_hide
+e_table_without_hide_adopt
+e_table_without_show
+e_table_without_show_all
+<SUBSECTION Standard>
+E_TABLE_WITHOUT
+E_IS_TABLE_WITHOUT
+E_TYPE_TABLE_WITHOUT
+E_TABLE_WITHOUT_CLASS
+E_IS_TABLE_WITHOUT_CLASS
+E_TABLE_WITHOUT_GET_CLASS
+ETableWithoutClass
+e_table_without_get_type
+<SUBSECTION Private>
+ETableWithoutPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-text</FILE>
+<TITLE>EText</TITLE>
+EText
+e_text_cancel_editing
+e_text_stop_editing
+e_text_delete_selection
+e_text_cut_clipboard
+e_text_copy_clipboard
+e_text_paste_clipboard
+e_text_select_all
+<SUBSECTION Standard>
+E_TEXT
+E_IS_TEXT
+E_TYPE_TEXT
+E_TEXT_CLASS
+E_IS_TEXT_CLASS
+E_TEXT_GET_CLASS
+ETextClass
+e_text_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-text-event-processor</FILE>
+<TITLE>ETextEventProcessor</TITLE>
+ETextEventProcessor
+ETextEventProcessorCommandPosition
+ETextEventProcessorCommandAction
+ETextEventProcessorCommand
+ETextEventProcessorEventButton
+ETextEventProcessorEventKey
+ETextEventProcessorEventMotion
+ETextEventProcessorEvent
+ETextEventProcessorCaps
+e_text_event_processor_handle_event
+<SUBSECTION Standard>
+E_TEXT_EVENT_PROCESSOR
+E_IS_TEXT_EVENT_PROCESSOR
+E_TYPE_TEXT_EVENT_PROCESSOR
+E_TEXT_EVENT_PROCESSOR_CLASS
+E_IS_TEXT_EVENT_PROCESSOR_CLASS
+E_TEXT_EVENT_PROCESSOR_GET_CLASS
+ETextEventProcessorClass
+e_text_event_processor_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-text-event-processor-emacs-like</FILE>
+<TITLE>ETextEventProcessorEmacsLike</TITLE>
+ETextEventProcessorEmacsLike
+e_text_event_processor_emacs_like_new
+<SUBSECTION Standard>
+E_TEXT_EVENT_PROCESSOR_EMACS_LIKE
+E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE
+E_TYPE_TEXT_EVENT_PROCESSOR_EMACS_LIKE
+E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS
+E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS
+E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_GET_CLASS
+ETextEventProcessorEmacsLikeClass
+e_text_event_processor_emacs_like_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-text-model</FILE>
+<TITLE>ETextModel</TITLE>
+ETextModel
+e_text_model_new
+e_text_model_changed
+e_text_model_cancel_completion
+ETextModelReposFn
+e_text_model_reposition
+e_text_model_validate_position
+e_text_model_get_text
+e_text_model_get_text_length
+e_text_model_set_text
+e_text_model_insert
+e_text_model_insert_length
+e_text_model_prepend
+e_text_model_append
+e_text_model_delete
+e_text_model_object_count
+e_text_model_get_nth_object
+e_text_model_strdup_nth_object
+e_text_model_get_nth_object_bounds
+e_text_model_get_object_at_offset
+e_text_model_get_object_at_pointer
+e_text_model_activate_nth_object
+EReposAbsolute
+e_repos_absolute
+EReposInsertShift
+e_repos_insert_shift
+EReposDeleteShift
+e_repos_delete_shift
+<SUBSECTION Standard>
+E_TEXT_MODEL
+E_IS_TEXT_MODEL
+E_TYPE_TEXT_MODEL
+E_TEXT_MODEL_CLASS
+E_IS_TEXT_MODEL_CLASS
+E_TEXT_MODEL_GET_CLASS
+ETextModelClass
+e_text_model_get_type
+<SUBSECTION Private>
+ETextModelPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-timezone-dialog</FILE>
+<TITLE>ETimezoneDialog</TITLE>
+ETimezoneDialog
+e_timezone_dialog_construct
+e_timezone_dialog_new
+e_timezone_dialog_get_timezone
+e_timezone_dialog_set_timezone
+e_timezone_dialog_get_toplevel
+<SUBSECTION Standard>
+E_TIMEZONE_DIALOG
+E_IS_TIMEZONE_DIALOG
+E_TYPE_TIMEZONE_DIALOG
+E_TIMEZONE_DIALOG_CLASS
+E_IS_TIMEZONE_DIALOG_CLASS
+E_TIMEZONE_DIALOG_GET_CLASS
+ETimezoneDialogClass
+e_timezone_dialog_get_type
+<SUBSECTION Private>
+ETimezoneDialogPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-tree</FILE>
+<TITLE>ETree</TITLE>
+ETree
+e_tree_construct
+e_tree_new
+e_tree_construct_from_spec_file
+e_tree_new_from_spec_file
+e_tree_get_state
+e_tree_save_state
+e_tree_get_state_object
+e_tree_get_spec
+e_tree_set_search_column
+e_tree_set_state
+e_tree_set_state_object
+e_tree_load_state
+e_tree_show_cursor_after_reflow
+e_tree_set_cursor
+e_tree_get_cursor
+e_tree_selected_row_foreach
+e_tree_selected_path_foreach
+e_tree_path_foreach
+e_tree_get_printable
+e_tree_get_next_row
+e_tree_get_prev_row
+e_tree_model_to_view_row
+e_tree_view_to_model_row
+e_tree_get_cell_at
+e_tree_get_cell_geometry
+e_tree_get_model
+e_tree_get_selection_model
+e_tree_get_table_adapter
+e_tree_drag_get_data
+e_tree_drag_highlight
+e_tree_drag_unhighlight
+e_tree_drag_dest_set
+e_tree_drag_dest_set_proxy
+e_tree_drag_dest_unset
+e_tree_drag_source_set
+e_tree_drag_source_unset
+e_tree_drag_begin
+e_tree_is_dragging
+e_tree_node_is_expanded
+e_tree_node_set_expanded
+e_tree_node_set_expanded_recurse
+e_tree_root_node_set_visible
+e_tree_node_at_row
+e_tree_row_of_node
+e_tree_root_node_is_visible
+e_tree_show_node
+e_tree_save_expanded_state
+e_tree_load_expanded_state
+e_tree_save_expanded_state_xml
+e_tree_load_expanded_state_xml
+e_tree_row_count
+e_tree_get_tooltip
+e_tree_force_expanded_state
+ETreeFindNextParams
+e_tree_find_next
+e_tree_right_click_up
+e_tree_get_item
+e_tree_get_header_item
+e_tree_set_info_message
+e_tree_freeze_state_change
+e_tree_thaw_state_change
+<SUBSECTION Standard>
+E_TREE
+E_IS_TREE
+E_TYPE_TREE
+E_TREE_CLASS
+E_IS_TREE_CLASS
+E_TREE_GET_CLASS
+ETreeClass
+e_tree_get_type
+<SUBSECTION Private>
+ETreePrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-tree-memory</FILE>
+<TITLE>ETreeMemory</TITLE>
+ETreeMemory
+e_tree_memory_construct
+e_tree_memory_new
+e_tree_memory_node_insert
+e_tree_memory_node_insert_id
+e_tree_memory_node_insert_before
+e_tree_memory_node_remove
+e_tree_memory_freeze
+e_tree_memory_thaw
+e_tree_memory_set_expanded_default
+e_tree_memory_node_get_data
+e_tree_memory_node_set_data
+ETreeMemorySortCallback
+e_tree_memory_sort_node
+e_tree_memory_set_node_destroy_func
+<SUBSECTION Standard>
+E_TREE_MEMORY
+E_IS_TREE_MEMORY
+E_TYPE_TREE_MEMORY
+E_TREE_MEMORY_CLASS
+E_IS_TREE_MEMORY_CLASS
+E_TREE_MEMORY_GET_CLASS
+ETreeMemoryClass
+e_tree_memory_get_type
+<SUBSECTION Private>
+ETreeMemoryPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-tree-memory-callbacks</FILE>
+<TITLE>ETreeMemoryCallbacks</TITLE>
+ETreeMemoryCallbacks
+ETreeMemoryCallbacksIconAtFn
+ETreeMemoryCallbacksColumnCountFn
+ETreeMemoryCallbacksHasSaveIdFn
+ETreeMemoryCallbacksGetSaveIdFn
+ETreeMemoryCallbacksHasGetNodeByIdFn
+ETreeMemoryCallbacksGetNodeByIdFn
+ETreeMemoryCallbacksValueAtFn
+ETreeMemoryCallbacksSetValueAtFn
+ETreeMemoryCallbacksIsEditableFn
+ETreeMemoryCallbacksDuplicateValueFn
+ETreeMemoryCallbacksFreeValueFn
+ETreeMemoryCallbacksInitializeValueFn
+ETreeMemoryCallbacksValueIsEmptyFn
+ETreeMemoryCallbacksValueToStringFn
+e_tree_memory_callbacks_new
+<SUBSECTION Standard>
+E_TREE_MEMORY_CALLBACKS
+E_IS_TREE_MEMORY_CALLBACKS
+E_TYPE_TREE_MEMORY_CALLBACKS
+E_TREE_MEMORY_CALLBACKS_CLASS
+E_IS_TREE_MEMORY_CALLBACKS_CLASS
+E_TREE_MEMORY_CALLBACKS_GET_CLASS
+ETreeMemoryCallbacksClass
+e_tree_memory_callbacks_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-tree-model</FILE>
+<TITLE>ETreeModel</TITLE>
+ETreeModel
+e_tree_model_new
+ETreePath
+e_tree_model_get_root
+e_tree_model_node_get_parent
+e_tree_model_node_get_first_child
+e_tree_model_node_get_last_child
+e_tree_model_node_get_next
+e_tree_model_node_get_prev
+e_tree_model_node_is_root
+e_tree_model_node_is_expandable
+e_tree_model_node_get_children
+e_tree_model_node_depth
+e_tree_model_icon_at
+e_tree_model_get_expanded_default
+e_tree_model_column_count
+e_tree_model_has_save_id
+e_tree_model_get_save_id
+e_tree_model_has_get_node_by_id
+e_tree_model_get_node_by_id
+e_tree_model_has_change_pending
+e_tree_model_sort_value_at
+e_tree_model_value_at
+e_tree_model_set_value_at
+e_tree_model_node_is_editable
+e_tree_model_duplicate_value
+e_tree_model_free_value
+e_tree_model_initialize_value
+e_tree_model_value_is_empty
+e_tree_model_value_to_string
+ETreePathFunc
+e_tree_model_node_traverse
+e_tree_model_node_traverse_preorder
+e_tree_model_node_find
+e_tree_model_pre_change
+e_tree_model_no_change
+e_tree_model_rebuilt
+e_tree_model_node_changed
+e_tree_model_node_data_changed
+e_tree_model_node_col_changed
+e_tree_model_node_inserted
+e_tree_model_node_removed
+e_tree_model_node_deleted
+e_tree_model_node_request_collapse
+<SUBSECTION Standard>
+E_TREE_MODEL
+E_IS_TREE_MODEL
+E_TYPE_TREE_MODEL
+E_TREE_MODEL_CLASS
+E_IS_TREE_MODEL_CLASS
+E_TREE_MODEL_GET_CLASS
+ETreeModelClass
+e_tree_model_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-tree-model-generator</FILE>
<TITLE>ETreeModelGenerator</TITLE>
ETreeModelGeneratorGenerateFunc
ETreeModelGeneratorModifyFunc
@@ -1811,12 +4283,161 @@ ETreeModelGeneratorPrivate
</SECTION>
<SECTION>
+<FILE>e-tree-selection-model</FILE>
+<TITLE>ETreeSelectionModel</TITLE>
+ETreeSelectionModel
+e_tree_selection_model_new
+ETreeForeachFunc
+e_tree_selection_model_foreach
+e_tree_selection_model_select_single_path
+e_tree_selection_model_select_paths
+e_tree_selection_model_add_to_selection
+e_tree_selection_model_change_cursor
+e_tree_selection_model_get_cursor
+<SUBSECTION Standard>
+E_TREE_SELECTION_MODEL
+E_IS_TREE_SELECTION_MODEL
+E_TYPE_TREE_SELECTION_MODEL
+E_TREE_SELECTION_MODEL_CLASS
+E_IS_TREE_SELECTION_MODEL_CLASS
+E_TREE_SELECTION_MODEL_GET_CLASS
+ETreeSelectionModelClass
+e_tree_selection_model_get_type
+<SUBSECTION Private>
+ETreeSelectionModelPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-tree-sorted</FILE>
+<TITLE>ETreeSorted</TITLE>
+ETreeSorted
+e_tree_sorted_construct
+e_tree_sorted_new
+e_tree_sorted_view_to_model_path
+e_tree_sorted_model_to_view_path
+e_tree_sorted_orig_position
+e_tree_sorted_node_num_children
+e_tree_sorted_node_resorted
+e_tree_sorted_get_sort_info
+e_tree_sorted_set_sort_info
+<SUBSECTION Standard>
+E_TREE_SORTED
+E_IS_TREE_SORTED
+E_TYPE_TREE_SORTED
+E_TREE_SORTED_CLASS
+E_IS_TREE_SORTED_CLASS
+E_TREE_SORTED_GET_CLASS
+ETreeSortedClass
+e_tree_sorted_get_type
+<SUBSECTION Private>
+ETreeSortedPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-tree-table-adapter</FILE>
+<TITLE>ETreeTableAdapter</TITLE>
+ETreeTableAdapter
+e_tree_table_adapter_new
+e_tree_table_adapter_construct
+e_tree_table_adapter_node_get_next
+e_tree_table_adapter_node_is_expanded
+e_tree_table_adapter_node_set_expanded
+e_tree_table_adapter_node_set_expanded_recurse
+e_tree_table_adapter_force_expanded_state
+e_tree_table_adapter_root_node_set_visible
+e_tree_table_adapter_node_at_row
+e_tree_table_adapter_row_of_node
+e_tree_table_adapter_root_node_is_visible
+e_tree_table_adapter_show_node
+e_tree_table_adapter_save_expanded_state
+e_tree_table_adapter_load_expanded_state
+e_tree_table_adapter_save_expanded_state_xml
+e_tree_table_adapter_load_expanded_state_xml
+e_tree_table_adapter_set_sort_info
+e_tree_table_adapter_get_sort_info
+e_tree_table_adapter_get_header
+<SUBSECTION Standard>
+E_TREE_TABLE_ADAPTER
+E_IS_TREE_TABLE_ADAPTER
+E_TYPE_TREE_TABLE_ADAPTER
+E_TREE_TABLE_ADAPTER_CLASS
+E_IS_TREE_TABLE_ADAPTER_CLASS
+E_TREE_TABLE_ADAPTER_GET_CLASS
+ETreeTableAdapterClass
+e_tree_table_adapter_get_type
+<SUBSECTION Private>
+ETreeTableAdapterPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-unicode</FILE>
+<TITLE>Unicode Utilities</TITLE>
+e_utf8_from_gtk_event_key
+e_utf8_from_iconv_string_sized
+e_utf8_to_iconv_string_sized
+e_utf8_to_charset_string_sized
+e_utf8_from_locale_string_sized
+e_utf8_ensure_valid
+e_unichar_to_utf8
+e_unicode_get_utf8
+e_xml_get_translated_utf8_string_prop_by_name
+</SECTION>
+
+<SECTION>
+<FILE>e-ui-manager</FILE>
+<TITLE>EUIManager</TITLE>
+EUIManager
+e_ui_manager_new
+e_ui_manager_get_express_mode
+e_ui_manager_set_express_mode
+e_ui_manager_add_ui_from_file
+e_ui_manager_add_ui_from_string
+<SUBSECTION Standard>
+E_UI_MANAGER
+E_IS_UI_MANAGER
+E_TYPE_UI_MANAGER
+E_UI_MANAGER_CLASS
+E_IS_UI_MANAGER_CLASS
+E_UI_MANAGER_GET_CLASS
+EUIManagerClass
+e_ui_manager_get_type
+<SUBSECTION Private>
+EUIManagerPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-url-entry</FILE>
+<TITLE>EUrlEntry</TITLE>
+EUrlEntry
+e_url_entry_new
+e_url_entry_get_entry
+<SUBSECTION Standard>
+E_URL_ENTRY
+E_IS_URL_ENTRY
+E_TYPE_URL_ENTRY
+E_URL_ENTRY_CLASS
+E_IS_URL_ENTRY_CLASS
+E_URL_ENTRY_GET_CLASS
+EUrlEntryClass
+e_url_entry_get_type
+<SUBSECTION Private>
+EUrlEntryPrivate
+</SECTION>
+
+<SECTION>
<FILE>e-web-view</FILE>
<TITLE>EWebView</TITLE>
EWebView
e_web_view_new
e_web_view_clear
e_web_view_load_string
+e_web_view_load_uri
+e_web_view_get_uri
+e_web_view_reload
+e_web_view_frame_load_string
+e_web_view_frame_load_uri
+e_web_view_frame_get_uri
+e_web_view_get_html
e_web_view_get_caret_mode
e_web_view_set_caret_mode
e_web_view_get_copy_target_list
@@ -1824,6 +4445,8 @@ e_web_view_get_disable_printing
e_web_view_set_disable_printing
e_web_view_get_disable_save_to_disk
e_web_view_set_disable_save_to_disk
+e_web_view_get_enable_frame_flattening
+e_web_view_set_enable_frame_flattening
e_web_view_get_editable
e_web_view_set_editable
e_web_view_get_inline_spelling
@@ -1834,6 +4457,10 @@ e_web_view_get_magic_smileys
e_web_view_set_magic_smileys
e_web_view_get_selected_uri
e_web_view_set_selected_uri
+e_web_view_get_cursor_image
+e_web_view_set_cursor_image
+e_web_view_get_cursor_image_src
+e_web_view_set_cursor_image_src
e_web_view_get_open_proxy
e_web_view_set_open_proxy
e_web_view_get_paste_target_list
@@ -1841,6 +4468,9 @@ e_web_view_get_print_proxy
e_web_view_set_print_proxy
e_web_view_get_save_as_proxy
e_web_view_set_save_as_proxy
+e_web_view_get_highlights
+e_web_view_add_highlight
+e_web_view_clear_highlights
e_web_view_get_action
e_web_view_get_action_group
e_web_view_extract_uri
@@ -1861,6 +4491,11 @@ e_web_view_show_popup_menu
e_web_view_status_message
e_web_view_stop_loading
e_web_view_update_actions
+e_web_view_get_selection_html
+e_web_view_set_settings
+e_web_view_update_fonts
+e_web_view_get_default_settings
+e_web_view_install_request_handler
<SUBSECTION Standard>
E_WEB_VIEW
E_IS_WEB_VIEW
@@ -1875,6 +4510,107 @@ EWebViewPrivate
</SECTION>
<SECTION>
+<FILE>e-web-view-gtkhtml</FILE>
+<TITLE>EWebViewGtkHTML</TITLE>
+EWebViewGtkHTML
+e_web_view_gtkhtml_new
+e_web_view_gtkhtml_clear
+e_web_view_gtkhtml_load_string
+e_web_view_gtkhtml_get_animate
+e_web_view_gtkhtml_set_animate
+e_web_view_gtkhtml_get_caret_mode
+e_web_view_gtkhtml_set_caret_mode
+e_web_view_gtkhtml_get_copy_target_list
+e_web_view_gtkhtml_get_disable_printing
+e_web_view_gtkhtml_set_disable_printing
+e_web_view_gtkhtml_get_disable_save_to_disk
+e_web_view_gtkhtml_set_disable_save_to_disk
+e_web_view_gtkhtml_get_editable
+e_web_view_gtkhtml_set_editable
+e_web_view_gtkhtml_get_inline_spelling
+e_web_view_gtkhtml_set_inline_spelling
+e_web_view_gtkhtml_get_magic_links
+e_web_view_gtkhtml_set_magic_links
+e_web_view_gtkhtml_get_magic_smileys
+e_web_view_gtkhtml_set_magic_smileys
+e_web_view_gtkhtml_get_selected_uri
+e_web_view_gtkhtml_set_selected_uri
+e_web_view_gtkhtml_get_cursor_image
+e_web_view_gtkhtml_set_cursor_image
+e_web_view_gtkhtml_get_open_proxy
+e_web_view_gtkhtml_set_open_proxy
+e_web_view_gtkhtml_get_paste_target_list
+e_web_view_gtkhtml_get_print_proxy
+e_web_view_gtkhtml_set_print_proxy
+e_web_view_gtkhtml_get_save_as_proxy
+e_web_view_gtkhtml_set_save_as_proxy
+e_web_view_gtkhtml_get_action
+e_web_view_gtkhtml_get_action_group
+e_web_view_gtkhtml_extract_uri
+e_web_view_gtkhtml_copy_clipboard
+e_web_view_gtkhtml_cut_clipboard
+e_web_view_gtkhtml_is_selection_active
+e_web_view_gtkhtml_paste_clipboard
+e_web_view_gtkhtml_scroll_forward
+e_web_view_gtkhtml_scroll_backward
+e_web_view_gtkhtml_select_all
+e_web_view_gtkhtml_unselect_all
+e_web_view_gtkhtml_zoom_100
+e_web_view_gtkhtml_zoom_in
+e_web_view_gtkhtml_zoom_out
+e_web_view_gtkhtml_get_ui_manager
+e_web_view_gtkhtml_get_popup_menu
+e_web_view_gtkhtml_show_popup_menu
+e_web_view_gtkhtml_status_message
+e_web_view_gtkhtml_stop_loading
+e_web_view_gtkhtml_update_actions
+<SUBSECTION Standard>
+E_WEB_VIEW_GTKHTML
+E_IS_WEB_VIEW_GTKHTML
+E_TYPE_WEB_VIEW_GTKHTML
+E_WEB_VIEW_GTKHTML_CLASS
+E_IS_WEB_VIEW_GTKHTML_CLASS
+E_WEB_VIEW_GTKHTML_GET_CLASS
+EWebViewGtkHTMLClass
+e_web_view_gtkhtml_get_type
+<SUBSECTION Private>
+EWebViewGtkHTMLPrivate
+</SECTION>
+
+<SECTION>
+<FILE>e-web-view-preview</FILE>
+<TITLE>EWebViewPreview</TITLE>
+EWebViewPreview
+e_web_view_preview_new
+e_web_view_preview_get_tree_view
+e_web_view_preview_get_preview
+e_web_view_preview_set_preview
+e_web_view_preview_show_tree_view
+e_web_view_preview_hide_tree_view
+e_web_view_preview_get_escape_values
+e_web_view_preview_set_escape_values
+e_web_view_preview_begin_update
+e_web_view_preview_end_update
+e_web_view_preview_add_header
+e_web_view_preview_add_text
+e_web_view_preview_add_raw_html
+e_web_view_preview_add_separator
+e_web_view_preview_add_empty_line
+e_web_view_preview_add_section
+<SUBSECTION Standard>
+E_WEB_VIEW_PREVIEW
+E_IS_WEB_VIEW_PREVIEW
+E_TYPE_WEB_VIEW_PREVIEW
+E_WEB_VIEW_PREVIEW_CLASS
+E_IS_WEB_VIEW_PREVIEW_CLASS
+E_WEB_VIEW_PREVIEW_GET_CLASS
+EWebViewPreviewClass
+e_web_view_preview_get_type
+<SUBSECTION Private>
+EWebViewPreviewPrivate
+</SECTION>
+
+<SECTION>
<FILE>e-xml-utils</FILE>
<TITLE>Reading and Writing XML</TITLE>
e_xml_get_child_by_name_by_lang
@@ -1898,3 +4634,218 @@ e_xml_set_string_prop_by_name
e_xml_get_translated_string_prop_by_name
</SECTION>
+<SECTION>
+<FILE>gal-define-views-dialog</FILE>
+<TITLE>GalDefineViewsDialog</TITLE>
+GalDefineViewsDialog
+gal_define_views_dialog_new
+<SUBSECTION Standard>
+GAL_DEFINE_VIEWS_DIALOG
+GAL_IS_DEFINE_VIEWS_DIALOG
+GAL_TYPE_DEFINE_VIEWS_DIALOG
+GAL_DEFINE_VIEWS_DIALOG_CLASS
+GAL_IS_DEFINE_VIEWS_DIALOG_CLASS
+GAL_DEFINE_VIEWS_DIALOG_GET_CLASS
+GalDefineViewsDialogClass
+gal_define_views_dialog_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gal-define-views-model</FILE>
+<TITLE>GalDefineViewsModel</TITLE>
+GalDefineViewsModel
+gal_define_views_model_new
+gal_define_views_model_append
+gal_define_views_model_get_view
+gal_define_views_model_delete_view
+gal_define_views_model_copy_view
+<SUBSECTION Standard>
+GAL_DEFINE_VIEWS_MODEL
+GAL_IS_DEFINE_VIEWS_MODEL
+GAL_TYPE_DEFINE_VIEWS_MODEL
+GAL_DEFINE_VIEWS_MODEL_CLASS
+GAL_IS_DEFINE_VIEWS_MODEL_CLASS
+GAL_DEFINE_VIEWS_MODEL_GET_CLASS
+GalDefineViewsModelClass
+gal_define_views_model_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gal-view</FILE>
+<TITLE>GalView</TITLE>
+GalView
+gal_view_edit
+gal_view_load
+gal_view_save
+gal_view_get_title
+gal_view_set_title
+gal_view_get_type_code
+gal_view_clone
+gal_view_changed
+<SUBSECTION Standard>
+GAL_VIEW
+GAL_IS_VIEW
+GAL_TYPE_VIEW
+GAL_VIEW_CLASS
+GAL_IS_VIEW_CLASS
+GAL_VIEW_GET_CLASS
+GalViewClass
+gal_view_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gal-view-collection</FILE>
+<TITLE>GalViewCollection</TITLE>
+GalViewCollectionItem
+GalViewCollection
+gal_view_collection_new
+gal_view_collection_set_title
+gal_view_collection_set_storage_directories
+gal_view_collection_add_factory
+gal_view_collection_display_view
+gal_view_collection_get_count
+gal_view_collection_get_view
+gal_view_collection_get_view_item
+gal_view_collection_get_view_index_by_id
+gal_view_collection_get_view_id_by_index
+gal_view_collection_append
+gal_view_collection_delete_view
+gal_view_collection_copy_view
+gal_view_collection_load
+gal_view_collection_save
+gal_view_collection_loaded
+gal_view_collection_load_view_from_file
+gal_view_collection_append_with_title
+gal_view_collection_set_nth_view
+gal_view_collection_get_default_view
+gal_view_collection_set_default_view
+<SUBSECTION Standard>
+GAL_VIEW_COLLECTION
+GAL_IS_VIEW_COLLECTION
+GAL_TYPE_VIEW_COLLECTION
+GAL_VIEW_COLLECTION_CLASS
+GAL_IS_VIEW_COLLECTION_CLASS
+GAL_VIEW_COLLECTION_GET_CLASS
+GalViewCollectionClass
+gal_view_collection_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gal-view-etable</FILE>
+<TITLE>GalViewEtable</TITLE>
+GalViewEtable
+gal_view_etable_new
+gal_view_etable_construct
+gal_view_etable_set_state
+gal_view_etable_attach_table
+gal_view_etable_attach_tree
+gal_view_etable_detach
+<SUBSECTION Standard>
+GAL_VIEW_ETABLE
+GAL_IS_VIEW_ETABLE
+GAL_TYPE_VIEW_ETABLE
+GAL_VIEW_ETABLE_CLASS
+GAL_IS_VIEW_ETABLE_CLASS
+GAL_VIEW_ETABLE_GET_CLASS
+GalViewEtableClass
+gal_view_etable_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gal-view-factory</FILE>
+<TITLE>GalViewFactory</TITLE>
+GalViewFactory
+gal_view_factory_get_title
+gal_view_factory_get_type_code
+gal_view_factory_new_view
+<SUBSECTION Standard>
+GAL_VIEW_FACTORY
+GAL_IS_VIEW_FACTORY
+GAL_TYPE_VIEW_FACTORY
+GAL_VIEW_FACTORY_CLASS
+GAL_IS_VIEW_FACTORY_CLASS
+GAL_VIEW_FACTORY_GET_CLASS
+GalViewFactoryClass
+gal_view_factory_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gal-view-factory-etable</FILE>
+<TITLE>GalViewFactoryEtable</TITLE>
+GalViewFactoryEtable
+gal_view_factory_etable_new
+gal_view_factory_etable_get_specification
+<SUBSECTION Standard>
+GAL_VIEW_FACTORY_ETABLE
+GAL_IS_VIEW_FACTORY_ETABLE
+GAL_TYPE_VIEW_FACTORY_ETABLE
+GAL_VIEW_FACTORY_ETABLE_CLASS
+GAL_IS_VIEW_FACTORY_ETABLE_CLASS
+GAL_VIEW_FACTORY_ETABLE_GET_CLASS
+GalViewFactoryEtableClass
+gal_view_factory_etable_get_type
+<SUBSECTION Private>
+GalViewFactoryEtablePrivate
+</SECTION>
+
+<SECTION>
+<FILE>gal-view-instance</FILE>
+<TITLE>GalViewInstance</TITLE>
+GalViewInstance
+gal_view_instance_new
+gal_view_instance_construct
+gal_view_instance_get_current_view_id
+gal_view_instance_set_current_view_id
+gal_view_instance_get_current_view
+gal_view_instance_set_custom_view
+gal_view_instance_exists
+gal_view_instance_save_as
+gal_view_instance_load
+gal_view_instance_get_default_view
+gal_view_instance_set_default_view
+<SUBSECTION Standard>
+GAL_VIEW_INSTANCE
+GAL_IS_VIEW_INSTANCE
+GAL_TYPE_VIEW_INSTANCE
+GAL_VIEW_INSTANCE_CLASS
+GAL_IS_VIEW_INSTANCE_CLASS
+GAL_VIEW_INSTANCE_GET_CLASS
+GalViewInstanceClass
+gal_view_instance_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gal-view-instance-save-as-dialog</FILE>
+<TITLE>GalViewInstanceSaveAsDialog</TITLE>
+GalViewInstanceSaveAsDialogToggle
+GalViewInstanceSaveAsDialog
+gal_view_instance_save_as_dialog_new
+gal_view_instance_save_as_dialog_save
+<SUBSECTION Standard>
+GAL_VIEW_INSTANCE_SAVE_AS_DIALOG
+GAL_IS_VIEW_INSTANCE_SAVE_AS_DIALOG
+GAL_TYPE_VIEW_INSTANCE_SAVE_AS_DIALOG
+GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_CLASS
+GAL_IS_VIEW_INSTANCE_SAVE_AS_DIALOG_CLASS
+GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_GET_CLASS
+GalViewInstanceSaveAsDialogClass
+gal_view_instance_save_as_dialog_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gal-view-new-dialog</FILE>
+<TITLE>GalViewNewDialog</TITLE>
+GalViewNewDialog
+gal_view_new_dialog_new
+gal_view_new_dialog_construct
+<SUBSECTION Standard>
+GAL_VIEW_NEW_DIALOG
+GAL_IS_VIEW_NEW_DIALOG
+GAL_TYPE_VIEW_NEW_DIALOG
+GAL_VIEW_NEW_DIALOG_CLASS
+GAL_IS_VIEW_NEW_DIALOG_CLASS
+GAL_VIEW_NEW_DIALOG_GET_CLASS
+GalViewNewDialogClass
+gal_view_new_dialog_get_type
+</SECTION>
+
diff --git a/doc/reference/libeutil/libeutil.types b/doc/reference/libeutil/libeutil.types
index b78b7ad..83e2108 100644
--- a/doc/reference/libeutil/libeutil.types
+++ b/doc/reference/libeutil/libeutil.types
@@ -22,6 +22,7 @@ e_attachment_store_get_type
e_attachment_tree_view_get_type
e_attachment_view_get_type
e_auth_combo_box_get_type
+e_autocomplete_selector_get_type
e_bit_array_get_type
e_book_source_config_get_type
e_cal_source_config_get_type
diff --git a/e-util/e-action-combo-box.c b/e-util/e-action-combo-box.c
index 0747a6e..cb15d27 100644
--- a/e-util/e-action-combo-box.c
+++ b/e-util/e-action-combo-box.c
@@ -458,7 +458,7 @@ e_action_combo_box_new_with_action (GtkRadioAction *action)
GtkRadioAction *
e_action_combo_box_get_action (EActionComboBox *combo_box)
{
- g_return_val_if_fail (E_ACTION_IS_COMBO_BOX (combo_box), NULL);
+ g_return_val_if_fail (E_IS_ACTION_COMBO_BOX (combo_box), NULL);
return combo_box->priv->action;
}
@@ -467,7 +467,7 @@ void
e_action_combo_box_set_action (EActionComboBox *combo_box,
GtkRadioAction *action)
{
- g_return_if_fail (E_ACTION_IS_COMBO_BOX (combo_box));
+ g_return_if_fail (E_IS_ACTION_COMBO_BOX (combo_box));
if (action != NULL)
g_return_if_fail (GTK_IS_RADIO_ACTION (action));
@@ -526,7 +526,7 @@ e_action_combo_box_set_action (EActionComboBox *combo_box,
gint
e_action_combo_box_get_current_value (EActionComboBox *combo_box)
{
- g_return_val_if_fail (E_ACTION_IS_COMBO_BOX (combo_box), 0);
+ g_return_val_if_fail (E_IS_ACTION_COMBO_BOX (combo_box), 0);
g_return_val_if_fail (combo_box->priv->action != NULL, 0);
return gtk_radio_action_get_current_value (combo_box->priv->action);
@@ -536,7 +536,7 @@ void
e_action_combo_box_set_current_value (EActionComboBox *combo_box,
gint current_value)
{
- g_return_if_fail (E_ACTION_IS_COMBO_BOX (combo_box));
+ g_return_if_fail (E_IS_ACTION_COMBO_BOX (combo_box));
g_return_if_fail (combo_box->priv->action != NULL);
gtk_radio_action_set_current_value (
@@ -550,7 +550,7 @@ e_action_combo_box_add_separator_before (EActionComboBox *combo_box,
GtkTreeModel *model;
GtkTreeIter iter;
- g_return_if_fail (E_ACTION_IS_COMBO_BOX (combo_box));
+ g_return_if_fail (E_IS_ACTION_COMBO_BOX (combo_box));
/* NULL actions are rendered as separators. */
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
@@ -567,7 +567,7 @@ e_action_combo_box_add_separator_after (EActionComboBox *combo_box,
GtkTreeModel *model;
GtkTreeIter iter;
- g_return_if_fail (E_ACTION_IS_COMBO_BOX (combo_box));
+ g_return_if_fail (E_IS_ACTION_COMBO_BOX (combo_box));
/* NULL actions are rendered as separators. */
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
diff --git a/e-util/e-action-combo-box.h b/e-util/e-action-combo-box.h
index 43adeaf..49245b9 100644
--- a/e-util/e-action-combo-box.h
+++ b/e-util/e-action-combo-box.h
@@ -40,10 +40,10 @@
#define E_ACTION_COMBO_BOX_CLASS(cls) \
(G_TYPE_CHECK_CLASS_CAST \
((cls), E_TYPE_ACTION_COMBO_BOX, EActionComboBoxClass))
-#define E_ACTION_IS_COMBO_BOX(obj) \
+#define E_IS_ACTION_COMBO_BOX(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE \
((obj), E_TYPE_ACTION_COMBO_BOX))
-#define E_ACTION_IS_COMBO_BOX_CLASS(cls) \
+#define E_IS_ACTION_COMBO_BOX_CLASS(cls) \
(G_TYPE_CHECK_CLASS_TYPE \
((cls), E_TYPE_ACTION_COMBO_BOX))
#define E_ACTION_COMBO_BOX_GET_CLASS(obj) \
@@ -65,7 +65,7 @@ struct _EActionComboBoxClass {
GtkComboBoxClass parent_class;
};
-GType e_action_combo_box_get_type (void);
+GType e_action_combo_box_get_type (void) G_GNUC_CONST;
GtkWidget * e_action_combo_box_new (void);
GtkWidget * e_action_combo_box_new_with_action
(GtkRadioAction *action);
diff --git a/e-util/e-activity-bar.h b/e-util/e-activity-bar.h
index d56378e..5588b5f 100644
--- a/e-util/e-activity-bar.h
+++ b/e-util/e-activity-bar.h
@@ -60,7 +60,7 @@ struct _EActivityBarClass {
GtkInfoBarClass parent_class;
};
-GType e_activity_bar_get_type (void);
+GType e_activity_bar_get_type (void) G_GNUC_CONST;
GtkWidget * e_activity_bar_new (void);
EActivity * e_activity_bar_get_activity (EActivityBar *bar);
void e_activity_bar_set_activity (EActivityBar *bar,
diff --git a/e-util/e-activity-proxy.h b/e-util/e-activity-proxy.h
index 7512535..df1c26c 100644
--- a/e-util/e-activity-proxy.h
+++ b/e-util/e-activity-proxy.h
@@ -63,7 +63,7 @@ struct _EActivityProxyClass {
GtkFrameClass parent_class;
};
-GType e_activity_proxy_get_type (void);
+GType e_activity_proxy_get_type (void) G_GNUC_CONST;
GtkWidget * e_activity_proxy_new (EActivity *activity);
EActivity * e_activity_proxy_get_activity (EActivityProxy *proxy);
void e_activity_proxy_set_activity (EActivityProxy *proxy,
diff --git a/e-util/e-activity.h b/e-util/e-activity.h
index ac380a0..0ba5753 100644
--- a/e-util/e-activity.h
+++ b/e-util/e-activity.h
@@ -68,7 +68,7 @@ struct _EActivityClass {
gchar * (*describe) (EActivity *activity);
};
-GType e_activity_get_type (void);
+GType e_activity_get_type (void) G_GNUC_CONST;
EActivity * e_activity_new (void);
gchar * e_activity_describe (EActivity *activity);
EAlertSink * e_activity_get_alert_sink (EActivity *activity);
diff --git a/e-util/e-alert-bar.h b/e-util/e-alert-bar.h
index ae5b315..d565f1b 100644
--- a/e-util/e-alert-bar.h
+++ b/e-util/e-alert-bar.h
@@ -61,7 +61,7 @@ struct _EAlertBarClass {
GtkInfoBarClass parent_class;
};
-GType e_alert_bar_get_type (void);
+GType e_alert_bar_get_type (void) G_GNUC_CONST;
GtkWidget * e_alert_bar_new (void);
void e_alert_bar_clear (EAlertBar *alert_bar);
void e_alert_bar_add_alert (EAlertBar *alert_bar,
diff --git a/e-util/e-alert-dialog.h b/e-util/e-alert-dialog.h
index 3d2662a..6240f68 100644
--- a/e-util/e-alert-dialog.h
+++ b/e-util/e-alert-dialog.h
@@ -62,7 +62,7 @@ struct _EAlertDialogClass {
GtkDialogClass parent_class;
};
-GType e_alert_dialog_get_type (void);
+GType e_alert_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * e_alert_dialog_new (GtkWindow *parent,
EAlert *alert);
GtkWidget * e_alert_dialog_new_for_args (GtkWindow *parent,
diff --git a/e-util/e-alert-sink.h b/e-util/e-alert-sink.h
index c8fd512..06a2e68 100644
--- a/e-util/e-alert-sink.h
+++ b/e-util/e-alert-sink.h
@@ -54,7 +54,7 @@ struct _EAlertSinkInterface {
EAlert *alert);
};
-GType e_alert_sink_get_type (void);
+GType e_alert_sink_get_type (void) G_GNUC_CONST;
void e_alert_sink_submit_alert (EAlertSink *alert_sink,
EAlert *alert);
diff --git a/e-util/e-alert.h b/e-util/e-alert.h
index f62e612..4cba321 100644
--- a/e-util/e-alert.h
+++ b/e-util/e-alert.h
@@ -76,7 +76,7 @@ struct _EAlertClass {
gint response_id);
};
-GType e_alert_get_type (void);
+GType e_alert_get_type (void) G_GNUC_CONST;
EAlert * e_alert_new (const gchar *tag,
...) G_GNUC_NULL_TERMINATED;
EAlert * e_alert_new_valist (const gchar *tag,
diff --git a/e-util/e-attachment-bar.h b/e-util/e-attachment-bar.h
index 9f35ae2..4442164 100644
--- a/e-util/e-attachment-bar.h
+++ b/e-util/e-attachment-bar.h
@@ -63,7 +63,7 @@ struct _EAttachmentBarClass {
GtkBoxClass parent_class;
};
-GType e_attachment_bar_get_type (void);
+GType e_attachment_bar_get_type (void) G_GNUC_CONST;
GtkWidget * e_attachment_bar_new (EAttachmentStore *store);
gint e_attachment_bar_get_active_view
(EAttachmentBar *bar);
diff --git a/e-util/e-attachment-button.h b/e-util/e-attachment-button.h
index abe5fa4..6873bc4 100644
--- a/e-util/e-attachment-button.h
+++ b/e-util/e-attachment-button.h
@@ -64,7 +64,7 @@ struct _EAttachmentButtonClass {
GtkBoxClass parent_class;
};
-GType e_attachment_button_get_type (void);
+GType e_attachment_button_get_type (void) G_GNUC_CONST;
GtkWidget * e_attachment_button_new (void);
EAttachmentView *
e_attachment_button_get_view (EAttachmentButton *button);
diff --git a/e-util/e-attachment-dialog.h b/e-util/e-attachment-dialog.h
index af71411..c77023d 100644
--- a/e-util/e-attachment-dialog.h
+++ b/e-util/e-attachment-dialog.h
@@ -63,7 +63,7 @@ struct _EAttachmentDialogClass {
GtkDialogClass parent_class;
};
-GType e_attachment_dialog_get_type (void);
+GType e_attachment_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * e_attachment_dialog_new (GtkWindow *parent,
EAttachment *attachment);
EAttachment * e_attachment_dialog_get_attachment
diff --git a/e-util/e-attachment-handler-image.h b/e-util/e-attachment-handler-image.h
index e0e0cb3..8d21c8d 100644
--- a/e-util/e-attachment-handler-image.h
+++ b/e-util/e-attachment-handler-image.h
@@ -62,7 +62,7 @@ struct _EAttachmentHandlerImageClass {
EAttachmentHandlerClass parent_class;
};
-GType e_attachment_handler_image_get_type (void);
+GType e_attachment_handler_image_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/e-util/e-attachment-handler-sendto.h b/e-util/e-attachment-handler-sendto.h
index 17115c4..ea0fc02 100644
--- a/e-util/e-attachment-handler-sendto.h
+++ b/e-util/e-attachment-handler-sendto.h
@@ -59,7 +59,7 @@ struct _EAttachmentHandlerSendtoClass {
EAttachmentHandlerClass parent_class;
};
-GType e_attachment_handler_sendto_get_type (void);
+GType e_attachment_handler_sendto_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/e-util/e-attachment-handler.h b/e-util/e-attachment-handler.h
index 086ba8f..b947ad6 100644
--- a/e-util/e-attachment-handler.h
+++ b/e-util/e-attachment-handler.h
@@ -69,7 +69,7 @@ struct _EAttachmentHandlerClass {
guint *n_targets);
};
-GType e_attachment_handler_get_type (void);
+GType e_attachment_handler_get_type (void) G_GNUC_CONST;
EAttachmentView *
e_attachment_handler_get_view (EAttachmentHandler *handler);
GdkDragAction e_attachment_handler_get_drag_actions
diff --git a/e-util/e-attachment-icon-view.h b/e-util/e-attachment-icon-view.h
index bd3d210..23b9dc0 100644
--- a/e-util/e-attachment-icon-view.h
+++ b/e-util/e-attachment-icon-view.h
@@ -62,7 +62,7 @@ struct _EAttachmentIconViewClass {
GtkIconViewClass parent_class;
};
-GType e_attachment_icon_view_get_type (void);
+GType e_attachment_icon_view_get_type (void) G_GNUC_CONST;
GtkWidget * e_attachment_icon_view_new (void);
void e_attachment_icon_view_set_default_icon_size
(gint size);
diff --git a/e-util/e-attachment-paned.h b/e-util/e-attachment-paned.h
index af44cd6..64a8696 100644
--- a/e-util/e-attachment-paned.h
+++ b/e-util/e-attachment-paned.h
@@ -62,7 +62,7 @@ struct _EAttachmentPanedClass {
GtkVPanedClass parent_class;
};
-GType e_attachment_paned_get_type (void);
+GType e_attachment_paned_get_type (void) G_GNUC_CONST;
GtkWidget * e_attachment_paned_new (void);
GtkWidget * e_attachment_paned_get_content_area
(EAttachmentPaned *paned);
diff --git a/e-util/e-attachment-store.h b/e-util/e-attachment-store.h
index a112b0e..fe0cb8f 100644
--- a/e-util/e-attachment-store.h
+++ b/e-util/e-attachment-store.h
@@ -76,7 +76,7 @@ enum {
E_ATTACHMENT_STORE_NUM_COLUMNS
};
-GType e_attachment_store_get_type (void);
+GType e_attachment_store_get_type (void) G_GNUC_CONST;
GtkTreeModel * e_attachment_store_new (void);
void e_attachment_store_add_attachment
(EAttachmentStore *store,
diff --git a/e-util/e-attachment-tree-view.h b/e-util/e-attachment-tree-view.h
index 416a09b..41422c5 100644
--- a/e-util/e-attachment-tree-view.h
+++ b/e-util/e-attachment-tree-view.h
@@ -62,7 +62,7 @@ struct _EAttachmentTreeViewClass {
GtkTreeViewClass parent_class;
};
-GType e_attachment_tree_view_get_type (void);
+GType e_attachment_tree_view_get_type (void) G_GNUC_CONST;
GtkWidget * e_attachment_tree_view_new (void);
G_END_DECLS
diff --git a/e-util/e-attachment-view.h b/e-util/e-attachment-view.h
index 1741815..145b115 100644
--- a/e-util/e-attachment-view.h
+++ b/e-util/e-attachment-view.h
@@ -114,7 +114,7 @@ struct _EAttachmentViewPrivate {
guint editable : 1;
};
-GType e_attachment_view_get_type (void);
+GType e_attachment_view_get_type (void) G_GNUC_CONST;
void e_attachment_view_init (EAttachmentView *view);
void e_attachment_view_dispose (EAttachmentView *view);
diff --git a/e-util/e-attachment.h b/e-util/e-attachment.h
index 268bcf6..0da2c9d 100644
--- a/e-util/e-attachment.h
+++ b/e-util/e-attachment.h
@@ -63,7 +63,7 @@ struct _EAttachmentClass {
GObjectClass parent_class;
};
-GType e_attachment_get_type (void);
+GType e_attachment_get_type (void) G_GNUC_CONST;
EAttachment * e_attachment_new (void);
EAttachment * e_attachment_new_for_path (const gchar *path);
EAttachment * e_attachment_new_for_uri (const gchar *uri);
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index b17f8a0..045f8e2 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -412,7 +412,7 @@ e_bit_array_class_init (EBitArrayClass *class)
EBitArray *
e_bit_array_new (gint count)
{
- EBitArray *eba = g_object_new (E_BIT_ARRAY_TYPE, NULL);
+ EBitArray *eba = g_object_new (E_TYPE_BIT_ARRAY, NULL);
eba->bit_count = count;
eba->data = g_new0 (guint32, (eba->bit_count + 31) / 32);
return eba;
diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h
index 39b55d9..93fb17e 100644
--- a/e-util/e-bit-array.h
+++ b/e-util/e-bit-array.h
@@ -25,73 +25,83 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _E_BIT_ARRAY_H_
-#define _E_BIT_ARRAY_H_
+#ifndef E_BIT_ARRAY_H
+#define E_BIT_ARRAY_H
-#include <glib-object.h>
+#include <e-util/e-misc-utils.h>
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_BIT_ARRAY \
+ (e_bit_array_get_type ())
+#define E_BIT_ARRAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_BIT_ARRAY, EBitArray))
+#define E_BIT_ARRAY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_BIT_ARRAY, EBitArrayClass))
+#define E_IS_BIT_ARRAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_BIT_ARRAY))
+#define E_IS_BIT_ARRAY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_BIT_ARRAY))
+#define E_BIT_ARRAY_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_BIT_ARRAY, EBitArrayClass))
-#define E_BIT_ARRAY_TYPE (e_bit_array_get_type ())
-#define E_BIT_ARRAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_BIT_ARRAY_TYPE, EBitArray))
-#define E_BIT_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_BIT_ARRAY_TYPE, EBitArrayClass))
-#define E_IS_BIT_ARRAY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_BIT_ARRAY_TYPE))
-#define E_IS_BIT_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_BIT_ARRAY_TYPE))
+G_BEGIN_DECLS
-#ifndef _E_FOREACH_FUNC_H_
-#define _E_FOREACH_FUNC_H_
-typedef void (*EForeachFunc) (gint model_row,
- gpointer closure);
-#endif
+typedef struct _EBitArray EBitArray;
+typedef struct _EBitArrayClass EBitArrayClass;
-typedef struct {
- GObject base;
+struct _EBitArray {
+ GObject parent;
gint bit_count;
- guint32 *data;
-} EBitArray;
+ guint32 *data;
+};
-typedef struct {
+struct _EBitArrayClass {
GObjectClass parent_class;
-} EBitArrayClass;
+};
-GType e_bit_array_get_type (void);
-EBitArray *e_bit_array_new (gint count);
+GType e_bit_array_get_type (void) G_GNUC_CONST;
+EBitArray * e_bit_array_new (gint count);
-gboolean e_bit_array_value_at (EBitArray *selection,
- gint n);
-void e_bit_array_foreach (EBitArray *selection,
- EForeachFunc callback,
- gpointer closure);
-gint e_bit_array_selected_count (EBitArray *selection);
-void e_bit_array_select_all (EBitArray *selection);
-void e_bit_array_invert_selection (EBitArray *selection);
-gint e_bit_array_bit_count (EBitArray *selection);
-void e_bit_array_change_one_row (EBitArray *selection,
- gint row,
- gboolean grow);
-void e_bit_array_change_range (EBitArray *selection,
- gint start,
- gint end,
- gboolean grow);
-void e_bit_array_select_single_row (EBitArray *eba,
- gint row);
-void e_bit_array_toggle_single_row (EBitArray *eba,
- gint row);
+gboolean e_bit_array_value_at (EBitArray *selection,
+ gint n);
+void e_bit_array_foreach (EBitArray *selection,
+ EForeachFunc callback,
+ gpointer closure);
+gint e_bit_array_selected_count (EBitArray *selection);
+void e_bit_array_select_all (EBitArray *selection);
+void e_bit_array_invert_selection (EBitArray *selection);
+gint e_bit_array_bit_count (EBitArray *selection);
+void e_bit_array_change_one_row (EBitArray *selection,
+ gint row,
+ gboolean grow);
+void e_bit_array_change_range (EBitArray *selection,
+ gint start,
+ gint end,
+ gboolean grow);
+void e_bit_array_select_single_row (EBitArray *eba,
+ gint row);
+void e_bit_array_toggle_single_row (EBitArray *eba,
+ gint row);
-void e_bit_array_insert (EBitArray *esm,
- gint row,
- gint count);
-void e_bit_array_delete (EBitArray *esm,
- gint row,
- gint count);
-void e_bit_array_delete_single_mode (EBitArray *esm,
- gint row,
- gint count);
-void e_bit_array_move_row (EBitArray *esm,
- gint old_row,
- gint new_row);
+void e_bit_array_insert (EBitArray *esm,
+ gint row,
+ gint count);
+void e_bit_array_delete (EBitArray *esm,
+ gint row,
+ gint count);
+void e_bit_array_delete_single_mode (EBitArray *esm,
+ gint row,
+ gint count);
+void e_bit_array_move_row (EBitArray *esm,
+ gint old_row,
+ gint new_row);
G_END_DECLS
-#endif /* _E_BIT_ARRAY_H_ */
+#endif /* E_BIT_ARRAY_H */
diff --git a/e-util/e-calendar-item.h b/e-util/e-calendar-item.h
index a4c0867..9a3828f 100644
--- a/e-util/e-calendar-item.h
+++ b/e-util/e-calendar-item.h
@@ -281,7 +281,7 @@ struct _ECalendarItemClass {
void (* selection_preview_changed) (ECalendarItem *calitem);
};
-GType e_calendar_item_get_type (void);
+GType e_calendar_item_get_type (void) G_GNUC_CONST;
/* FIXME: months are 0-11 throughout, but 1-12 may be better. */
diff --git a/e-util/e-calendar.h b/e-util/e-calendar.h
index 9a36513..0ffe909 100644
--- a/e-util/e-calendar.h
+++ b/e-util/e-calendar.h
@@ -91,7 +91,7 @@ struct _ECalendarClass {
ECanvasClass parent_class;
};
-GType e_calendar_get_type (void);
+GType e_calendar_get_type (void) G_GNUC_CONST;
GtkWidget * e_calendar_new (void);
void e_calendar_set_minimum_size (ECalendar *cal,
gint rows,
diff --git a/e-util/e-canvas.h b/e-util/e-canvas.h
index 8d704b9..00618b2 100644
--- a/e-util/e-canvas.h
+++ b/e-util/e-canvas.h
@@ -111,7 +111,7 @@ struct _ECanvasClass {
void (*reflow) (ECanvas *canvas);
};
-GType e_canvas_get_type (void);
+GType e_canvas_get_type (void) G_GNUC_CONST;
GtkWidget * e_canvas_new (void);
/* Used to send all of the keystroke events to a specific item as well as
diff --git a/e-util/e-categories-dialog.h b/e-util/e-categories-dialog.h
index 5ad35e0..0e5d109 100644
--- a/e-util/e-categories-dialog.h
+++ b/e-util/e-categories-dialog.h
@@ -60,7 +60,7 @@ struct _ECategoriesDialogClass {
GtkDialogClass parent_class;
};
-GType e_categories_dialog_get_type (void);
+GType e_categories_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * e_categories_dialog_new (const gchar *categories);
gchar * e_categories_dialog_get_categories
(ECategoriesDialog *dialog);
diff --git a/e-util/e-categories-editor.h b/e-util/e-categories-editor.h
index 07c9dc6..fc193b1 100644
--- a/e-util/e-categories-editor.h
+++ b/e-util/e-categories-editor.h
@@ -70,7 +70,7 @@ struct _ECategoriesEditorClass {
void (*entry_changed) (GtkEntry *entry);
};
-GType e_categories_editor_get_type (void);
+GType e_categories_editor_get_type (void) G_GNUC_CONST;
GtkWidget * e_categories_editor_new (void);
gchar * e_categories_editor_get_categories
(ECategoriesEditor *editor);
diff --git a/e-util/e-categories-selector.h b/e-util/e-categories-selector.h
index 6ffc9f8..4eb3347 100644
--- a/e-util/e-categories-selector.h
+++ b/e-util/e-categories-selector.h
@@ -75,7 +75,7 @@ struct _ECategoriesSelectorClass {
GtkTreeSelection *selection);
};
-GType e_categories_selector_get_type (void);
+GType e_categories_selector_get_type (void) G_GNUC_CONST;
GtkWidget * e_categories_selector_new (void);
gchar * e_categories_selector_get_checked
(ECategoriesSelector *selector);
diff --git a/e-util/e-category-completion.h b/e-util/e-category-completion.h
index 477a036..cb3c049 100644
--- a/e-util/e-category-completion.h
+++ b/e-util/e-category-completion.h
@@ -63,7 +63,7 @@ struct _ECategoryCompletionClass {
GtkEntryCompletionClass parent_class;
};
-GType e_category_completion_get_type (void);
+GType e_category_completion_get_type (void) G_GNUC_CONST;
GtkEntryCompletion *
e_category_completion_new (void);
diff --git a/e-util/e-category-editor.h b/e-util/e-category-editor.h
index bf5ebbe..e50cf69 100644
--- a/e-util/e-category-editor.h
+++ b/e-util/e-category-editor.h
@@ -68,7 +68,7 @@ struct _ECategoryEditorClass {
GtkDialogClass parent_class;
};
-GType e_category_editor_get_type (void);
+GType e_category_editor_get_type (void) G_GNUC_CONST;
ECategoryEditor *
e_category_editor_new (void);
const gchar * e_category_editor_create_category
diff --git a/e-util/e-cell-renderer-color.h b/e-util/e-cell-renderer-color.h
index 00dd615..679c456 100644
--- a/e-util/e-cell-renderer-color.h
+++ b/e-util/e-cell-renderer-color.h
@@ -71,7 +71,7 @@ struct _ECellRendererColorClass {
void (*_gtk_reserved4) (void);
};
-GType e_cell_renderer_color_get_type (void);
+GType e_cell_renderer_color_get_type (void) G_GNUC_CONST;
GtkCellRenderer *e_cell_renderer_color_new (void);
G_END_DECLS
diff --git a/e-util/e-cell.h b/e-util/e-cell.h
index 4c13542..390d4b0 100644
--- a/e-util/e-cell.h
+++ b/e-util/e-cell.h
@@ -101,8 +101,6 @@ struct _ECellView {
GList *kill_view_cb_data;
};
-#define E_CELL_IS_FOCUSED(ecell_view) (ecell_view->focus_x1 != -1)
-
struct _ECell {
GObject parent;
};
diff --git a/e-util/e-charset-combo-box.h b/e-util/e-charset-combo-box.h
index 54c5527..a1e8cec 100644
--- a/e-util/e-charset-combo-box.h
+++ b/e-util/e-charset-combo-box.h
@@ -62,7 +62,7 @@ struct _ECharsetComboBoxClass {
EActionComboBoxClass parent_class;
};
-GType e_charset_combo_box_get_type (void);
+GType e_charset_combo_box_get_type (void) G_GNUC_CONST;
GtkWidget * e_charset_combo_box_new (void);
const gchar * e_charset_combo_box_get_charset (ECharsetComboBox *combo_box);
void e_charset_combo_box_set_charset (ECharsetComboBox *combo_box,
diff --git a/e-util/e-config.h b/e-util/e-config.h
index a372601..a6c52bd 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -262,7 +262,7 @@ struct _EConfigClass {
void (*commit) (EConfig *config);
};
-GType e_config_get_type (void);
+GType e_config_get_type (void) G_GNUC_CONST;
/* Static class methods */
EConfigFactory *e_config_class_add_factory (EConfigClass *klass,
diff --git a/e-util/e-contact-store.h b/e-util/e-contact-store.h
index c0754af..de86c5f 100644
--- a/e-util/e-contact-store.h
+++ b/e-util/e-contact-store.h
@@ -64,11 +64,13 @@ struct _EContactStoreClass {
GObjectClass parent_class;
/* signals */
- void (*start_client_view) (EContactStore *contact_store, EBookClientView *client_view);
- void (*stop_client_view) (EContactStore *contact_store, EBookClientView *client_view);
+ void (*start_client_view) (EContactStore *contact_store,
+ EBookClientView *client_view);
+ void (*stop_client_view) (EContactStore *contact_store,
+ EBookClientView *client_view);
};
-GType e_contact_store_get_type (void);
+GType e_contact_store_get_type (void) G_GNUC_CONST;
EContactStore * e_contact_store_new (void);
EBookClient * e_contact_store_get_client (EContactStore *contact_store,
diff --git a/e-util/e-dateedit.h b/e-util/e-dateedit.h
index b415847..5557bb1 100644
--- a/e-util/e-dateedit.h
+++ b/e-util/e-dateedit.h
@@ -91,7 +91,7 @@ struct _EDateEditClass {
void (*changed) (EDateEdit *dedit);
};
-GType e_date_edit_get_type (void);
+GType e_date_edit_get_type (void) G_GNUC_CONST;
GtkWidget * e_date_edit_new (void);
/* Analogous to gtk_editable_set_editable. disable editing, while still
diff --git a/e-util/e-datetime-format.h b/e-util/e-datetime-format.h
index 5974349..90e3aaa 100644
--- a/e-util/e-datetime-format.h
+++ b/e-util/e-datetime-format.h
@@ -24,27 +24,41 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef __E_DATETIME_FORMAT__
-#define __E_DATETIME_FORMAT__
+#ifndef E_DATETIME_FORMAT_H
+#define E_DATETIME_FORMAT_H
#include <time.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
-typedef enum _DTFormatKind {
+typedef enum {
DTFormatKindDate,
DTFormatKindTime,
DTFormatKindDateTime,
DTFormatKindShortDate
} DTFormatKind;
-void e_datetime_format_add_setup_widget (GtkWidget *table, gint row, const gchar *component, const gchar *part, DTFormatKind kind, const gchar *caption);
-
-gchar *e_datetime_format_format (const gchar *component, const gchar *part, DTFormatKind kind, time_t value);
-gchar *e_datetime_format_format_tm (const gchar *component, const gchar *part, DTFormatKind kind, struct tm *tm_time);
-gboolean e_datetime_format_includes_day_name (const gchar *component, const gchar *part, DTFormatKind kind);
+void e_datetime_format_add_setup_widget
+ (GtkWidget *table,
+ gint row,
+ const gchar *component,
+ const gchar *part,
+ DTFormatKind kind,
+ const gchar *caption);
+gchar * e_datetime_format_format (const gchar *component,
+ const gchar *part,
+ DTFormatKind kind,
+ time_t value);
+gchar * e_datetime_format_format_tm (const gchar *component,
+ const gchar *part,
+ DTFormatKind kind,
+ struct tm *tm_time);
+gboolean e_datetime_format_includes_day_name
+ (const gchar *component,
+ const gchar *part,
+ DTFormatKind kind);
G_END_DECLS
-#endif
+#endif /* E_DATETIME_FORMAT_H */
diff --git a/e-util/e-destination-store.h b/e-util/e-destination-store.h
index 630db11..1039728 100644
--- a/e-util/e-destination-store.h
+++ b/e-util/e-destination-store.h
@@ -71,7 +71,7 @@ typedef enum {
E_DESTINATION_STORE_NUM_COLUMNS
} EDestinationStoreColumnType;
-GType e_destination_store_get_type (void);
+GType e_destination_store_get_type (void) G_GNUC_CONST;
EDestinationStore *
e_destination_store_new (void);
EDestination * e_destination_store_get_destination
diff --git a/e-util/e-event.h b/e-util/e-event.h
index 28caded..65f3b9b 100644
--- a/e-util/e-event.h
+++ b/e-util/e-event.h
@@ -173,7 +173,7 @@ struct _EEventClass {
EEventTarget *target);
};
-GType e_event_get_type (void);
+GType e_event_get_type (void) G_GNUC_CONST;
EEvent * e_event_construct (EEvent *event,
const gchar *id);
gpointer e_event_add_items (EEvent *event,
@@ -270,7 +270,7 @@ struct _EEventHookClass {
EEvent *event;
};
-GType e_event_hook_get_type (void);
+GType e_event_hook_get_type (void) G_GNUC_CONST;
void e_event_hook_class_add_target_map
(EEventHookClass *klass,
const EEventHookTargetMap *map);
diff --git a/e-util/e-filter-code.h b/e-util/e-filter-code.h
index 45e1922..ff5be2a 100644
--- a/e-util/e-filter-code.h
+++ b/e-util/e-filter-code.h
@@ -64,7 +64,7 @@ struct _EFilterCodeClass {
EFilterInputClass parent_class;
};
-GType e_filter_code_get_type (void);
+GType e_filter_code_get_type (void) G_GNUC_CONST;
EFilterCode * e_filter_code_new (gboolean raw_code);
G_END_DECLS
diff --git a/e-util/e-filter-color.h b/e-util/e-filter-color.h
index acecf7d..7d3b583 100644
--- a/e-util/e-filter-color.h
+++ b/e-util/e-filter-color.h
@@ -66,7 +66,7 @@ struct _EFilterColorClass {
EFilterElementClass parent_class;
};
-GType e_filter_color_get_type (void);
+GType e_filter_color_get_type (void) G_GNUC_CONST;
EFilterColor * e_filter_color_new (void);
G_END_DECLS
diff --git a/e-util/e-filter-datespec.h b/e-util/e-filter-datespec.h
index ecc15bf..be21e82 100644
--- a/e-util/e-filter-datespec.h
+++ b/e-util/e-filter-datespec.h
@@ -82,7 +82,7 @@ struct _EFilterDatespecClass {
EFilterElementClass parent_class;
};
-GType e_filter_datespec_get_type (void);
+GType e_filter_datespec_get_type (void) G_GNUC_CONST;
EFilterDatespec *
e_filter_datespec_new (void);
diff --git a/e-util/e-filter-element.c b/e-util/e-filter-element.c
index e00651e..50948c8 100644
--- a/e-util/e-filter-element.c
+++ b/e-util/e-filter-element.c
@@ -31,6 +31,8 @@
#include "e-filter-element.h"
#include "e-filter-part.h"
+typedef EFilterElement * (*EFilterElementFunc) (gpointer data);
+
struct _element_type {
gchar *name;
diff --git a/e-util/e-filter-element.h b/e-util/e-filter-element.h
index ecec9db..15049c4 100644
--- a/e-util/e-filter-element.h
+++ b/e-util/e-filter-element.h
@@ -61,8 +61,6 @@ typedef struct _EFilterElement EFilterElement;
typedef struct _EFilterElementClass EFilterElementClass;
typedef struct _EFilterElementPrivate EFilterElementPrivate;
-typedef EFilterElement * (*EFilterElementFunc) (gpointer data);
-
struct _EFilterElement {
GObject parent;
EFilterElementPrivate *priv;
@@ -97,7 +95,7 @@ struct _EFilterElementClass {
GString *out);
};
-GType e_filter_element_get_type (void);
+GType e_filter_element_get_type (void) G_GNUC_CONST;
EFilterElement *e_filter_element_new (void);
void e_filter_element_set_data (EFilterElement *element,
gpointer data);
diff --git a/e-util/e-filter-file.h b/e-util/e-filter-file.h
index c78062b..c0d42fb 100644
--- a/e-util/e-filter-file.h
+++ b/e-util/e-filter-file.h
@@ -67,7 +67,7 @@ struct _EFilterFileClass {
EFilterElementClass parent_class;
};
-GType e_filter_file_get_type (void);
+GType e_filter_file_get_type (void) G_GNUC_CONST;
EFilterFile * e_filter_file_new (void);
EFilterFile * e_filter_file_new_type_name (const gchar *type);
void e_filter_file_set_path (EFilterFile *file,
diff --git a/e-util/e-filter-input.h b/e-util/e-filter-input.h
index 782be40..04c3749 100644
--- a/e-util/e-filter-input.h
+++ b/e-util/e-filter-input.h
@@ -67,7 +67,7 @@ struct _EFilterInputClass {
EFilterElementClass parent_class;
};
-GType e_filter_input_get_type (void);
+GType e_filter_input_get_type (void) G_GNUC_CONST;
EFilterInput * e_filter_input_new (void);
EFilterInput * e_filter_input_new_type_name (const gchar *type);
void e_filter_input_set_value (EFilterInput *input,
diff --git a/e-util/e-filter-int.h b/e-util/e-filter-int.h
index 40b0c9e..42d5eb6 100644
--- a/e-util/e-filter-int.h
+++ b/e-util/e-filter-int.h
@@ -68,7 +68,7 @@ struct _EFilterIntClass {
EFilterElementClass parent_class;
};
-GType e_filter_int_get_type (void);
+GType e_filter_int_get_type (void) G_GNUC_CONST;
EFilterElement *e_filter_int_new (void);
EFilterElement *e_filter_int_new_type (const gchar *type,
gint min,
diff --git a/e-util/e-filter-option.h b/e-util/e-filter-option.h
index 9bd7543..c5db025 100644
--- a/e-util/e-filter-option.h
+++ b/e-util/e-filter-option.h
@@ -82,7 +82,7 @@ struct _EFilterOptionClass {
EFilterElementClass parent_class;
};
-GType e_filter_option_get_type (void);
+GType e_filter_option_get_type (void) G_GNUC_CONST;
EFilterElement *e_filter_option_new (void);
void e_filter_option_set_current (EFilterOption *option,
const gchar *name);
diff --git a/e-util/e-filter-part.h b/e-util/e-filter-part.h
index b5ee2c4..3ff9fdd 100644
--- a/e-util/e-filter-part.h
+++ b/e-util/e-filter-part.h
@@ -76,7 +76,7 @@ struct _EFilterPartClass {
GObjectClass parent_class;
};
-GType e_filter_part_get_type (void);
+GType e_filter_part_get_type (void) G_GNUC_CONST;
EFilterPart * e_filter_part_new (void);
gboolean e_filter_part_validate (EFilterPart *part,
EAlert **alert);
diff --git a/e-util/e-filter-rule.h b/e-util/e-filter-rule.h
index 8670265..c1bd8ee 100644
--- a/e-util/e-filter-rule.h
+++ b/e-util/e-filter-rule.h
@@ -120,7 +120,7 @@ struct _EFilterRuleClass {
void (*changed) (EFilterRule *rule);
};
-GType e_filter_rule_get_type (void);
+GType e_filter_rule_get_type (void) G_GNUC_CONST;
EFilterRule * e_filter_rule_new (void);
EFilterRule * e_filter_rule_clone (EFilterRule *rule);
void e_filter_rule_set_name (EFilterRule *rule,
diff --git a/e-util/e-focus-tracker.h b/e-util/e-focus-tracker.h
index e633d0f..fdd531c 100644
--- a/e-util/e-focus-tracker.h
+++ b/e-util/e-focus-tracker.h
@@ -62,7 +62,7 @@ struct _EFocusTrackerClass {
GObjectClass parent_class;
};
-GType e_focus_tracker_get_type (void);
+GType e_focus_tracker_get_type (void) G_GNUC_CONST;
EFocusTracker * e_focus_tracker_new (GtkWindow *window);
GtkWidget * e_focus_tracker_get_focus (EFocusTracker *focus_tracker);
GtkWindow * e_focus_tracker_get_window (EFocusTracker *focus_tracker);
diff --git a/e-util/e-image-chooser.h b/e-util/e-image-chooser.h
index d9bfb34..1acfd6d 100644
--- a/e-util/e-image-chooser.h
+++ b/e-util/e-image-chooser.h
@@ -65,7 +65,7 @@ struct _EImageChooserClass {
void (*changed) (EImageChooser *chooser);
};
-GType e_image_chooser_get_type (void);
+GType e_image_chooser_get_type (void) G_GNUC_CONST;
GtkWidget * e_image_chooser_new (const gchar *icon_name);
const gchar * e_image_chooser_get_icon_name (EImageChooser *chooser);
gboolean e_image_chooser_set_from_file (EImageChooser *chooser,
diff --git a/e-util/e-import-assistant.h b/e-util/e-import-assistant.h
index 0ee580e..a278372 100644
--- a/e-util/e-import-assistant.h
+++ b/e-util/e-import-assistant.h
@@ -62,7 +62,7 @@ struct _EImportAssistantClass {
GtkAssistantClass parent_class;
};
-GType e_import_assistant_get_type (void);
+GType e_import_assistant_get_type (void) G_GNUC_CONST;
GtkWidget * e_import_assistant_new (GtkWindow *parent);
GtkWidget * e_import_assistant_new_simple (GtkWindow *parent,
const gchar * const *uris);
diff --git a/e-util/e-import.h b/e-util/e-import.h
index 69d40cf..79d6bf0 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -198,7 +198,7 @@ struct _EImportClass {
EImportTarget *target);
};
-GType e_import_get_type (void);
+GType e_import_get_type (void) G_GNUC_CONST;
EImport * e_import_new (const gchar *id);
void e_import_class_add_importer (EImportClass *klass,
EImportImporter *importer,
diff --git a/e-util/e-interval-chooser.c b/e-util/e-interval-chooser.c
index 70e90bd..cf93a11 100644
--- a/e-util/e-interval-chooser.c
+++ b/e-util/e-interval-chooser.c
@@ -162,7 +162,7 @@ e_interval_chooser_get_interval_minutes (EIntervalChooser *chooser)
EDurationType units;
gdouble interval_minutes;
- g_return_val_if_fail (E_IS_SOURCE_CONFIG_REFRESH (chooser), 0);
+ g_return_val_if_fail (E_IS_INTERVAL_CHOOSER (chooser), 0);
units = gtk_combo_box_get_active (chooser->priv->combo_box);
@@ -189,7 +189,7 @@ e_interval_chooser_set_interval_minutes (EIntervalChooser *chooser,
{
EDurationType units;
- g_return_if_fail (E_IS_SOURCE_CONFIG_REFRESH (chooser));
+ g_return_if_fail (E_IS_INTERVAL_CHOOSER (chooser));
if (interval_minutes == 0) {
units = E_DURATION_MINUTES;
diff --git a/e-util/e-interval-chooser.h b/e-util/e-interval-chooser.h
index 477ae18..6664962 100644
--- a/e-util/e-interval-chooser.h
+++ b/e-util/e-interval-chooser.h
@@ -34,10 +34,10 @@
#define E_INTERVAL_CHOOSER_CLASS(cls) \
(G_TYPE_CHECK_CLASS_CAST \
((cls), E_TYPE_INTERVAL_CHOOSER, EIntervalChooserClass))
-#define E_IS_SOURCE_CONFIG_REFRESH(obj) \
+#define E_IS_INTERVAL_CHOOSER(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE \
((obj), E_TYPE_INTERVAL_CHOOSER))
-#define E_IS_SOURCE_CONFIG_REFRESH_CLASS(cls) \
+#define E_IS_INTERVAL_CHOOSER_CLASS(cls) \
(G_TYPE_CHECK_CLASS_TYPE \
((cls), E_TYPE_INTERVAL_CHOOSER))
#define E_INTERVAL_CHOOSER_GET_CLASS(obj) \
diff --git a/e-util/e-map.h b/e-util/e-map.h
index cb2923d..461230e 100644
--- a/e-util/e-map.h
+++ b/e-util/e-map.h
@@ -84,7 +84,7 @@ struct _EMapPoint {
/* --- Widget --- */
-GType e_map_get_type (void);
+GType e_map_get_type (void) G_GNUC_CONST;
EMap *e_map_new (void);
diff --git a/e-util/e-menu-tool-action.h b/e-util/e-menu-tool-action.h
index aee4768..132d3d9 100644
--- a/e-util/e-menu-tool-action.h
+++ b/e-util/e-menu-tool-action.h
@@ -63,7 +63,7 @@ struct _EMenuToolActionClass {
GtkActionClass parent_class;
};
-GType e_menu_tool_action_get_type (void);
+GType e_menu_tool_action_get_type (void) G_GNUC_CONST;
EMenuToolAction *
e_menu_tool_action_new (const gchar *name,
const gchar *label,
diff --git a/e-util/e-menu-tool-button.h b/e-util/e-menu-tool-button.h
index 0451995..c16ba09 100644
--- a/e-util/e-menu-tool-button.h
+++ b/e-util/e-menu-tool-button.h
@@ -66,7 +66,7 @@ struct _EMenuToolButtonClass {
GtkMenuToolButtonClass parent_class;
};
-GType e_menu_tool_button_get_type (void);
+GType e_menu_tool_button_get_type (void) G_GNUC_CONST;
GtkToolItem * e_menu_tool_button_new (const gchar *label);
void e_menu_tool_button_set_prefer_item (EMenuToolButton *button,
const gchar *prefer_item);
diff --git a/e-util/e-misc-utils.h b/e-util/e-misc-utils.h
index f17cf3c..e41689b 100644
--- a/e-util/e-misc-utils.h
+++ b/e-util/e-misc-utils.h
@@ -50,6 +50,9 @@ typedef enum {
E_RESTORE_WINDOW_POSITION = 1 << 1
} ERestoreWindowFlags;
+typedef void (*EForeachFunc) (gint model_row,
+ gpointer closure);
+
const gchar * e_get_accels_filename (void);
void e_show_uri (GtkWindow *parent,
const gchar *uri);
diff --git a/e-util/e-name-selector-dialog.h b/e-util/e-name-selector-dialog.h
index fe10544..69bd969 100644
--- a/e-util/e-name-selector-dialog.h
+++ b/e-util/e-name-selector-dialog.h
@@ -68,7 +68,7 @@ struct _ENameSelectorDialogClass {
GtkDialogClass parent_class;
};
-GType e_name_selector_dialog_get_type (void);
+GType e_name_selector_dialog_get_type (void) G_GNUC_CONST;
ENameSelectorDialog *
e_name_selector_dialog_new (ESourceRegistry *registry);
ESourceRegistry *
diff --git a/e-util/e-name-selector-entry.h b/e-util/e-name-selector-entry.h
index 63ce9aa..6aa0943 100644
--- a/e-util/e-name-selector-entry.h
+++ b/e-util/e-name-selector-entry.h
@@ -74,7 +74,7 @@ struct _ENameSelectorEntryClass {
gpointer reserved2;
};
-GType e_name_selector_entry_get_type (void);
+GType e_name_selector_entry_get_type (void) G_GNUC_CONST;
ENameSelectorEntry *
e_name_selector_entry_new (ESourceRegistry *registry);
ESourceRegistry *
diff --git a/e-util/e-name-selector-list.h b/e-util/e-name-selector-list.h
index 7b1d11c..28f7451 100644
--- a/e-util/e-name-selector-list.h
+++ b/e-util/e-name-selector-list.h
@@ -71,7 +71,7 @@ struct _ENameSelectorListClass {
ENameSelectorEntryClass parent_class;
};
-GType e_name_selector_list_get_type (void);
+GType e_name_selector_list_get_type (void) G_GNUC_CONST;
ENameSelectorList *
e_name_selector_list_new (ESourceRegistry *registry);
void e_name_selector_list_expand_clicked
diff --git a/e-util/e-name-selector-model.h b/e-util/e-name-selector-model.h
index ed37f2a..259ac2b 100644
--- a/e-util/e-name-selector-model.h
+++ b/e-util/e-name-selector-model.h
@@ -69,7 +69,7 @@ struct _ENameSelectorModelClass {
void (*section_removed) (gchar *name);
};
-GType e_name_selector_model_get_type (void);
+GType e_name_selector_model_get_type (void) G_GNUC_CONST;
ENameSelectorModel *
e_name_selector_model_new (void);
EContactStore * e_name_selector_model_peek_contact_store
diff --git a/e-util/e-name-selector.h b/e-util/e-name-selector.h
index 1049699..c6949c5 100644
--- a/e-util/e-name-selector.h
+++ b/e-util/e-name-selector.h
@@ -68,7 +68,7 @@ struct _ENameSelectorClass {
GObjectClass parent_class;
};
-GType e_name_selector_get_type (void);
+GType e_name_selector_get_type (void) G_GNUC_CONST;
ENameSelector * e_name_selector_new (ESourceRegistry *registry);
ESourceRegistry *
e_name_selector_get_registry (ENameSelector *name_selector);
diff --git a/e-util/e-online-button.h b/e-util/e-online-button.h
index 073489f..b341673 100644
--- a/e-util/e-online-button.h
+++ b/e-util/e-online-button.h
@@ -58,7 +58,7 @@ struct _EOnlineButtonClass {
GtkButtonClass parent_class;
};
-GType e_online_button_get_type (void);
+GType e_online_button_get_type (void) G_GNUC_CONST;
GtkWidget * e_online_button_new (void);
gboolean e_online_button_get_online (EOnlineButton *button);
void e_online_button_set_online (EOnlineButton *button,
diff --git a/e-util/e-paned.h b/e-util/e-paned.h
index 79fa3dd..608f0d6 100644
--- a/e-util/e-paned.h
+++ b/e-util/e-paned.h
@@ -62,7 +62,7 @@ struct _EPanedClass {
GtkPanedClass parent_class;
};
-GType e_paned_get_type (void);
+GType e_paned_get_type (void) G_GNUC_CONST;
GtkWidget * e_paned_new (GtkOrientation orientation);
gint e_paned_get_hposition (EPaned *paned);
void e_paned_set_hposition (EPaned *paned,
diff --git a/e-util/e-picture-gallery.h b/e-util/e-picture-gallery.h
index 653d990..ab79980 100644
--- a/e-util/e-picture-gallery.h
+++ b/e-util/e-picture-gallery.h
@@ -62,7 +62,7 @@ struct _EPictureGalleryClass {
GtkIconViewClass parent_class;
};
-GType e_picture_gallery_get_type (void);
+GType e_picture_gallery_get_type (void) G_GNUC_CONST;
GtkWidget * e_picture_gallery_new (const gchar *path);
const gchar * e_picture_gallery_get_path (EPictureGallery *gallery);
diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h
index f56a6e0..0590c7e 100644
--- a/e-util/e-plugin-ui.h
+++ b/e-util/e-plugin-ui.h
@@ -65,7 +65,7 @@ struct _EPluginUIHookClass {
typedef gboolean (*EPluginUIInitFunc) (GtkUIManager *ui_manager,
gpointer user_data);
-GType e_plugin_ui_hook_get_type (void);
+GType e_plugin_ui_hook_get_type (void) G_GNUC_CONST;
void e_plugin_ui_register_manager (GtkUIManager *ui_manager,
const gchar *id,
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index b67bde5..2b8cd82 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -62,6 +62,14 @@ struct _EPluginAuthor {
gchar *email;
};
+/* README: Currently there is only one flag.
+ * But we may need more in the future and hence makes
+ * sense to keep as an enum */
+
+typedef enum {
+ E_PLUGIN_FLAGS_SYSTEM_PLUGIN = 1 << 0
+} EPluginFlags;
+
/**
* struct _EPlugin - An EPlugin instance.
*
@@ -91,7 +99,7 @@ struct _EPlugin {
GSList *hooks;
GSList *authors; /* EPluginAuthor structures */
- guint32 flags;
+ EPluginFlags flags;
guint enabled : 1;
};
@@ -130,7 +138,7 @@ struct _EPluginClass {
GtkWidget *(*get_configure_widget)(EPlugin *);
};
-GType e_plugin_get_type (void);
+GType e_plugin_get_type (void) G_GNUC_CONST;
gint e_plugin_construct (EPlugin *plugin,
xmlNodePtr root);
gint e_plugin_load_plugins (void);
@@ -275,13 +283,5 @@ guint32 e_plugin_hook_id (xmlNodePtr root,
const EPluginHookTargetKey *map,
const gchar *prop);
-/* README: Currently there is only one flag.
- * But we may need more in the future and hence makes
- * sense to keep as an enum */
-
-typedef enum _EPluginFlags {
- E_PLUGIN_FLAGS_SYSTEM_PLUGIN = 1 << 0
-} EPluginFlags;
-
#endif /* _E_PLUGIN_H */
diff --git a/e-util/e-popup-action.h b/e-util/e-popup-action.h
index 62e7b8e..391b0e7 100644
--- a/e-util/e-popup-action.h
+++ b/e-util/e-popup-action.h
@@ -83,7 +83,7 @@ struct _EPopupActionEntry {
const gchar *related; /* name of the related action */
};
-GType e_popup_action_get_type (void);
+GType e_popup_action_get_type (void) G_GNUC_CONST;
EPopupAction * e_popup_action_new (const gchar *name);
void e_action_group_add_popup_actions
diff --git a/e-util/e-preferences-window.h b/e-util/e-preferences-window.h
index f2efa01..c1f7b4d 100644
--- a/e-util/e-preferences-window.h
+++ b/e-util/e-preferences-window.h
@@ -66,7 +66,7 @@ typedef GtkWidget *
(*EPreferencesWindowCreatePageFn)
(EPreferencesWindow *window);
-GType e_preferences_window_get_type (void);
+GType e_preferences_window_get_type (void) G_GNUC_CONST;
GtkWidget * e_preferences_window_new (gpointer shell);
gpointer e_preferences_window_get_shell (EPreferencesWindow *window);
void e_preferences_window_setup (EPreferencesWindow *window);
diff --git a/e-util/e-preview-pane.h b/e-util/e-preview-pane.h
index 3720744..88cd0f3 100644
--- a/e-util/e-preview-pane.h
+++ b/e-util/e-preview-pane.h
@@ -68,7 +68,7 @@ struct _EPreviewPaneClass {
void (*show_search_bar) (EPreviewPane *preview_pane);
};
-GType e_preview_pane_get_type (void);
+GType e_preview_pane_get_type (void) G_GNUC_CONST;
GtkWidget * e_preview_pane_new (EWebView *web_view);
EWebView * e_preview_pane_get_web_view (EPreviewPane *preview_pane);
ESearchBar * e_preview_pane_get_search_bar (EPreviewPane *preview_pane);
diff --git a/e-util/e-printable.c b/e-util/e-printable.c
index 3f1403f..56f4212 100644
--- a/e-util/e-printable.c
+++ b/e-util/e-printable.c
@@ -128,7 +128,7 @@ e_printable_init (EPrintable *e_printable)
EPrintable *
e_printable_new (void)
{
- return E_PRINTABLE (g_object_new (E_PRINTABLE_TYPE, NULL));
+ return g_object_new (E_TYPE_PRINTABLE, NULL);
}
void
@@ -138,7 +138,6 @@ e_printable_print_page (EPrintable *e_printable,
gdouble height,
gboolean quantized)
{
- g_return_if_fail (e_printable != NULL);
g_return_if_fail (E_IS_PRINTABLE (e_printable));
g_signal_emit (
@@ -155,7 +154,6 @@ e_printable_data_left (EPrintable *e_printable)
{
gboolean ret_val;
- g_return_val_if_fail (e_printable != NULL, FALSE);
g_return_val_if_fail (E_IS_PRINTABLE (e_printable), FALSE);
g_signal_emit (
@@ -169,7 +167,6 @@ e_printable_data_left (EPrintable *e_printable)
void
e_printable_reset (EPrintable *e_printable)
{
- g_return_if_fail (e_printable != NULL);
g_return_if_fail (E_IS_PRINTABLE (e_printable));
g_signal_emit (
@@ -186,7 +183,6 @@ e_printable_height (EPrintable *e_printable,
{
gdouble ret_val;
- g_return_val_if_fail (e_printable != NULL, -1);
g_return_val_if_fail (E_IS_PRINTABLE (e_printable), -1);
g_signal_emit (
@@ -210,7 +206,6 @@ e_printable_will_fit (EPrintable *e_printable,
{
gboolean ret_val;
- g_return_val_if_fail (e_printable != NULL, FALSE);
g_return_val_if_fail (E_IS_PRINTABLE (e_printable), FALSE);
g_signal_emit (
diff --git a/e-util/e-printable.h b/e-util/e-printable.h
index 2927560..395c8a2 100644
--- a/e-util/e-printable.h
+++ b/e-util/e-printable.h
@@ -25,34 +25,55 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _E_PRINTABLE_H_
-#define _E_PRINTABLE_H_
+#ifndef E_PRINTABLE_H
+#define E_PRINTABLE_H
#include <gtk/gtk.h>
+/* Standard GObject macros */
+#define E_TYPE_PRINTABLE \
+ (e_printable_get_type ())
+#define E_PRINTABLE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_PRINTABLE, EPrintable))
+#define E_PRINTABLE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_PRINTABLE, EPrintableClass))
+#define E_IS_PRINTABLE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_PRINTABLE))
+#define E_IS_PRINTABLE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_PRINTABLE))
+#define E_PRINTABLE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_PRINTABLE, EPrintableClass))
+
G_BEGIN_DECLS
-#define E_PRINTABLE_TYPE (e_printable_get_type ())
-#define E_PRINTABLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_PRINTABLE_TYPE, EPrintable))
-#define E_PRINTABLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_PRINTABLE_TYPE, EPrintableClass))
-#define E_IS_PRINTABLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_PRINTABLE_TYPE))
-#define E_IS_PRINTABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_PRINTABLE_TYPE))
+typedef struct _EPrintable EPrintable;
+typedef struct _EPrintableClass EPrintableClass;
-typedef struct {
- GObject base;
-} EPrintable;
+struct _EPrintable {
+ GObject parent;
+};
-typedef struct {
+struct _EPrintableClass {
GObjectClass parent_class;
- /*
- * Signals
- */
-
- void (*print_page) (EPrintable *etm, GtkPrintContext *context, gdouble width, gdouble height, gboolean quantized);
- gboolean (*data_left) (EPrintable *etm);
- void (*reset) (EPrintable *etm);
- gdouble (*height) (EPrintable *etm, GtkPrintContext *context, gdouble width, gdouble max_height, gboolean quantized);
+ /* Signals */
+ void (*print_page) (EPrintable *printable,
+ GtkPrintContext *context,
+ gdouble width,
+ gdouble height,
+ gboolean quantized);
+ gboolean (*data_left) (EPrintable *printable);
+ void (*reset) (EPrintable *printable);
+ gdouble (*height) (EPrintable *printable,
+ GtkPrintContext *context,
+ gdouble width,
+ gdouble max_height,
+ gboolean quantized);
/* e_printable_will_fit (ep, ...) should be equal in value to
* (e_printable_print_page (ep, ...),
@@ -60,34 +81,33 @@ typedef struct {
* side effect of doing the printing and advancing the
* position of the printable.
*/
-
- gboolean (*will_fit) (EPrintable *etm, GtkPrintContext *context, gdouble width, gdouble max_height, gboolean quantized);
-} EPrintableClass;
-
-GType e_printable_get_type (void);
-
-EPrintable *e_printable_new (void);
-
-/*
- * Routines for emitting signals on the e_table */
-void e_printable_print_page (EPrintable *e_printable,
- GtkPrintContext *context,
- gdouble width,
- gdouble height,
- gboolean quantized);
-gboolean e_printable_data_left (EPrintable *e_printable);
-void e_printable_reset (EPrintable *e_printable);
-gdouble e_printable_height (EPrintable *e_printable,
- GtkPrintContext *context,
- gdouble width,
- gdouble max_height,
- gboolean quantized);
-gboolean e_printable_will_fit (EPrintable *e_printable,
- GtkPrintContext *context,
- gdouble width,
- gdouble max_height,
- gboolean quantized);
+ gboolean (*will_fit) (EPrintable *printable,
+ GtkPrintContext *context,
+ gdouble width,
+ gdouble max_height,
+ gboolean quantized);
+};
+
+GType e_printable_get_type (void) G_GNUC_CONST;
+EPrintable * e_printable_new (void);
+void e_printable_print_page (EPrintable *e_printable,
+ GtkPrintContext *context,
+ gdouble width,
+ gdouble height,
+ gboolean quantized);
+gboolean e_printable_data_left (EPrintable *printable);
+void e_printable_reset (EPrintable *printable);
+gdouble e_printable_height (EPrintable *printable,
+ GtkPrintContext *context,
+ gdouble width,
+ gdouble max_height,
+ gboolean quantized);
+gboolean e_printable_will_fit (EPrintable *printable,
+ GtkPrintContext *context,
+ gdouble width,
+ gdouble max_height,
+ gboolean quantized);
G_END_DECLS
-#endif /* _E_PRINTABLE_H_ */
+#endif /* E_PRINTABLE_H */
diff --git a/e-util/e-reflow-model.h b/e-util/e-reflow-model.h
index 4a5f710..9061b02 100644
--- a/e-util/e-reflow-model.h
+++ b/e-util/e-reflow-model.h
@@ -25,8 +25,8 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _E_REFLOW_MODEL_H_
-#define _E_REFLOW_MODEL_H_
+#ifndef E_REFLOW_MODEL_H
+#define E_REFLOW_MODEL_H
#include <libgnomecanvas/libgnomecanvas.h>
@@ -61,69 +61,75 @@ struct _EReflowModel {
struct _EReflowModelClass {
GObjectClass parent_class;
- /*
- * Virtual methods
- */
- void (*set_width) (EReflowModel *etm, gint width);
-
- gint (*count) (EReflowModel *etm);
- gint (*height) (EReflowModel *etm, gint n, GnomeCanvasGroup *parent);
- GnomeCanvasItem *(*incarnate) (EReflowModel *etm, gint n, GnomeCanvasGroup *parent);
- GHashTable * (*create_cmp_cache) (EReflowModel *etm);
- gint (*compare) (EReflowModel *etm, gint n1, gint n2, GHashTable *cmp_cache);
- void (*reincarnate) (EReflowModel *etm, gint n, GnomeCanvasItem *item);
-
- /*
- * Signals
- */
-
- /*
+ /* Method */
+ void (*set_width) (EReflowModel *reflow_model,
+ gint width);
+ gint (*count) (EReflowModel *reflow_model);
+ gint (*height) (EReflowModel *reflow_model,
+ gint n,
+ GnomeCanvasGroup *parent);
+ GnomeCanvasItem *
+ (*incarnate) (EReflowModel *reflow_model,
+ gint n,
+ GnomeCanvasGroup *parent);
+ GHashTable * (*create_cmp_cache) (EReflowModel *reflow_model);
+ gint (*compare) (EReflowModel *reflow_model,
+ gint n1,
+ gint n2,
+ GHashTable *cmp_cache);
+ void (*reincarnate) (EReflowModel *reflow_model,
+ gint n,
+ GnomeCanvasItem *item);
+
+ /* Signals
+ *
* These all come after the change has been made.
* Major structural changes: model_changed
* Changes to the sorting of elements: comparison_changed
* Changes only in an item: item_changed
*/
- void (*model_changed) (EReflowModel *etm);
- void (*comparison_changed) (EReflowModel *etm);
- void (*model_items_inserted) (EReflowModel *etm, gint position, gint count);
- void (*model_item_removed) (EReflowModel *etm, gint position);
- void (*model_item_changed) (EReflowModel *etm, gint n);
+ void (*model_changed) (EReflowModel *reflow_model);
+ void (*comparison_changed) (EReflowModel *reflow_model);
+ void (*model_items_inserted) (EReflowModel *reflow_model,
+ gint position,
+ gint count);
+ void (*model_item_removed) (EReflowModel *reflow_model,
+ gint position);
+ void (*model_item_changed) (EReflowModel *reflow_model,
+ gint n);
};
-GType e_reflow_model_get_type (void);
-
-/**/
-void e_reflow_model_set_width (EReflowModel *e_reflow_model,
- gint width);
-gint e_reflow_model_count (EReflowModel *e_reflow_model);
-gint e_reflow_model_height (EReflowModel *e_reflow_model,
- gint n,
+GType e_reflow_model_get_type (void) G_GNUC_CONST;
+void e_reflow_model_set_width (EReflowModel *reflow_model,
+ gint width);
+gint e_reflow_model_count (EReflowModel *reflow_model);
+gint e_reflow_model_height (EReflowModel *reflow_model,
+ gint n,
GnomeCanvasGroup *parent);
-GnomeCanvasItem *e_reflow_model_incarnate (EReflowModel *e_reflow_model,
- gint n,
+GnomeCanvasItem *
+ e_reflow_model_incarnate (EReflowModel *reflow_model,
+ gint n,
GnomeCanvasGroup *parent);
-GHashTable * e_reflow_model_create_cmp_cache (EReflowModel *e_reflow_model);
-gint e_reflow_model_compare (EReflowModel *e_reflow_model,
- gint n1,
- gint n2,
- GHashTable *cmp_cache);
-void e_reflow_model_reincarnate (EReflowModel *e_reflow_model,
- gint n,
- GnomeCanvasItem *item);
-
-/*
- * Routines for emitting signals on the e_reflow
- */
-void e_reflow_model_changed (EReflowModel *e_reflow_model);
-void e_reflow_model_comparison_changed (EReflowModel *e_reflow_model);
-void e_reflow_model_items_inserted (EReflowModel *e_reflow_model,
- gint position,
- gint count);
-void e_reflow_model_item_removed (EReflowModel *e_reflow_model,
- gint n);
-void e_reflow_model_item_changed (EReflowModel *e_reflow_model,
- gint n);
+GHashTable * e_reflow_model_create_cmp_cache (EReflowModel *reflow_model);
+gint e_reflow_model_compare (EReflowModel *reflow_model,
+ gint n1,
+ gint n2,
+ GHashTable *cmp_cache);
+void e_reflow_model_reincarnate (EReflowModel *reflow_model,
+ gint n,
+ GnomeCanvasItem *item);
+void e_reflow_model_changed (EReflowModel *reflow_model);
+void e_reflow_model_comparison_changed
+ (EReflowModel *reflow_model);
+void e_reflow_model_items_inserted (EReflowModel *reflow_model,
+ gint position,
+ gint count);
+void e_reflow_model_item_removed (EReflowModel *reflow_model,
+ gint n);
+void e_reflow_model_item_changed (EReflowModel *reflow_model,
+ gint n);
G_END_DECLS
-#endif /* _E_REFLOW_MODEL_H_ */
+#endif /* E_REFLOW_MODEL_H */
+
diff --git a/e-util/e-reflow.h b/e-util/e-reflow.h
index a891e98..72b92f5 100644
--- a/e-util/e-reflow.h
+++ b/e-util/e-reflow.h
@@ -138,7 +138,7 @@ struct _EReflowClass
* should also do an ECanvas parent reflow request if its size
* changes.
*/
-GType e_reflow_get_type (void);
+GType e_reflow_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/e-util/e-rule-context.h b/e-util/e-rule-context.h
index f543edd..316d7c3 100644
--- a/e-util/e-rule-context.h
+++ b/e-util/e-rule-context.h
@@ -142,7 +142,7 @@ struct _rule_set_map {
ERuleContextNextRuleFunc next;
};
-GType e_rule_context_get_type (void);
+GType e_rule_context_get_type (void) G_GNUC_CONST;
ERuleContext * e_rule_context_new (void);
gint e_rule_context_load (ERuleContext *context,
diff --git a/e-util/e-rule-editor.h b/e-util/e-rule-editor.h
index d983b81..39d2066 100644
--- a/e-util/e-rule-editor.h
+++ b/e-util/e-rule-editor.h
@@ -106,7 +106,7 @@ struct _ERuleEditorUndo {
gint newrank;
};
-GType e_rule_editor_get_type (void);
+GType e_rule_editor_get_type (void) G_GNUC_CONST;
ERuleEditor * e_rule_editor_new (ERuleContext *context,
const gchar *source,
const gchar *label);
diff --git a/e-util/e-search-bar.h b/e-util/e-search-bar.h
index 43e1645..0681bce 100644
--- a/e-util/e-search-bar.h
+++ b/e-util/e-search-bar.h
@@ -68,17 +68,14 @@ struct _ESearchBarClass {
void (*clear) (ESearchBar *search_bar);
};
-GType e_search_bar_get_type (void);
+GType e_search_bar_get_type (void) G_GNUC_CONST;
GtkWidget * e_search_bar_new (EWebView *web_view);
void e_search_bar_clear (ESearchBar *search_bar);
void e_search_bar_changed (ESearchBar *search_bar);
EWebView * e_search_bar_get_web_view (ESearchBar *search_bar);
-gboolean e_search_bar_get_active_search
- (ESearchBar *search_bar);
-gboolean e_search_bar_get_case_sensitive
- (ESearchBar *search_bar);
-void e_search_bar_set_case_sensitive
- (ESearchBar *search_bar,
+gboolean e_search_bar_get_active_search (ESearchBar *search_bar);
+gboolean e_search_bar_get_case_sensitive (ESearchBar *search_bar);
+void e_search_bar_set_case_sensitive (ESearchBar *search_bar,
gboolean case_sensitive);
gchar * e_search_bar_get_text (ESearchBar *search_bar);
void e_search_bar_set_text (ESearchBar *search_bar,
diff --git a/e-util/e-selectable.h b/e-util/e-selectable.h
index 4e7faa8..6aeaa5e 100644
--- a/e-util/e-selectable.h
+++ b/e-util/e-selectable.h
@@ -65,7 +65,7 @@ struct _ESelectableInterface {
void (*select_all) (ESelectable *selectable);
};
-GType e_selectable_get_type (void);
+GType e_selectable_get_type (void) G_GNUC_CONST;
void e_selectable_update_actions (ESelectable *selectable,
EFocusTracker *focus_tracker,
GdkAtom *clipboard_targets,
diff --git a/e-util/e-selection-model-array.c b/e-util/e-selection-model-array.c
index fe73857..f019f8c 100644
--- a/e-util/e-selection-model-array.c
+++ b/e-util/e-selection-model-array.c
@@ -57,8 +57,8 @@ static gint
es_row_model_to_sorted (ESelectionModelArray *esma,
gint model_row)
{
- if (model_row >= 0 && esma && esma->base.sorter && e_sorter_needs_sorting (esma->base.sorter))
- return e_sorter_model_to_sorted (esma->base.sorter, model_row);
+ if (model_row >= 0 && esma && esma->parent.sorter && e_sorter_needs_sorting (esma->parent.sorter))
+ return e_sorter_model_to_sorted (esma->parent.sorter, model_row);
return model_row;
}
@@ -67,8 +67,8 @@ static gint
es_row_sorted_to_model (ESelectionModelArray *esma,
gint sorted_row)
{
- if (sorted_row >= 0 && esma && esma->base.sorter && e_sorter_needs_sorting (esma->base.sorter))
- return e_sorter_sorted_to_model (esma->base.sorter, sorted_row);
+ if (sorted_row >= 0 && esma && esma->parent.sorter && e_sorter_needs_sorting (esma->parent.sorter))
+ return e_sorter_sorted_to_model (esma->parent.sorter, sorted_row);
return sorted_row;
}
diff --git a/e-util/e-selection-model-array.h b/e-util/e-selection-model-array.h
index 7292a33..bb3e3f7 100644
--- a/e-util/e-selection-model-array.h
+++ b/e-util/e-selection-model-array.h
@@ -25,23 +25,38 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _E_SELECTION_MODEL_ARRAY_H_
-#define _E_SELECTION_MODEL_ARRAY_H_
+#ifndef E_SELECTION_MODEL_ARRAY_H
+#define E_SELECTION_MODEL_ARRAY_H
#include <e-util/e-bit-array.h>
#include <e-util/e-selection-model.h>
+/* Standard GObject macros */
+#define E_TYPE_SELECTION_MODEL_ARRAY \
+ (e_selection_model_array_get_type ())
+#define E_SELECTION_MODEL_ARRAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_SELECTION_MODEL_ARRAY, ESelectionModelArray))
+#define E_SELECTION_MODEL_ARRAY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_SELECTION_MODEL_ARRAY, ESelectionModelArrayClass))
+#define E_IS_SELECTION_MODEL_ARRAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_SELECTION_MODEL_ARRAY))
+#define E_IS_SELECTION_MODEL_ARRAY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_SELECTION_MODEL_ARRAY))
+#define E_SELECTION_MODEL_ARRAY_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_SELECTION_MODEL_ARRAY, ESelectionModelArrayClass))
+
G_BEGIN_DECLS
-#define E_SELECTION_MODEL_ARRAY_TYPE (e_selection_model_array_get_type ())
-#define E_SELECTION_MODEL_ARRAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SELECTION_MODEL_ARRAY_TYPE, ESelectionModelArray))
-#define E_SELECTION_MODEL_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_SELECTION_MODEL_ARRAY_TYPE, ESelectionModelArrayClass))
-#define E_IS_SELECTION_MODEL_ARRAY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_SELECTION_MODEL_ARRAY_TYPE))
-#define E_IS_SELECTION_MODEL_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_ARRAY_TYPE))
-#define E_SELECTION_MODEL_ARRAY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), E_SELECTION_MODEL_ARRAY_TYPE, ESelectionModelArrayClass))
+typedef struct _ESelectionModelArray ESelectionModelArray;
+typedef struct _ESelectionModelArrayClass ESelectionModelArrayClass;
-typedef struct {
- ESelectionModel base;
+struct _ESelectionModelArray {
+ ESelectionModel parent;
EBitArray *eba;
@@ -55,41 +70,45 @@ typedef struct {
/* Anything other than -1 means that the selection is a single
* row. This being -1 does not impart any information. */
- gint selected_row;
+ gint selected_row;
+
/* Anything other than -1 means that the selection is a all
* rows between selection_start_path and cursor_path where
* selected_range_end is the rwo number of cursor_path. This
* being -1 does not impart any information. */
- gint selected_range_end;
+ gint selected_range_end;
guint frozen : 1;
guint selection_model_changed : 1;
guint group_info_changed : 1;
-} ESelectionModelArray;
+};
-typedef struct {
+struct _ESelectionModelArrayClass {
ESelectionModelClass parent_class;
- gint (*get_row_count) (ESelectionModelArray *selection);
-} ESelectionModelArrayClass;
-
-GType e_selection_model_array_get_type (void);
-
-/* Protected Functions */
-void e_selection_model_array_insert_rows (ESelectionModelArray *esm,
- gint row,
- gint count);
-void e_selection_model_array_delete_rows (ESelectionModelArray *esm,
- gint row,
- gint count);
-void e_selection_model_array_move_row (ESelectionModelArray *esm,
- gint old_row,
- gint new_row);
-void e_selection_model_array_confirm_row_count (ESelectionModelArray *esm);
-
-/* Protected Virtual Function */
-gint e_selection_model_array_get_row_count (ESelectionModelArray *esm);
+ gint (*get_row_count)
+ (ESelectionModelArray *selection);
+};
+
+GType e_selection_model_array_get_type
+ (void) G_GNUC_CONST;
+void e_selection_model_array_insert_rows
+ (ESelectionModelArray *selection,
+ gint row,
+ gint count);
+void e_selection_model_array_delete_rows
+ (ESelectionModelArray *selection,
+ gint row,
+ gint count);
+void e_selection_model_array_move_row
+ (ESelectionModelArray *selection,
+ gint old_row,
+ gint new_row);
+void e_selection_model_array_confirm_row_count
+ (ESelectionModelArray *selection);
+gint e_selection_model_array_get_row_count
+ (ESelectionModelArray *selection);
G_END_DECLS
-#endif /* _E_SELECTION_MODEL_ARRAY_H_ */
+#endif /* E_SELECTION_MODEL_ARRAY_H */
diff --git a/e-util/e-selection-model-simple.c b/e-util/e-selection-model-simple.c
index f7123dd..d194e95 100644
--- a/e-util/e-selection-model-simple.c
+++ b/e-util/e-selection-model-simple.c
@@ -33,7 +33,7 @@ static gint esms_get_row_count (ESelectionModelArray *esma);
G_DEFINE_TYPE (
ESelectionModelSimple,
e_selection_model_simple,
- E_SELECTION_MODEL_ARRAY_TYPE)
+ E_TYPE_SELECTION_MODEL_ARRAY)
static void
e_selection_model_simple_init (ESelectionModelSimple *selection)
@@ -60,7 +60,7 @@ e_selection_model_simple_class_init (ESelectionModelSimpleClass *class)
ESelectionModelSimple *
e_selection_model_simple_new (void)
{
- return g_object_new (E_SELECTION_MODEL_SIMPLE_TYPE, NULL);
+ return g_object_new (E_TYPE_SELECTION_MODEL_SIMPLE, NULL);
}
void
diff --git a/e-util/e-selection-model-simple.h b/e-util/e-selection-model-simple.h
index b4551dd..e0990bb 100644
--- a/e-util/e-selection-model-simple.h
+++ b/e-util/e-selection-model-simple.h
@@ -25,46 +25,67 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _E_SELECTION_MODEL_SIMPLE_H_
-#define _E_SELECTION_MODEL_SIMPLE_H_
+#ifndef E_SELECTION_MODEL_SIMPLE_H
+#define E_SELECTION_MODEL_SIMPLE_H
#include <e-util/e-selection-model-array.h>
+/* Standard GObject macros */
+#define E_TYPE_SELECTION_MODEL_SIMPLE \
+ (e_selection_model_simple_get_type ())
+#define E_SELECTION_MODEL_SIMPLE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_SELECTION_MODEL_SIMPLE, ESelectionModelSimple))
+#define E_SELECTION_MODEL_SIMPLE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_SELECTION_MODEL_SIMPLE, ESelectionModelSimpleClass))
+#define E_IS_SELECTION_MODEL_SIMPLE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_SELECTION_MODEL_SIMPLE))
+#define E_IS_SELECTION_MODEL_SIMPLE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_SELECTION_MODEL_SIMPLE))
+#define E_SELECTION_MODEL_SIMPLE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_SELECTION_MODEL_SIMPLE, ESelectionModelSimpleClass))
+
G_BEGIN_DECLS
-#define E_SELECTION_MODEL_SIMPLE_TYPE (e_selection_model_simple_get_type ())
-#define E_SELECTION_MODEL_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SELECTION_MODEL_SIMPLE_TYPE, ESelectionModelSimple))
-#define E_SELECTION_MODEL_SIMPLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_SELECTION_MODEL_SIMPLE_TYPE, ESelectionModelSimpleClass))
-#define E_IS_SELECTION_MODEL_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_SELECTION_MODEL_SIMPLE_TYPE))
-#define E_IS_SELECTION_MODEL_SIMPLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_SIMPLE_TYPE))
+typedef struct _ESelectionModelSimple ESelectionModelSimple;
+typedef struct _ESelectionModelSimpleClass ESelectionModelSimpleClass;
-typedef struct {
+struct _ESelectionModelSimple {
ESelectionModelArray parent;
gint row_count;
-} ESelectionModelSimple;
+};
-typedef struct {
+struct _ESelectionModelSimpleClass {
ESelectionModelArrayClass parent_class;
-} ESelectionModelSimpleClass;
-
-GType e_selection_model_simple_get_type (void);
-ESelectionModelSimple *e_selection_model_simple_new (void);
-
-void e_selection_model_simple_insert_rows (ESelectionModelSimple *esms,
- gint row,
- gint count);
-void e_selection_model_simple_delete_rows (ESelectionModelSimple *esms,
- gint row,
- gint count);
-void e_selection_model_simple_move_row (ESelectionModelSimple *esms,
- gint old_row,
- gint new_row);
+};
-void e_selection_model_simple_set_row_count (ESelectionModelSimple *selection,
- gint row_count);
+GType e_selection_model_simple_get_type
+ (void) G_GNUC_CONST;
+ESelectionModelSimple *
+ e_selection_model_simple_new
+ (void);
+void e_selection_model_simple_insert_rows
+ (ESelectionModelSimple *selection,
+ gint row,
+ gint count);
+void e_selection_model_simple_delete_rows
+ (ESelectionModelSimple *selection,
+ gint row,
+ gint count);
+void e_selection_model_simple_move_row
+ (ESelectionModelSimple *selection,
+ gint old_row,
+ gint new_row);
+void e_selection_model_simple_set_row_count
+ (ESelectionModelSimple *selection,
+ gint row_count);
G_END_DECLS
-#endif /* _E_SELECTION_MODEL_SIMPLE_H_ */
+#endif /* E_SELECTION_MODEL_SIMPLE_H */
diff --git a/e-util/e-selection-model.c b/e-util/e-selection-model.c
index 4c553f4..ddd2a10 100644
--- a/e-util/e-selection-model.c
+++ b/e-util/e-selection-model.c
@@ -205,7 +205,7 @@ e_selection_model_class_init (ESelectionModelClass *class)
"sorter",
"Sorter",
NULL,
- E_SORTER_TYPE,
+ E_TYPE_SORTER,
G_PARAM_READWRITE));
g_object_class_install_property (
diff --git a/e-util/e-selection-model.h b/e-util/e-selection-model.h
index 1d59e28..5450910 100644
--- a/e-util/e-selection-model.h
+++ b/e-util/e-selection-model.h
@@ -29,6 +29,7 @@
#define E_SELECTION_MODEL_H
#include <gtk/gtk.h>
+#include <e-util/e-misc-utils.h>
#include <e-util/e-sorter.h>
/* Standard GObject macros */
@@ -52,12 +53,6 @@
G_BEGIN_DECLS
-#ifndef _E_FOREACH_FUNC_H_
-#define _E_FOREACH_FUNC_H_
-typedef void (*EForeachFunc) (gint model_row,
- gpointer closure);
-#endif
-
typedef struct _ESelectionModel ESelectionModel;
typedef struct _ESelectionModelClass ESelectionModelClass;
@@ -125,7 +120,7 @@ struct _ESelectionModelClass {
void (*selection_changed) (ESelectionModel *esm);
};
-GType e_selection_model_get_type (void);
+GType e_selection_model_get_type (void) G_GNUC_CONST;
void e_selection_model_do_something (ESelectionModel *esm,
guint row,
guint col,
@@ -153,10 +148,10 @@ void e_selection_model_select_as_key_press
/* Virtual functions */
gboolean e_selection_model_is_row_selected
(ESelectionModel *esm,
- gint n);
+ gint n);
void e_selection_model_foreach (ESelectionModel *esm,
- EForeachFunc callback,
- gpointer closure);
+ EForeachFunc callback,
+ gpointer closure);
void e_selection_model_clear (ESelectionModel *esm);
gint e_selection_model_selected_count
(ESelectionModel *esm);
diff --git a/e-util/e-send-options.h b/e-util/e-send-options.h
index 2cd8336..605a0ca 100644
--- a/e-util/e-send-options.h
+++ b/e-util/e-send-options.h
@@ -25,21 +25,36 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef __E_SEND_OPTIONS_DIALOG_H__
-#define __E_SEND_OPTIONS_DIALOG_H__
+#ifndef E_SEND_OPTIONS_DIALOG_H
+#define E_SEND_OPTIONS_DIALOG_H
#include <gtk/gtk.h>
#include <time.h>
-#define E_TYPE_SEND_OPTIONS_DIALOG (e_send_options_dialog_get_type ())
-#define E_SEND_OPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SEND_OPTIONS_DIALOG, ESendOptionsDialog))
-#define E_SEND_OPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SEND_OPTIONS_DIALOG, ESendOptionsDialogClass))
-#define E_IS_SEND_OPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SEND_OPTIONS_DIALOG))
-#define E_IS_SEND_OPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_SEND_OPTIONS_DIALOG))
-
-typedef struct _ESendOptionsDialog ESendOptionsDialog;
-typedef struct _ESendOptionsDialogClass ESendOptionsDialogClass;
-typedef struct _ESendOptionsDialogPrivate ESendOptionsDialogPrivate;
+/* Standard GObject macros */
+#define E_TYPE_SEND_OPTIONS_DIALOG \
+ (e_send_options_dialog_get_type ())
+#define E_SEND_OPTIONS_DIALOG(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_SEND_OPTIONS_DIALOG, ESendOptionsDialog))
+#define E_SEND_OPTIONS_DIALOG_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_SEND_OPTIONS_DIALOG, ESendOptionsDialogClass))
+#define E_IS_SEND_OPTIONS_DIALOG(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_SEND_OPTIONS_DIALOG))
+#define E_IS_SEND_OPTIONS_DIALOG_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_SEND_OPTIONS_DIALOG))
+#define E_SEND_OPTIONS_DIALOG_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_SEND_OPTIONS_DIALOG, ESendOptionsDialogClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ESendOptionsDialog ESendOptionsDialog;
+typedef struct _ESendOptionsDialogClass ESendOptionsDialogClass;
+typedef struct _ESendOptionsDialogPrivate ESendOptionsDialogPrivate;
typedef enum {
E_ITEM_NONE,
@@ -106,26 +121,34 @@ typedef struct {
ESendOptionsStatusTracking *mopts;
ESendOptionsStatusTracking *copts;
ESendOptionsStatusTracking *topts;
-
} ESendOptionsData;
struct _ESendOptionsDialog {
- GObject object;
+ GObject parent;
ESendOptionsData *data;
- /* Private data */
ESendOptionsDialogPrivate *priv;
};
struct _ESendOptionsDialogClass {
GObjectClass parent_class;
- void (* sod_response) (ESendOptionsDialog *sd, gint status);
+
+ void (*sod_response) (ESendOptionsDialog *sod,
+ gint status);
};
-GType e_send_options_dialog_get_type (void);
-ESendOptionsDialog *e_send_options_dialog_new (void);
-void e_send_options_set_need_general_options (ESendOptionsDialog *sod, gboolean needed);
-gboolean e_send_options_get_need_general_options (ESendOptionsDialog *sod);
-gboolean e_send_options_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type type);
-gboolean e_send_options_set_global (ESendOptionsDialog *sod, gboolean set);
-#endif
+GType e_send_options_dialog_get_type (void) G_GNUC_CONST;
+ESendOptionsDialog *
+ e_send_options_dialog_new (void);
+void e_send_options_set_need_general_options
+ (ESendOptionsDialog *sod,
+ gboolean needed);
+gboolean e_send_options_get_need_general_options
+ (ESendOptionsDialog *sod);
+gboolean e_send_options_dialog_run (ESendOptionsDialog *sod,
+ GtkWidget *parent,
+ Item_type type);
+gboolean e_send_options_set_global (ESendOptionsDialog *sod,
+ gboolean set);
+
+#endif /* E_SEND_OPTIONS_DIALOG_H */
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 1c37316..fc411e1 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -38,7 +38,7 @@
G_DEFINE_TYPE (
ESorterArray,
e_sorter_array,
- E_SORTER_TYPE)
+ E_TYPE_SORTER)
static void esa_sort (ESorterArray *esa);
static void esa_backsort (ESorterArray *esa);
@@ -278,7 +278,7 @@ e_sorter_array_new (ECreateCmpCacheFunc create_cmp_cache,
ECompareRowsFunc compare,
gpointer closure)
{
- ESorterArray *esa = g_object_new (E_SORTER_ARRAY_TYPE, NULL);
+ ESorterArray *esa = g_object_new (E_TYPE_SORTER_ARRAY, NULL);
return e_sorter_array_construct (esa, create_cmp_cache, compare, closure);
}
diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h
index 07a32b4..04899d2 100644
--- a/e-util/e-sorter-array.h
+++ b/e-util/e-sorter-array.h
@@ -24,62 +24,78 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _E_SORTER_ARRAY_H_
-#define _E_SORTER_ARRAY_H_
+#ifndef E_SORTER_ARRAY_H
+#define E_SORTER_ARRAY_H
#include <e-util/e-sorter.h>
+/* Standard GObject macros */
+#define E_TYPE_SORTER_ARRAY \
+ (e_sorter_array_get_type ())
+#define E_SORTER_ARRAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_SORTER_ARRAY, ESorterArray))
+#define E_SORTER_ARRAY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_SORTER_ARRAY, ESorterArrayClass))
+#define E_IS_SORTER_ARRAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_SORTER_ARRAY))
+#define E_IS_SORTER_ARRAY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_SORTER_ARRAY))
+#define E_SORTER_ARRAY_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_SORTER_ARRAY, ESorterArrayClass))
+
G_BEGIN_DECLS
-#define E_SORTER_ARRAY_TYPE (e_sorter_array_get_type ())
-#define E_SORTER_ARRAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SORTER_ARRAY_TYPE, ESorterArray))
-#define E_SORTER_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_SORTER_ARRAY_TYPE, ESorterArrayClass))
-#define E_IS_SORTER_ARRAY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_SORTER_ARRAY_TYPE))
-#define E_IS_SORTER_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_SORTER_ARRAY_TYPE))
+typedef struct _ESorterArray ESorterArray;
+typedef struct _ESorterArrayClass ESorterArrayClass;
-#ifndef _E_COMPARE_ROWS_FUNC_H_
-#define _E_COMPARE_ROWS_FUNC_H_
typedef gint (*ECompareRowsFunc) (gint row1,
gint row2,
GHashTable *cmp_cache,
gpointer closure);
-#endif
typedef GHashTable * (*ECreateCmpCacheFunc) (gpointer closure);
-typedef struct {
- ESorter base;
+struct _ESorterArray {
+ ESorter parent;
GHashTable *cmp_cache;
ECreateCmpCacheFunc create_cmp_cache;
ECompareRowsFunc compare;
- gpointer closure;
+ gpointer closure;
- /* If needs_sorting is 0, then model_to_sorted and sorted_to_model are no-ops. */
- gint *sorted;
- gint *backsorted;
+ /* If needs_sorting is 0, then
+ * model_to_sorted and sorted_to_model are no-ops. */
+ gint *sorted;
+ gint *backsorted;
gint rows;
-} ESorterArray;
+};
-typedef struct {
+struct _ESorterArrayClass {
ESorterClass parent_class;
-} ESorterArrayClass;
+};
-GType e_sorter_array_get_type (void);
-ESorterArray *e_sorter_array_construct (ESorterArray *sorter,
+GType e_sorter_array_get_type (void) G_GNUC_CONST;
+ESorterArray * e_sorter_array_construct
+ (ESorterArray *sorter,
ECreateCmpCacheFunc create_cmp_cache,
- ECompareRowsFunc compare,
- gpointer closure);
-ESorterArray *e_sorter_array_new (ECreateCmpCacheFunc create_cmp_cache,
- ECompareRowsFunc compare,
- gpointer closure);
-void e_sorter_array_clean (ESorterArray *esa);
-void e_sorter_array_set_count (ESorterArray *esa,
- gint count);
-void e_sorter_array_append (ESorterArray *esa,
- gint count);
+ ECompareRowsFunc compare,
+ gpointer closure);
+ESorterArray * e_sorter_array_new (ECreateCmpCacheFunc create_cmp_cache,
+ ECompareRowsFunc compare,
+ gpointer closure);
+void e_sorter_array_clean (ESorterArray *sorter);
+void e_sorter_array_set_count
+ (ESorterArray *sorter,
+ gint count);
+void e_sorter_array_append (ESorterArray *sorter,
+ gint count);
G_END_DECLS
-#endif /* _E_SORTER_ARRAY_H_ */
+#endif /* E_SORTER_ARRAY_H */
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index ecb597a..935304a 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -62,7 +62,7 @@ e_sorter_init (ESorter *es)
ESorter *
e_sorter_new (void)
{
- ESorter *es = g_object_new (E_SORTER_TYPE, NULL);
+ ESorter *es = g_object_new (E_TYPE_SORTER, NULL);
return es;
}
diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h
index 94b63f3..45f8c53 100644
--- a/e-util/e-sorter.h
+++ b/e-util/e-sorter.h
@@ -25,58 +25,75 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _E_SORTER_H_
-#define _E_SORTER_H_
+#ifndef E_SORTER_H
+#define E_SORTER_H
#include <glib-object.h>
+/* Standard GObject macros */
+#define E_TYPE_SORTER \
+ (e_sorter_get_type ())
+#define E_SORTER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_SORTER, ESorter))
+#define E_SORTER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_SORTER, ESorterClass))
+#define E_IS_SORTER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_SORTER))
+#define E_IS_SORTER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_SORTER))
+#define E_SORTER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_SORTER, ESorterClass))
+
G_BEGIN_DECLS
-#define E_SORTER_TYPE (e_sorter_get_type ())
-#define E_SORTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SORTER_TYPE, ESorter))
-#define E_SORTER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_SORTER_TYPE, ESorterClass))
-#define E_IS_SORTER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_SORTER_TYPE))
-#define E_IS_SORTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_SORTER_TYPE))
-#define E_SORTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), E_SORTER_TYPE, ESorterClass))
+typedef struct _ESorter ESorter;
+typedef struct _ESorterClass ESorterClass;
-typedef struct {
- GObject base;
-} ESorter;
+struct _ESorter {
+ GObject parent;
+};
-typedef struct {
+struct _ESorterClass {
GObjectClass parent_class;
- gint (*model_to_sorted) (ESorter *sorter,
- gint row);
- gint (*sorted_to_model) (ESorter *sorter,
- gint row);
-
- void (*get_model_to_sorted_array) (ESorter *sorter,
- gint **array,
- gint *count);
- void (*get_sorted_to_model_array) (ESorter *sorter,
- gint **array,
- gint *count);
-
- gboolean (*needs_sorting) (ESorter *sorter);
-} ESorterClass;
-GType e_sorter_get_type (void);
-ESorter *e_sorter_new (void);
+ gint (*model_to_sorted) (ESorter *sorter,
+ gint row);
+ gint (*sorted_to_model) (ESorter *sorter,
+ gint row);
-gint e_sorter_model_to_sorted (ESorter *sorter,
- gint row);
-gint e_sorter_sorted_to_model (ESorter *sorter,
- gint row);
+ void (*get_model_to_sorted_array)
+ (ESorter *sorter,
+ gint **array,
+ gint *count);
+ void (*get_sorted_to_model_array)
+ (ESorter *sorter,
+ gint **array,
+ gint *count);
-void e_sorter_get_model_to_sorted_array (ESorter *sorter,
- gint **array,
- gint *count);
-void e_sorter_get_sorted_to_model_array (ESorter *sorter,
- gint **array,
- gint *count);
+ gboolean (*needs_sorting) (ESorter *sorter);
+};
-gboolean e_sorter_needs_sorting (ESorter *sorter);
+GType e_sorter_get_type (void) G_GNUC_CONST;
+ESorter * e_sorter_new (void);
+gint e_sorter_model_to_sorted (ESorter *sorter,
+ gint row);
+gint e_sorter_sorted_to_model (ESorter *sorter,
+ gint row);
+void e_sorter_get_model_to_sorted_array
+ (ESorter *sorter,
+ gint **array,
+ gint *count);
+void e_sorter_get_sorted_to_model_array
+ (ESorter *sorter,
+ gint **array,
+ gint *count);
+gboolean e_sorter_needs_sorting (ESorter *sorter);
G_END_DECLS
-#endif /* _E_SORTER_H_ */
+#endif /* E_SORTER_H */
diff --git a/e-util/e-source-combo-box.h b/e-util/e-source-combo-box.h
index d022f4a..6a2cb31 100644
--- a/e-util/e-source-combo-box.h
+++ b/e-util/e-source-combo-box.h
@@ -64,7 +64,7 @@ struct _ESourceComboBoxClass {
GtkComboBoxClass parent_class;
};
-GType e_source_combo_box_get_type (void);
+GType e_source_combo_box_get_type (void) G_GNUC_CONST;
GtkWidget * e_source_combo_box_new (ESourceRegistry *registry,
const gchar *extension_name);
ESourceRegistry *
diff --git a/e-util/e-source-selector-dialog.h b/e-util/e-source-selector-dialog.h
index eae45ba..d787934 100644
--- a/e-util/e-source-selector-dialog.h
+++ b/e-util/e-source-selector-dialog.h
@@ -65,7 +65,7 @@ struct _ESourceSelectorDialogClass {
GtkDialogClass parent_class;
};
-GType e_source_selector_dialog_get_type (void);
+GType e_source_selector_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * e_source_selector_dialog_new (GtkWindow *parent,
ESourceRegistry *registry,
const gchar *extension_name);
diff --git a/e-util/e-source-selector.h b/e-util/e-source-selector.h
index d4d9228..37ce0ef 100644
--- a/e-util/e-source-selector.h
+++ b/e-util/e-source-selector.h
@@ -89,7 +89,7 @@ struct _ESourceSelectorClass {
gpointer padding3;
};
-GType e_source_selector_get_type (void);
+GType e_source_selector_get_type (void) G_GNUC_CONST;
GtkWidget * e_source_selector_new (ESourceRegistry *registry,
const gchar *extension_name);
ESourceRegistry *
diff --git a/e-util/e-spell-entry.h b/e-util/e-spell-entry.h
index 07c4c0d..5da4696 100644
--- a/e-util/e-spell-entry.h
+++ b/e-util/e-spell-entry.h
@@ -25,38 +25,49 @@
#include <gtk/gtk.h>
-#define E_TYPE_SPELL_ENTRY (e_spell_entry_get_type())
-#define E_SPELL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), E_TYPE_SPELL_ENTRY, ESpellEntry))
-#define E_SPELL_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPELL_ENTRY, ESpellEntryClass))
-#define E_IS_SPELL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), E_TYPE_SPELL_ENTRY))
-#define E_IS_SPELL_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), E_TYPE_SPELL_ENTRY))
-#define E_SPELL_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), E_TYPE_SPELL_ENTRY, ESpellEntryClass))
+/* Standard GObject macros */
+#define E_TYPE_SPELL_ENTRY \
+ (e_spell_entry_get_type())
+#define E_SPELL_ENTRY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_SPELL_ENTRY, ESpellEntry))
+#define E_SPELL_ENTRY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_SPELL_ENTRY, ESpellEntryClass))
+#define E_IS_SPELL_ENTRY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_SPELL_ENTRY))
+#define E_IS_SPELL_ENTRY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_SPELL_ENTRY))
+#define E_SPELL_ENTRY_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_SPELL_ENTRY, ESpellEntryClass))
G_BEGIN_DECLS
-typedef struct _ESpellEntry ESpellEntry;
-typedef struct _ESpellEntryClass ESpellEntryClass;
-typedef struct _ESpellEntryPrivate ESpellEntryPrivate;
-
-struct _ESpellEntry
-{
- GtkEntry parent_object;
+typedef struct _ESpellEntry ESpellEntry;
+typedef struct _ESpellEntryClass ESpellEntryClass;
+typedef struct _ESpellEntryPrivate ESpellEntryPrivate;
+struct _ESpellEntry {
+ GtkEntry parent;
ESpellEntryPrivate *priv;
};
-struct _ESpellEntryClass
-{
+struct _ESpellEntryClass {
GtkEntryClass parent_class;
};
-GType e_spell_entry_get_type (void);
-GtkWidget * e_spell_entry_new (void);
-void e_spell_entry_set_languages (ESpellEntry *spell_entry,
- GList *languages);
-gboolean e_spell_entry_get_checking_enabled (ESpellEntry *spell_entry);
-void e_spell_entry_set_checking_enabled (ESpellEntry *spell_entry,
- gboolean enable_checking);
+GType e_spell_entry_get_type (void) G_GNUC_CONST;
+GtkWidget * e_spell_entry_new (void);
+void e_spell_entry_set_languages (ESpellEntry *spell_entry,
+ GList *languages);
+gboolean e_spell_entry_get_checking_enabled
+ (ESpellEntry *spell_entry);
+void e_spell_entry_set_checking_enabled
+ (ESpellEntry *spell_entry,
+ gboolean enable_checking);
G_END_DECLS
diff --git a/e-util/e-stock-request.h b/e-util/e-stock-request.h
index b482d7f..bfca1ff 100644
--- a/e-util/e-stock-request.h
+++ b/e-util/e-stock-request.h
@@ -62,7 +62,7 @@ struct _EStockRequestClass {
SoupRequestClass parent;
};
-GType e_stock_request_get_type (void) G_GNUC_CONST;
+GType e_stock_request_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/e-util/e-table-config.h b/e-util/e-table-config.h
index 7fc74d9..ffbab72 100644
--- a/e-util/e-table-config.h
+++ b/e-util/e-table-config.h
@@ -122,7 +122,7 @@ ETableConfig * e_table_config_new (const gchar *header,
ETableSpecification *spec,
ETableState *state,
GtkWindow *parent_window);
-ETableConfig *e_table_config_construct (ETableConfig *etco,
+ETableConfig * e_table_config_construct (ETableConfig *etco,
const gchar *header,
ETableSpecification *spec,
ETableState *state,
diff --git a/e-util/e-table-extras.h b/e-util/e-table-extras.h
index 93acc4c..bc48b50 100644
--- a/e-util/e-table-extras.h
+++ b/e-util/e-table-extras.h
@@ -75,7 +75,8 @@ ECell * e_table_extras_get_cell (ETableExtras *extras,
void e_table_extras_add_compare (ETableExtras *extras,
const gchar *id,
GCompareDataFunc compare);
-GCompareDataFunc e_table_extras_get_compare (ETableExtras *extras,
+GCompareDataFunc
+ e_table_extras_get_compare (ETableExtras *extras,
const gchar *id);
void e_table_extras_add_search (ETableExtras *extras,
const gchar *id,
diff --git a/e-util/e-table-field-chooser-item.h b/e-util/e-table-field-chooser-item.h
index 08bfeb6..aefc8bd 100644
--- a/e-util/e-table-field-chooser-item.h
+++ b/e-util/e-table-field-chooser-item.h
@@ -58,32 +58,34 @@ typedef struct _ETableFieldChooserItem ETableFieldChooserItem;
typedef struct _ETableFieldChooserItemClass ETableFieldChooserItemClass;
struct _ETableFieldChooserItem {
- GnomeCanvasItem parent;
+ GnomeCanvasItem parent;
- ETableHeader *full_header;
- ETableHeader *header;
- ETableHeader *combined_header;
+ ETableHeader *full_header;
+ ETableHeader *header;
+ ETableHeader *combined_header;
- gdouble height, width;
+ gdouble height, width;
PangoFontDescription *font_desc;
/*
* Ids
*/
- gint full_header_structure_change_id, full_header_dimension_change_id;
- gint table_header_structure_change_id, table_header_dimension_change_id;
+ gint full_header_structure_change_id;
+ gint full_header_dimension_change_id;
+ gint table_header_structure_change_id;
+ gint table_header_dimension_change_id;
- gchar *dnd_code;
+ gchar *dnd_code;
/*
* For dragging columns
*/
- guint maybe_drag : 1;
- gint click_x, click_y;
- gint drag_col;
- guint drag_data_get_id;
- guint drag_end_id;
+ guint maybe_drag : 1;
+ gint click_x, click_y;
+ gint drag_col;
+ guint drag_data_get_id;
+ guint drag_end_id;
};
struct _ETableFieldChooserItemClass {
diff --git a/e-util/e-table-group-container.h b/e-util/e-table-group-container.h
index 3f6fb03..2f1457d 100644
--- a/e-util/e-table-group-container.h
+++ b/e-util/e-table-group-container.h
@@ -67,8 +67,8 @@ struct _ETableGroupContainer {
/*
* The ETableCol used to group this set
*/
- ETableCol *ecol;
- gint ascending;
+ ETableCol *ecol;
+ gint ascending;
/*
* List of ETableGroups we stack
diff --git a/e-util/e-table-header-item.h b/e-util/e-table-header-item.h
index 1cd0c71..a0b594a 100644
--- a/e-util/e-table-header-item.h
+++ b/e-util/e-table-header-item.h
@@ -77,7 +77,7 @@ struct _ETableHeaderItem {
gint resize_start_pos;
gint resize_min_width;
- gpointer resize_guide;
+ gpointer resize_guide;
gint group_indent_width;
diff --git a/e-util/e-table-item.h b/e-util/e-table-item.h
index 09fdab9..04629b4 100644
--- a/e-util/e-table-item.h
+++ b/e-util/e-table-item.h
@@ -62,113 +62,113 @@ typedef struct _ETableItem ETableItem;
typedef struct _ETableItemClass ETableItemClass;
struct _ETableItem {
- GnomeCanvasItem parent;
- ETableModel *table_model;
- ETableHeader *header;
+ GnomeCanvasItem parent;
+ ETableModel *table_model;
+ ETableHeader *header;
- ETableModel *source_model;
+ ETableModel *source_model;
ESelectionModel *selection;
- gint minimum_width, width, height;
+ gint minimum_width, width, height;
- gint cols, rows;
+ gint cols, rows;
- gint click_count;
+ gint click_count;
/*
* Ids for the signals we connect to
*/
- gint header_dim_change_id;
- gint header_structure_change_id;
- gint header_request_width_id;
- gint table_model_pre_change_id;
- gint table_model_no_change_id;
- gint table_model_change_id;
- gint table_model_row_change_id;
- gint table_model_cell_change_id;
- gint table_model_rows_inserted_id;
- gint table_model_rows_deleted_id;
-
- gint selection_change_id;
- gint selection_row_change_id;
- gint cursor_change_id;
- gint cursor_activated_id;
-
- guint cursor_idle_id;
+ gint header_dim_change_id;
+ gint header_structure_change_id;
+ gint header_request_width_id;
+ gint table_model_pre_change_id;
+ gint table_model_no_change_id;
+ gint table_model_change_id;
+ gint table_model_row_change_id;
+ gint table_model_cell_change_id;
+ gint table_model_rows_inserted_id;
+ gint table_model_rows_deleted_id;
+
+ gint selection_change_id;
+ gint selection_row_change_id;
+ gint cursor_change_id;
+ gint cursor_activated_id;
+
+ guint cursor_idle_id;
/* View row, -1 means unknown */
- gint old_cursor_row;
+ gint old_cursor_row;
- guint alternating_row_colors : 1;
- guint horizontal_draw_grid : 1;
- guint vertical_draw_grid : 1;
- guint draw_focus : 1;
- guint uniform_row_height : 1;
- guint cell_views_realized : 1;
+ guint alternating_row_colors : 1;
+ guint horizontal_draw_grid : 1;
+ guint vertical_draw_grid : 1;
+ guint draw_focus : 1;
+ guint uniform_row_height : 1;
+ guint cell_views_realized : 1;
- guint needs_redraw : 1;
- guint needs_compute_height : 1;
- guint needs_compute_width : 1;
+ guint needs_redraw : 1;
+ guint needs_compute_height : 1;
+ guint needs_compute_width : 1;
- guint uses_source_model : 1;
+ guint uses_source_model : 1;
- guint in_key_press : 1;
+ guint in_key_press : 1;
- guint maybe_in_drag : 1;
- guint in_drag : 1;
- guint grabbed : 1;
+ guint maybe_in_drag : 1;
+ guint in_drag : 1;
+ guint grabbed : 1;
- guint maybe_did_something : 1;
+ guint maybe_did_something : 1;
- guint cursor_on_screen : 1;
- guint gtk_grabbed : 1;
+ guint cursor_on_screen : 1;
+ guint gtk_grabbed : 1;
- guint queue_show_cursor : 1;
- guint grab_cancelled : 1;
+ guint queue_show_cursor : 1;
+ guint grab_cancelled : 1;
- gint frozen_count;
+ gint frozen_count;
- gint cursor_x1;
- gint cursor_y1;
- gint cursor_x2;
- gint cursor_y2;
+ gint cursor_x1;
+ gint cursor_y1;
+ gint cursor_x2;
+ gint cursor_y2;
- gint drag_col;
- gint drag_row;
- gint drag_x;
- gint drag_y;
- guint drag_state;
+ gint drag_col;
+ gint drag_row;
+ gint drag_x;
+ gint drag_y;
+ guint drag_state;
/*
* Realized views, per column
*/
- ECellView **cell_views;
- gint n_cells;
+ ECellView **cell_views;
+ gint n_cells;
- gint *height_cache;
- gint uniform_row_height_cache;
- gint height_cache_idle_id;
- gint height_cache_idle_count;
+ gint *height_cache;
+ gint uniform_row_height_cache;
+ gint height_cache_idle_id;
+ gint height_cache_idle_count;
/*
* Lengh Threshold: above this, we stop computing correctly
* the size
*/
- gint length_threshold;
+ gint length_threshold;
- gint row_guess;
- ECursorMode cursor_mode;
+ gint row_guess;
+ ECursorMode cursor_mode;
- gint motion_col, motion_row;
+ gint motion_col, motion_row;
/*
* During editing
*/
- gint editing_col, editing_row;
- void *edit_ctx;
+ gint editing_col, editing_row;
+ void *edit_ctx;
- gint save_col, save_row;
- void *save_state;
+ gint save_col, save_row;
+ void *save_state;
gint grabbed_col, grabbed_row;
gint grabbed_count;
diff --git a/e-util/e-table-memory-callbacks.h b/e-util/e-table-memory-callbacks.h
index a71cac1..08c346f 100644
--- a/e-util/e-table-memory-callbacks.h
+++ b/e-util/e-table-memory-callbacks.h
@@ -107,18 +107,18 @@ typedef gchar * (*ETableMemoryCallbacksValueToStringFn)
struct _ETableMemoryCallbacks {
ETableMemory parent;
- ETableMemoryCallbacksColumnCountFn col_count;
- ETableMemoryCallbacksAppendRowFn append_row;
+ ETableMemoryCallbacksColumnCountFn col_count;
+ ETableMemoryCallbacksAppendRowFn append_row;
- ETableMemoryCallbacksValueAtFn value_at;
- ETableMemoryCallbacksSetValueAtFn set_value_at;
- ETableMemoryCallbacksIsCellEditableFn is_cell_editable;
+ ETableMemoryCallbacksValueAtFn value_at;
+ ETableMemoryCallbacksSetValueAtFn set_value_at;
+ ETableMemoryCallbacksIsCellEditableFn is_cell_editable;
- ETableMemoryCallbacksDuplicateValueFn duplicate_value;
- ETableMemoryCallbacksFreeValueFn free_value;
+ ETableMemoryCallbacksDuplicateValueFn duplicate_value;
+ ETableMemoryCallbacksFreeValueFn free_value;
ETableMemoryCallbacksInitializeValueFn initialize_value;
- ETableMemoryCallbacksValueIsEmptyFn value_is_empty;
- ETableMemoryCallbacksValueToStringFn value_to_string;
+ ETableMemoryCallbacksValueIsEmptyFn value_is_empty;
+ ETableMemoryCallbacksValueToStringFn value_to_string;
gpointer data;
};
diff --git a/e-util/e-table-memory-store.h b/e-util/e-table-memory-store.h
index c8167f8..89625d2 100644
--- a/e-util/e-table-memory-store.h
+++ b/e-util/e-table-memory-store.h
@@ -62,17 +62,17 @@ typedef enum {
} ETableMemoryStoreColumnType;
typedef struct {
- ETableMemoryCallbacksDuplicateValueFn duplicate_value;
- ETableMemoryCallbacksFreeValueFn free_value;
+ ETableMemoryCallbacksDuplicateValueFn duplicate_value;
+ ETableMemoryCallbacksFreeValueFn free_value;
ETableMemoryCallbacksInitializeValueFn initialize_value;
- ETableMemoryCallbacksValueIsEmptyFn value_is_empty;
- ETableMemoryCallbacksValueToStringFn value_to_string;
+ ETableMemoryCallbacksValueIsEmptyFn value_is_empty;
+ ETableMemoryCallbacksValueToStringFn value_to_string;
} ETableMemoryStoreCustomColumn;
typedef struct {
- ETableMemoryStoreColumnType type;
+ ETableMemoryStoreColumnType type;
ETableMemoryStoreCustomColumn custom;
- guint editable : 1;
+ guint editable : 1;
} ETableMemoryStoreColumnInfo;
#define E_TABLE_MEMORY_STORE_TERMINATOR \
diff --git a/e-util/e-table-selection-model.c b/e-util/e-table-selection-model.c
index abe4b0c..bea7287 100644
--- a/e-util/e-table-selection-model.c
+++ b/e-util/e-table-selection-model.c
@@ -32,7 +32,10 @@
#include "e-table-selection-model.h"
-G_DEFINE_TYPE (ETableSelectionModel, e_table_selection_model, E_SELECTION_MODEL_ARRAY_TYPE)
+G_DEFINE_TYPE (
+ ETableSelectionModel,
+ e_table_selection_model,
+ E_TYPE_SELECTION_MODEL_ARRAY)
static gint etsm_get_row_count (ESelectionModelArray *esm);
diff --git a/e-util/e-table-sorter.c b/e-util/e-table-sorter.c
index 5fdc077..f67b635 100644
--- a/e-util/e-table-sorter.c
+++ b/e-util/e-table-sorter.c
@@ -41,7 +41,7 @@ enum {
/* workaround for avoiding API breakage */
#define ets_get_type e_table_sorter_get_type
-G_DEFINE_TYPE (ETableSorter, ets, E_SORTER_TYPE)
+G_DEFINE_TYPE (ETableSorter, ets, E_TYPE_SORTER)
#define INCREMENT_AMOUNT 100
diff --git a/e-util/e-table.h b/e-util/e-table.h
index 8370e44..3509888 100644
--- a/e-util/e-table.h
+++ b/e-util/e-table.h
@@ -293,7 +293,7 @@ GtkWidget * e_table_new_from_spec_file (ETableModel *etm,
gchar * e_table_get_state (ETable *e_table);
void e_table_save_state (ETable *e_table,
const gchar *filename);
-ETableState *e_table_get_state_object (ETable *e_table);
+ETableState * e_table_get_state_object (ETable *e_table);
/* note that it is more efficient to provide the state at creation time */
void e_table_set_state (ETable *e_table,
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index c734cf8..1fa8c6f 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -37,7 +37,7 @@ static gint e_text_event_processor_emacs_like_event
G_DEFINE_TYPE (
ETextEventProcessorEmacsLike,
e_text_event_processor_emacs_like,
- E_TEXT_EVENT_PROCESSOR_TYPE)
+ E_TYPE_TEXT_EVENT_PROCESSOR)
static const ETextEventProcessorCommand control_keys[26] = {
{ E_TEP_START_OF_LINE, E_TEP_MOVE, 0, "" }, /* a */
@@ -560,6 +560,6 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep,
ETextEventProcessor *
e_text_event_processor_emacs_like_new (void)
{
- return g_object_new (E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, NULL);
+ return g_object_new (E_TYPE_TEXT_EVENT_PROCESSOR_EMACS_LIKE, NULL);
}
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index 5a8890d..ed6df5b 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -21,46 +21,58 @@
*
*/
+/* ETextEventProcessorEmacsLike - Turns events on a text widget into commands.
+ * Uses an emacs-ish interface. */
+
#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
-#define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
+#ifndef E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H
+#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H
#include <e-util/e-text-event-processor.h>
-G_BEGIN_DECLS
-
-/* ETextEventProcessorEmacsLike - Turns events on a text widget into commands. Uses an emacs-ish interface.
- *
- */
+/* Standard GObject macros */
+#define E_TYPE_TEXT_EVENT_PROCESSOR_EMACS_LIKE \
+ (e_text_event_processor_emacs_like_get_type ())
+#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_TEXT_EVENT_PROCESSOR_EMACS_LIKE, ETextEventProcessorEmacsLike))
+#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_TEXT_EVENT_PROCESSOR_EMACS_LIKE, ETextEventProcessorEmacsLikeClass))
+#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_TEXT_EVENT_PROCESSOR_EMACS_LIKE))
+#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_TEXT_EVENT_PROCESSOR_EMACS_LIKE))
+#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_TEXT_EVENT_PROCESSOR_EMACS_LIKE, ETextEventProcessorEmacsLikeClass))
-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE (e_text_event_processor_emacs_like_get_type ())
-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLike))
-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLikeClass))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
+G_BEGIN_DECLS
typedef struct _ETextEventProcessorEmacsLike ETextEventProcessorEmacsLike;
typedef struct _ETextEventProcessorEmacsLikeClass ETextEventProcessorEmacsLikeClass;
-struct _ETextEventProcessorEmacsLike
-{
+struct _ETextEventProcessorEmacsLike {
ETextEventProcessor parent;
/* object specific fields */
guint mouse_down : 1;
};
-struct _ETextEventProcessorEmacsLikeClass
-{
+struct _ETextEventProcessorEmacsLikeClass {
ETextEventProcessorClass parent_class;
};
-GType e_text_event_processor_emacs_like_get_type (void);
-ETextEventProcessor *e_text_event_processor_emacs_like_new (void);
+GType e_text_event_processor_emacs_like_get_type
+ (void) G_GNUC_CONST;
+ETextEventProcessor *
+ e_text_event_processor_emacs_like_new (void);
G_END_DECLS
-#endif /* __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ */
+#endif /* E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H */
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
index cf7da4f..ab60c11 100644
--- a/e-util/e-text-event-processor-types.h
+++ b/e-util/e-text-event-processor-types.h
@@ -25,8 +25,8 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef __E_TEXT_EVENT_PROCESSOR_TYPES_H__
-#define __E_TEXT_EVENT_PROCESSOR_TYPES_H__
+#ifndef E_TEXT_EVENT_PROCESSOR_TYPES_H
+#define E_TEXT_EVENT_PROCESSOR_TYPES_H
#include <gtk/gtk.h>
@@ -133,4 +133,4 @@ typedef enum _ETextEventProcessorCaps {
G_END_DECLS
-#endif /* __E_TEXT_EVENT_PROCESSOR_TYPES_H__ */
+#endif /* E_TEXT_EVENT_PROCESSOR_TYPES_H */
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index 203e2de..8eef9fc 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -20,53 +20,67 @@
*
*/
+/* ETextEventProcessor - Turns events on a text widget into commands. */
+
#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef __E_TEXT_EVENT_PROCESSOR_H__
-#define __E_TEXT_EVENT_PROCESSOR_H__
+#ifndef E_TEXT_EVENT_PROCESSOR_H
+#define E_TEXT_EVENT_PROCESSOR_H
#include <gtk/gtk.h>
#include <e-util/e-text-event-processor-types.h>
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TEXT_EVENT_PROCESSOR \
+ (e_text_event_processor_get_type ())
+#define E_TEXT_EVENT_PROCESSOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_TEXT_EVENT_PROCESSOR, ETextEventProcessor))
+#define E_TEXT_EVENT_PROCESSOR_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_TEXT_EVENT_PROCESSOR, ETextEventProcessorClass))
+#define E_IS_TEXT_EVENT_PROCESSOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_TEXT_EVENT_PROCESSOR))
+#define E_IS_TEXT_EVENT_PROCESSOR_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((obj), E_TYPE_TEXT_EVENT_PROCESSOR))
+#define E_TEXT_EVENT_PROCESSOR_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_TEXT_EVENT_PROCESSOR, ETextEventProcessorClass))
-/* ETextEventProcessor - Turns events on a text widget into commands.
- *
- */
+G_BEGIN_DECLS
-#define E_TEXT_EVENT_PROCESSOR_TYPE (e_text_event_processor_get_type ())
-#define E_TEXT_EVENT_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessor))
-#define E_TEXT_EVENT_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessorClass))
-#define E_IS_TEXT_EVENT_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
-#define E_IS_TEXT_EVENT_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
-#define E_TEXT_EVENT_PROCESSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessorClass))
-typedef struct _ETextEventProcessor ETextEventProcessor;
+typedef struct _ETextEventProcessor ETextEventProcessor;
typedef struct _ETextEventProcessorClass ETextEventProcessorClass;
-struct _ETextEventProcessor
-{
+struct _ETextEventProcessor {
GObject parent;
/* object specific fields */
guint allow_newlines : 1;
};
-struct _ETextEventProcessorClass
-{
+struct _ETextEventProcessorClass {
GObjectClass parent_class;
/* signals */
- void (* command) (ETextEventProcessor *tep, ETextEventProcessorCommand *command);
+ void (*command) (ETextEventProcessor *tep,
+ ETextEventProcessorCommand *command);
/* virtual functions */
- gint (* event) (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
+ gint (*event) (ETextEventProcessor *tep,
+ ETextEventProcessorEvent *event);
};
-GType e_text_event_processor_get_type (void);
-gint e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
+GType e_text_event_processor_get_type
+ (void) G_GNUC_CONST;
+gint e_text_event_processor_handle_event
+ (ETextEventProcessor *tep,
+ ETextEventProcessorEvent *event);
G_END_DECLS
-#endif /* __E_TEXT_EVENT_PROCESSOR_H__ */
+#endif /* E_TEXT_EVENT_PROCESSOR_H */
diff --git a/e-util/e-text-model.h b/e-util/e-text-model.h
index 3426c18..4b0914e 100644
--- a/e-util/e-text-model.h
+++ b/e-util/e-text-model.h
@@ -29,14 +29,26 @@
#include <glib-object.h>
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TEXT_MODEL \
+ (e_text_model_get_type ())
+#define E_TEXT_MODEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_TEXT_MODEL, ETextModel))
+#define E_TEXT_MODEL_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_TEXT_MODEL, ETextModelClass))
+#define E_IS_TEXT_MODEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_TEXT_MODEL))
+#define E_IS_TEXT_MODEL_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_TEXT_MODEL))
+#define E_TEXT_MODEL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_TEXT_MODEL_TYPE, ETextModelClass))
-#define E_TYPE_TEXT_MODEL (e_text_model_get_type ())
-#define E_TEXT_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TEXT_MODEL, ETextModel))
-#define E_TEXT_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT_MODEL, ETextModelClass))
-#define E_IS_TEXT_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TEXT_MODEL))
-#define E_IS_TEXT_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT_MODEL))
-#define E_TEXT_MODEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), E_TYPE_TEXT_MODEL_TYPE, ETextModelClass))
+G_BEGIN_DECLS
typedef struct _ETextModel ETextModel;
typedef struct _ETextModelClass ETextModelClass;
@@ -46,7 +58,6 @@ typedef gint (*ETextModelReposFn) (gint, gpointer);
struct _ETextModel {
GObject item;
-
ETextModelPrivate *priv;
};
@@ -54,59 +65,91 @@ struct _ETextModelClass {
GObjectClass parent_class;
/* Signal */
- void (* changed) (ETextModel *model);
- void (* reposition) (ETextModel *model, ETextModelReposFn fn, gpointer repos_fn_data);
- void (* object_activated) (ETextModel *model, gint obj_num);
- void (* cancel_completion) (ETextModel *model);
+ void (*changed) (ETextModel *model);
+ void (*reposition) (ETextModel *model,
+ ETextModelReposFn fn,
+ gpointer repos_fn_data);
+ void (*object_activated) (ETextModel *model,
+ gint obj_num);
+ void (*cancel_completion) (ETextModel *model);
/* Virtual methods */
- gint (* validate_pos) (ETextModel *model, gint pos);
-
- const gchar *(* get_text) (ETextModel *model);
- gint (* get_text_len) (ETextModel *model);
- void (* set_text) (ETextModel *model, const gchar *text);
- void (* insert) (ETextModel *model, gint position, const gchar *text);
- void (* insert_length) (ETextModel *model, gint position, const gchar *text, gint length);
- void (* delete) (ETextModel *model, gint position, gint length);
-
- void (* objectify) (ETextModel *model);
- gint (* obj_count) (ETextModel *model);
- const gchar *(* get_nth_obj) (ETextModel *model, gint n, gint *len);
- gint (* obj_at_offset) (ETextModel *model, gint offset);
+ gint (*validate_pos) (ETextModel *model,
+ gint pos);
+
+ const gchar * (*get_text) (ETextModel *model);
+ gint (*get_text_len) (ETextModel *model);
+ void (*set_text) (ETextModel *model,
+ const gchar *text);
+ void (*insert) (ETextModel *model,
+ gint position,
+ const gchar *text);
+ void (*insert_length) (ETextModel *model,
+ gint position,
+ const gchar *text,
+ gint length);
+ void (*delete) (ETextModel *model,
+ gint position,
+ gint length);
+
+ void (*objectify) (ETextModel *model);
+ gint (*obj_count) (ETextModel *model);
+ const gchar * (*get_nth_obj) (ETextModel *model,
+ gint n,
+ gint *len);
+ gint (*obj_at_offset) (ETextModel *model,
+ gint offset);
};
-GType e_text_model_get_type (void);
-
-ETextModel *e_text_model_new (void);
-
-void e_text_model_changed (ETextModel *model);
-void e_text_model_cancel_completion (ETextModel *model);
-
-void e_text_model_reposition (ETextModel *model, ETextModelReposFn fn, gpointer repos_data);
-gint e_text_model_validate_position (ETextModel *model, gint pos);
-
-/* Functions for manipulating the underlying text. */
-
-const gchar *e_text_model_get_text (ETextModel *model);
-gint e_text_model_get_text_length (ETextModel *model);
-void e_text_model_set_text (ETextModel *model, const gchar *text);
-void e_text_model_insert (ETextModel *model, gint position, const gchar *text);
-void e_text_model_insert_length (ETextModel *model, gint position, const gchar *text, gint length);
-void e_text_model_prepend (ETextModel *model, const gchar *text);
-void e_text_model_append (ETextModel *model, const gchar *text);
-void e_text_model_delete (ETextModel *model, gint position, gint length);
-
-/* Functions for accessing embedded objects. */
-
-gint e_text_model_object_count (ETextModel *model);
-const gchar *e_text_model_get_nth_object (ETextModel *model, gint n, gint *len);
-gchar *e_text_model_strdup_nth_object (ETextModel *model, gint n);
-void e_text_model_get_nth_object_bounds (ETextModel *model, gint n, gint *start_pos, gint *end_pos);
-gint e_text_model_get_object_at_offset (ETextModel *model, gint offset);
-gint e_text_model_get_object_at_pointer (ETextModel *model, const gchar *c);
-void e_text_model_activate_nth_object (ETextModel *model, gint n);
+GType e_text_model_get_type (void) G_GNUC_CONST;
+ETextModel * e_text_model_new (void);
+void e_text_model_changed (ETextModel *model);
+void e_text_model_cancel_completion (ETextModel *model);
+void e_text_model_reposition (ETextModel *model,
+ ETextModelReposFn fn,
+ gpointer repos_data);
+gint e_text_model_validate_position (ETextModel *model,
+ gint pos);
+const gchar * e_text_model_get_text (ETextModel *model);
+gint e_text_model_get_text_length (ETextModel *model);
+void e_text_model_set_text (ETextModel *model,
+ const gchar *text);
+void e_text_model_insert (ETextModel *model,
+ gint position,
+ const gchar *text);
+void e_text_model_insert_length (ETextModel *model,
+ gint position,
+ const gchar *text,
+ gint length);
+void e_text_model_prepend (ETextModel *model,
+ const gchar *text);
+void e_text_model_append (ETextModel *model,
+ const gchar *text);
+void e_text_model_delete (ETextModel *model,
+ gint position,
+ gint length);
+gint e_text_model_object_count (ETextModel *model);
+const gchar * e_text_model_get_nth_object (ETextModel *model,
+ gint n,
+ gint *len);
+gchar * e_text_model_strdup_nth_object (ETextModel *model,
+ gint n);
+void e_text_model_get_nth_object_bounds
+ (ETextModel *model,
+ gint n,
+ gint *start_pos,
+ gint *end_pos);
+gint e_text_model_get_object_at_offset
+ (ETextModel *model,
+ gint offset);
+gint e_text_model_get_object_at_pointer
+ (ETextModel *model,
+ const gchar *c);
+void e_text_model_activate_nth_object
+ (ETextModel *model,
+ gint n);
G_END_DECLS
-#endif
+#endif /* E_TEXT_MODEL_H */
diff --git a/e-util/e-text.c b/e-util/e-text.c
index d23deca..574f5e1 100644
--- a/e-util/e-text.c
+++ b/e-util/e-text.c
@@ -2985,7 +2985,7 @@ e_text_class_init (ETextClass *class)
"event_processor",
"Event Processor",
"Event Processor",
- E_TEXT_EVENT_PROCESSOR_TYPE,
+ E_TYPE_TEXT_EVENT_PROCESSOR,
G_PARAM_READWRITE));
g_object_class_install_property (
diff --git a/e-util/e-text.h b/e-util/e-text.h
index 40e92bf..921ee4d 100644
--- a/e-util/e-text.h
+++ b/e-util/e-text.h
@@ -48,8 +48,6 @@
#include <e-util/e-text-event-processor.h>
#include <e-util/e-text-model.h>
-G_BEGIN_DECLS
-
/* Text item for the canvas. Text items are positioned by an anchor point and an anchor direction.
*
* A clipping rectangle may be specified for the text. The rectangle is anchored at the text's anchor
@@ -89,11 +87,26 @@ G_BEGIN_DECLS
* max_lines gint RW Number of lines possible when doing line wrap.
*/
-#define E_TYPE_TEXT (e_text_get_type ())
-#define E_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TEXT, EText))
-#define E_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT, ETextClass))
-#define E_IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TEXT))
-#define E_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT))
+/* Standard GObject macros */
+#define E_TYPE_TEXT \
+ (e_text_get_type ())
+#define E_TEXT(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_TEXT, EText))
+#define E_TEXT_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_TEXT, ETextClass))
+#define E_IS_TEXT(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_TEXT))
+#define E_IS_TEXT_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_TEXT))
+#define E_TEXT_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_TEXT, ETextClass))
+
+G_BEGIN_DECLS
typedef struct _EText EText;
typedef struct _ETextClass ETextClass;
@@ -196,16 +209,16 @@ struct _EText {
gint dbl_timeout; /* Double click timeout */
gint tpl_timeout; /* Triple click timeout */
- gint last_type_request; /* Last selection type requested. */
- guint32 last_time_request; /* The time of the last selection request. */
- GdkAtom last_selection_request; /* The time of the last selection request. */
- GList *queued_requests; /* Queued selection requests. */
+ gint last_type_request; /* Last selection type requested. */
+ guint32 last_time_request; /* The time of the last selection request. */
+ GdkAtom last_selection_request; /* The time of the last selection request. */
+ GList *queued_requests; /* Queued selection requests. */
GtkIMContext *im_context;
- gboolean need_im_reset;
- gboolean im_context_signals_registered;
+ gboolean need_im_reset;
+ gboolean im_context_signals_registered;
- gboolean handle_popup;
+ gboolean handle_popup;
PangoFontDescription *font_desc;
};
@@ -213,24 +226,29 @@ struct _EText {
struct _ETextClass {
GnomeCanvasItemClass parent_class;
- void (* changed) (EText *text);
- void (* activate) (EText *text);
- void (* keypress) (EText *text, guint keyval, guint state);
- void (* populate_popup) (EText *text, GdkEvent *button_event, gint pos, GtkMenu *menu);
- void (* style_set) (EText *text, GtkStyle *previous_style);
+ void (*changed) (EText *text);
+ void (*activate) (EText *text);
+ void (*keypress) (EText *text,
+ guint keyval,
+ guint state);
+ void (*populate_popup) (EText *text,
+ GdkEvent *button_event,
+ gint pos,
+ GtkMenu *menu);
+ void (*style_set) (EText *text,
+ GtkStyle *previous_style);
};
-/* Standard Gtk function */
-GType e_text_get_type (void);
-void e_text_cancel_editing (EText *text);
-void e_text_stop_editing (EText *text);
-
-void e_text_delete_selection (EText *text);
-void e_text_cut_clipboard (EText *text);
-void e_text_copy_clipboard (EText *text);
-void e_text_paste_clipboard (EText *text);
-void e_text_select_all (EText *text);
+GType e_text_get_type (void) G_GNUC_CONST;
+void e_text_cancel_editing (EText *text);
+void e_text_stop_editing (EText *text);
+void e_text_delete_selection (EText *text);
+void e_text_cut_clipboard (EText *text);
+void e_text_copy_clipboard (EText *text);
+void e_text_paste_clipboard (EText *text);
+void e_text_select_all (EText *text);
G_END_DECLS
-#endif
+#endif /* E_TEXT_H */
+
diff --git a/e-util/e-timezone-dialog.h b/e-util/e-timezone-dialog.h
index df87e80..fbf08f3 100644
--- a/e-util/e-timezone-dialog.h
+++ b/e-util/e-timezone-dialog.h
@@ -64,7 +64,7 @@ struct _ETimezoneDialogClass {
GObjectClass parent_class;
};
-GType e_timezone_dialog_get_type (void);
+GType e_timezone_dialog_get_type (void) G_GNUC_CONST;
ETimezoneDialog *
e_timezone_dialog_construct (ETimezoneDialog *etd);
ETimezoneDialog *
diff --git a/e-util/e-tree-model-generator.h b/e-util/e-tree-model-generator.h
index e85a1ad..7dbb945 100644
--- a/e-util/e-tree-model-generator.h
+++ b/e-util/e-tree-model-generator.h
@@ -69,7 +69,7 @@ struct _ETreeModelGeneratorClass {
GObjectClass parent_class;
};
-GType e_tree_model_generator_get_type (void);
+GType e_tree_model_generator_get_type (void) G_GNUC_CONST;
ETreeModelGenerator *
e_tree_model_generator_new (GtkTreeModel *child_model);
GtkTreeModel * e_tree_model_generator_get_model (ETreeModelGenerator *tree_model_generator);
diff --git a/e-util/e-tree-model.h b/e-util/e-tree-model.h
index 1d02615..56b0474 100644
--- a/e-util/e-tree-model.h
+++ b/e-util/e-tree-model.h
@@ -57,9 +57,6 @@ typedef gpointer ETreePath;
typedef struct _ETreeModel ETreeModel;
typedef struct _ETreeModelClass ETreeModelClass;
-typedef gint (*ETreePathCompareFunc) (ETreeModel *model,
- ETreePath path1,
- ETreePath path2);
typedef gboolean (*ETreePathFunc) (ETreeModel *model,
ETreePath path,
gpointer data);
@@ -222,10 +219,10 @@ gboolean e_tree_model_has_get_node_by_id (ETreeModel *model);
ETreePath e_tree_model_get_node_by_id (ETreeModel *model,
const gchar *save_id);
gboolean e_tree_model_has_change_pending (ETreeModel *model);
-void *e_tree_model_sort_value_at (ETreeModel *etree,
+gpointer e_tree_model_sort_value_at (ETreeModel *etree,
ETreePath node,
gint col);
-void *e_tree_model_value_at (ETreeModel *etree,
+gpointer e_tree_model_value_at (ETreeModel *etree,
ETreePath node,
gint col);
void e_tree_model_set_value_at (ETreeModel *etree,
@@ -235,13 +232,13 @@ void e_tree_model_set_value_at (ETreeModel *etree,
gboolean e_tree_model_node_is_editable (ETreeModel *etree,
ETreePath node,
gint col);
-void *e_tree_model_duplicate_value (ETreeModel *etree,
+gpointer e_tree_model_duplicate_value (ETreeModel *etree,
gint col,
gconstpointer value);
void e_tree_model_free_value (ETreeModel *etree,
gint col,
gpointer value);
-void *e_tree_model_initialize_value (ETreeModel *etree,
+gpointer e_tree_model_initialize_value (ETreeModel *etree,
gint col);
gboolean e_tree_model_value_is_empty (ETreeModel *etree,
gint col,
diff --git a/e-util/e-tree.c b/e-util/e-tree.c
index ee451cd..139171c 100644
--- a/e-util/e-tree.c
+++ b/e-util/e-tree.c
@@ -44,16 +44,11 @@
#include "e-table-sort-info.h"
#include "e-table-utils.h"
#include "e-text.h"
+#include "e-tree-selection-model.h"
#include "e-tree-table-adapter.h"
#include "e-tree.h"
#include "gal-a11y-e-tree.h"
-#ifdef E_TREE_USE_TREE_SELECTION
-#include "e-tree-selection-model.h"
-#else
-#include "e-table-selection-model.h"
-#endif
-
#define COLUMN_HEADER_HEIGHT 16
#define d(x)
@@ -62,6 +57,8 @@
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_TREE, ETreePrivate))
+typedef struct _ETreeDragSourceSite ETreeDragSourceSite;
+
enum {
CURSOR_CHANGE,
CURSOR_ACTIVATED,
@@ -628,13 +625,8 @@ e_tree_init (ETree *e_tree)
e_tree->priv->drag_row = -1;
e_tree->priv->drag_col = -1;
-#ifdef E_TREE_USE_TREE_SELECTION
e_tree->priv->selection =
E_SELECTION_MODEL (e_tree_selection_model_new ());
-#else
- e_tree->priv->selection =
- E_SELECTION_MODEL (e_table_selection_model_new ());
-#endif
e_tree->priv->search = e_table_search_new ();
@@ -1625,12 +1617,8 @@ et_real_construct (ETree *e_tree,
g_object_set (
e_tree->priv->selection,
"sorter", e_tree->priv->sorter,
-#ifdef E_TREE_USE_TREE_SELECTION
"model", e_tree->priv->model,
"etta", e_tree->priv->etta,
-#else
- "model", e_tree->priv->etta,
-#endif
"selection_mode", specification->selection_mode,
"cursor_mode", specification->cursor_mode,
NULL);
@@ -1910,53 +1898,21 @@ void
e_tree_set_cursor (ETree *e_tree,
ETreePath path)
{
-#ifndef E_TREE_USE_TREE_SELECTION
- gint row;
-#endif
g_return_if_fail (e_tree != NULL);
g_return_if_fail (E_IS_TREE (e_tree));
g_return_if_fail (path != NULL);
-#ifdef E_TREE_USE_TREE_SELECTION
e_tree_selection_model_select_single_path (
E_TREE_SELECTION_MODEL (e_tree->priv->selection), path);
e_tree_selection_model_change_cursor (
E_TREE_SELECTION_MODEL (e_tree->priv->selection), path);
-#else
- row = e_tree_table_adapter_row_of_node (
- E_TREE_TABLE_ADAPTER (e_tree->priv->etta), path);
-
- if (row == -1)
- return;
-
- g_object_set (
- e_tree->priv->selection,
- "cursor_row", row,
- NULL);
-#endif
}
ETreePath
e_tree_get_cursor (ETree *e_tree)
{
-#ifdef E_TREE_USE_TREE_SELECTION
return e_tree_selection_model_get_cursor (
E_TREE_SELECTION_MODEL (e_tree->priv->selection));
-#else
- gint row;
- g_return_val_if_fail (e_tree != NULL, NULL);
- g_return_val_if_fail (E_IS_TREE (e_tree), NULL);
-
- g_object_get (
- e_tree->priv->selection,
- "cursor_row", &row,
- NULL);
- if (row == -1)
- return NULL;
-
- return e_tree_table_adapter_node_at_row (
- E_TREE_TABLE_ADAPTER (e_tree->priv->etta), row);
-#endif
}
void
@@ -1972,7 +1928,6 @@ e_tree_selected_row_foreach (ETree *e_tree,
closure);
}
-#ifdef E_TREE_USE_TREE_SELECTION
void
e_tree_selected_path_foreach (ETree *e_tree,
ETreeForeachFunc callback,
@@ -2021,7 +1976,6 @@ e_tree_path_foreach (ETree *e_tree,
callback,
closure);
}
-#endif
EPrintable *
e_tree_get_printable (ETree *e_tree)
diff --git a/e-util/e-tree.h b/e-util/e-tree.h
index 1d6243c..ace9aed 100644
--- a/e-util/e-tree.h
+++ b/e-util/e-tree.h
@@ -38,12 +38,7 @@
#include <e-util/e-table-state.h>
#include <e-util/e-tree-model.h>
#include <e-util/e-tree-table-adapter.h>
-
-#define E_TREE_USE_TREE_SELECTION
-
-#ifdef E_TREE_USE_TREE_SELECTION
#include <e-util/e-tree-selection-model.h>
-#endif
/* Standard GObject macros */
#define E_TYPE_TREE \
@@ -66,8 +61,6 @@
G_BEGIN_DECLS
-typedef struct _ETreeDragSourceSite ETreeDragSourceSite;
-
typedef struct _ETree ETree;
typedef struct _ETreeClass ETreeClass;
typedef struct _ETreePrivate ETreePrivate;
@@ -227,15 +220,13 @@ ETreePath e_tree_get_cursor (ETree *e_tree);
void e_tree_selected_row_foreach (ETree *e_tree,
EForeachFunc callback,
gpointer closure);
-#ifdef E_TREE_USE_TREE_SELECTION
void e_tree_selected_path_foreach (ETree *e_tree,
ETreeForeachFunc callback,
gpointer closure);
void e_tree_path_foreach (ETree *e_tree,
ETreeForeachFunc callback,
gpointer closure);
-#endif
-EPrintable *e_tree_get_printable (ETree *e_tree);
+EPrintable * e_tree_get_printable (ETree *e_tree);
gint e_tree_get_next_row (ETree *e_tree,
gint model_row);
gint e_tree_get_prev_row (ETree *e_tree,
diff --git a/e-util/e-ui-manager.h b/e-util/e-ui-manager.h
index 4c29588..65948d1 100644
--- a/e-util/e-ui-manager.h
+++ b/e-util/e-ui-manager.h
@@ -62,7 +62,7 @@ struct _EUIManagerClass {
const gchar *ui_definition);
};
-GType e_ui_manager_get_type (void);
+GType e_ui_manager_get_type (void) G_GNUC_CONST;
GtkUIManager * e_ui_manager_new (void);
gboolean e_ui_manager_get_express_mode (EUIManager *ui_manager);
void e_ui_manager_set_express_mode (EUIManager *ui_manager,
diff --git a/e-util/e-unicode.h b/e-util/e-unicode.h
index 2901744..1ddbc7d 100644
--- a/e-util/e-unicode.h
+++ b/e-util/e-unicode.h
@@ -26,8 +26,8 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _E_UNICODE_H_
-#define _E_UNICODE_H_
+#ifndef E_UNICODE_H
+#define E_UNICODE_H
#include <sys/types.h>
#include <gtk/gtk.h>
@@ -36,34 +36,35 @@
G_BEGIN_DECLS
-gchar *e_utf8_from_gtk_event_key (GtkWidget *widget,
- guint keyval,
- const gchar *string);
-gchar *e_utf8_from_iconv_string_sized (iconv_t ic,
- const gchar *string,
- gint bytes);
-gchar *e_utf8_to_iconv_string_sized (iconv_t ic,
- const gchar *string,
- gint bytes);
-gchar *e_utf8_to_charset_string_sized (const gchar *charset,
- const gchar *string,
- gint bytes);
-gchar *e_utf8_from_locale_string_sized (const gchar *string,
- gint bytes);
-gchar *e_utf8_ensure_valid (const gchar *string);
+gchar * e_utf8_from_gtk_event_key (GtkWidget *widget,
+ guint keyval,
+ const gchar *string);
+gchar * e_utf8_from_iconv_string_sized (iconv_t ic,
+ const gchar *string,
+ gint bytes);
+gchar * e_utf8_to_iconv_string_sized (iconv_t ic,
+ const gchar *string,
+ gint bytes);
+gchar * e_utf8_to_charset_string_sized (const gchar *charset,
+ const gchar *string,
+ gint bytes);
+gchar * e_utf8_from_locale_string_sized (const gchar *string,
+ gint bytes);
+gchar * e_utf8_ensure_valid (const gchar *string);
/*
* These are simple wrappers that save us some typing
*/
/* NB! This return newly allocated string, not const as gtk+ one */
-gint e_unichar_to_utf8 (gint c,
- gchar *outbuf);
-gchar *e_unicode_get_utf8 (const gchar *text,
- gunichar *out);
-gchar *e_xml_get_translated_utf8_string_prop_by_name (const xmlNode *parent,
- const xmlChar *prop_name);
+gint e_unichar_to_utf8 (gint c,
+ gchar *outbuf);
+gchar * e_unicode_get_utf8 (const gchar *text,
+ gunichar *out);
+gchar * e_xml_get_translated_utf8_string_prop_by_name
+ (const xmlNode *parent,
+ const xmlChar *prop_name);
G_END_DECLS
-#endif
+#endif /* E_UNICODE_H */
diff --git a/e-util/e-url-entry.h b/e-util/e-url-entry.h
index 0925287..af1b95d 100644
--- a/e-util/e-url-entry.h
+++ b/e-util/e-url-entry.h
@@ -24,26 +24,38 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _E_URL_ENTRY_H_
-#define _E_URL_ENTRY_H_
+#ifndef E_URL_ENTRY_H
+#define E_URL_ENTRY_H
#include <gtk/gtk.h>
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_URL_ENTRY \
+ (e_url_entry_get_type ())
+#define E_URL_ENTRY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_URL_ENTRY, EUrlEntry))
+#define E_URL_ENTRY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_URL_ENTRY, EUrlEntryClass))
+#define E_IS_URL_ENTRY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_URL_ENTRY))
+#define E_IS_URL_ENTRY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_URL_ENTRY))
+#define E_URL_ENTRY_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_URL_ENTRY, EUrlEntryClass))
-#define E_TYPE_URL_ENTRY (e_url_entry_get_type ())
-#define E_URL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_URL_ENTRY, EUrlEntry))
-#define E_URL_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_URL_ENTRY, EUrlEntryClass))
-#define E_IS_URL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_URL_ENTRY))
-#define E_IS_URL_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_URL_ENTRY))
+G_BEGIN_DECLS
-typedef struct _EUrlEntry EUrlEntry;
+typedef struct _EUrlEntry EUrlEntry;
+typedef struct _EUrlEntryClass EUrlEntryClass;
typedef struct _EUrlEntryPrivate EUrlEntryPrivate;
-typedef struct _EUrlEntryClass EUrlEntryClass;
struct _EUrlEntry {
GtkBox parent;
-
EUrlEntryPrivate *priv;
};
@@ -51,10 +63,10 @@ struct _EUrlEntryClass {
GtkBoxClass parent_class;
};
-GType e_url_entry_get_type (void);
-GtkWidget *e_url_entry_new (void);
-GtkWidget *e_url_entry_get_entry (EUrlEntry *url_entry);
+GType e_url_entry_get_type (void) G_GNUC_CONST;
+GtkWidget * e_url_entry_new (void);
+GtkWidget * e_url_entry_get_entry (EUrlEntry *url_entry);
G_END_DECLS
-#endif /* _E_URL_ENTRY_H_ */
+#endif /* E_URL_ENTRY_H */
diff --git a/e-util/e-web-view-gtkhtml.h b/e-util/e-web-view-gtkhtml.h
index ebe965c..139c3bb 100644
--- a/e-util/e-web-view-gtkhtml.h
+++ b/e-util/e-web-view-gtkhtml.h
@@ -93,84 +93,117 @@ struct _EWebViewGtkHTMLClass {
const gchar *mailto_uri);
};
-GType e_web_view_gtkhtml_get_type (void);
-GtkWidget * e_web_view_gtkhtml_new (void);
-void e_web_view_gtkhtml_clear (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_load_string (EWebViewGtkHTML *web_view,
- const gchar *string);
-gboolean e_web_view_gtkhtml_get_animate (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_animate (EWebViewGtkHTML *web_view,
- gboolean animate);
-gboolean e_web_view_gtkhtml_get_caret_mode (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_caret_mode (EWebViewGtkHTML *web_view,
- gboolean caret_mode);
-GtkTargetList * e_web_view_gtkhtml_get_copy_target_list (EWebViewGtkHTML *web_view);
-gboolean e_web_view_gtkhtml_get_disable_printing (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_disable_printing (EWebViewGtkHTML *web_view,
- gboolean disable_printing);
+GType e_web_view_gtkhtml_get_type (void) G_GNUC_CONST;
+GtkWidget * e_web_view_gtkhtml_new (void);
+void e_web_view_gtkhtml_clear (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_load_string (EWebViewGtkHTML *web_view,
+ const gchar *string);
+gboolean e_web_view_gtkhtml_get_animate (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_animate (EWebViewGtkHTML *web_view,
+ gboolean animate);
+gboolean e_web_view_gtkhtml_get_caret_mode
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_caret_mode
+ (EWebViewGtkHTML *web_view,
+ gboolean caret_mode);
+GtkTargetList * e_web_view_gtkhtml_get_copy_target_list
+ (EWebViewGtkHTML *web_view);
+gboolean e_web_view_gtkhtml_get_disable_printing
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_disable_printing
+ (EWebViewGtkHTML *web_view,
+ gboolean disable_printing);
gboolean e_web_view_gtkhtml_get_disable_save_to_disk
- (EWebViewGtkHTML *web_view);
+ (EWebViewGtkHTML *web_view);
void e_web_view_gtkhtml_set_disable_save_to_disk
- (EWebViewGtkHTML *web_view,
- gboolean disable_save_to_disk);
-gboolean e_web_view_gtkhtml_get_editable (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_editable (EWebViewGtkHTML *web_view,
- gboolean editable);
-gboolean e_web_view_gtkhtml_get_inline_spelling (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_inline_spelling (EWebViewGtkHTML *web_view,
- gboolean inline_spelling);
-gboolean e_web_view_gtkhtml_get_magic_links (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_magic_links (EWebViewGtkHTML *web_view,
- gboolean magic_links);
-gboolean e_web_view_gtkhtml_get_magic_smileys (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_magic_smileys (EWebViewGtkHTML *web_view,
- gboolean magic_smileys);
-const gchar * e_web_view_gtkhtml_get_selected_uri (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_selected_uri (EWebViewGtkHTML *web_view,
- const gchar *selected_uri);
+ (EWebViewGtkHTML *web_view,
+ gboolean disable_save_to_disk);
+gboolean e_web_view_gtkhtml_get_editable (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_editable (EWebViewGtkHTML *web_view,
+ gboolean editable);
+gboolean e_web_view_gtkhtml_get_inline_spelling
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_inline_spelling
+ (EWebViewGtkHTML *web_view,
+ gboolean inline_spelling);
+gboolean e_web_view_gtkhtml_get_magic_links
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_magic_links
+ (EWebViewGtkHTML *web_view,
+ gboolean magic_links);
+gboolean e_web_view_gtkhtml_get_magic_smileys
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_magic_smileys
+ (EWebViewGtkHTML *web_view,
+ gboolean magic_smileys);
+const gchar * e_web_view_gtkhtml_get_selected_uri
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_selected_uri
+ (EWebViewGtkHTML *web_view,
+ const gchar *selected_uri);
GdkPixbufAnimation *
- e_web_view_gtkhtml_get_cursor_image (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_cursor_image (EWebViewGtkHTML *web_view,
- GdkPixbufAnimation *animation);
-GtkAction * e_web_view_gtkhtml_get_open_proxy (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_open_proxy (EWebViewGtkHTML *web_view,
- GtkAction *open_proxy);
+ e_web_view_gtkhtml_get_cursor_image
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_cursor_image
+ (EWebViewGtkHTML *web_view,
+ GdkPixbufAnimation *animation);
+GtkAction * e_web_view_gtkhtml_get_open_proxy
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_open_proxy
+ (EWebViewGtkHTML *web_view,
+ GtkAction *open_proxy);
GtkTargetList * e_web_view_gtkhtml_get_paste_target_list
- (EWebViewGtkHTML *web_view);
-GtkAction * e_web_view_gtkhtml_get_print_proxy (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_print_proxy (EWebViewGtkHTML *web_view,
- GtkAction *print_proxy);
-GtkAction * e_web_view_gtkhtml_get_save_as_proxy (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_set_save_as_proxy (EWebViewGtkHTML *web_view,
- GtkAction *save_as_proxy);
-GtkAction * e_web_view_gtkhtml_get_action (EWebViewGtkHTML *web_view,
- const gchar *action_name);
-GtkActionGroup *e_web_view_gtkhtml_get_action_group (EWebViewGtkHTML *web_view,
- const gchar *group_name);
-gchar * e_web_view_gtkhtml_extract_uri (EWebViewGtkHTML *web_view,
- GdkEventButton *event,
- GtkHTML *frame);
-void e_web_view_gtkhtml_copy_clipboard (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_cut_clipboard (EWebViewGtkHTML *web_view);
-gboolean e_web_view_gtkhtml_is_selection_active (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_paste_clipboard (EWebViewGtkHTML *web_view);
-gboolean e_web_view_gtkhtml_scroll_forward (EWebViewGtkHTML *web_view);
-gboolean e_web_view_gtkhtml_scroll_backward (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_select_all (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_unselect_all (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_zoom_100 (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_zoom_in (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_zoom_out (EWebViewGtkHTML *web_view);
-GtkUIManager * e_web_view_gtkhtml_get_ui_manager (EWebViewGtkHTML *web_view);
-GtkWidget * e_web_view_gtkhtml_get_popup_menu (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_show_popup_menu (EWebViewGtkHTML *web_view,
- GdkEventButton *event,
- GtkMenuPositionFunc func,
- gpointer user_data);
-void e_web_view_gtkhtml_status_message (EWebViewGtkHTML *web_view,
- const gchar *status_message);
-void e_web_view_gtkhtml_stop_loading (EWebViewGtkHTML *web_view);
-void e_web_view_gtkhtml_update_actions (EWebViewGtkHTML *web_view);
+ (EWebViewGtkHTML *web_view);
+GtkAction * e_web_view_gtkhtml_get_print_proxy
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_print_proxy
+ (EWebViewGtkHTML *web_view,
+ GtkAction *print_proxy);
+GtkAction * e_web_view_gtkhtml_get_save_as_proxy
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_set_save_as_proxy
+ (EWebViewGtkHTML *web_view,
+ GtkAction *save_as_proxy);
+GtkAction * e_web_view_gtkhtml_get_action (EWebViewGtkHTML *web_view,
+ const gchar *action_name);
+GtkActionGroup *e_web_view_gtkhtml_get_action_group
+ (EWebViewGtkHTML *web_view,
+ const gchar *group_name);
+gchar * e_web_view_gtkhtml_extract_uri (EWebViewGtkHTML *web_view,
+ GdkEventButton *event,
+ GtkHTML *frame);
+void e_web_view_gtkhtml_copy_clipboard
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_cut_clipboard
+ (EWebViewGtkHTML *web_view);
+gboolean e_web_view_gtkhtml_is_selection_active
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_paste_clipboard
+ (EWebViewGtkHTML *web_view);
+gboolean e_web_view_gtkhtml_scroll_forward
+ (EWebViewGtkHTML *web_view);
+gboolean e_web_view_gtkhtml_scroll_backward
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_select_all (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_unselect_all (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_zoom_100 (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_zoom_in (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_zoom_out (EWebViewGtkHTML *web_view);
+GtkUIManager * e_web_view_gtkhtml_get_ui_manager
+ (EWebViewGtkHTML *web_view);
+GtkWidget * e_web_view_gtkhtml_get_popup_menu
+ (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_show_popup_menu
+ (EWebViewGtkHTML *web_view,
+ GdkEventButton *event,
+ GtkMenuPositionFunc func,
+ gpointer user_data);
+void e_web_view_gtkhtml_status_message
+ (EWebViewGtkHTML *web_view,
+ const gchar *status_message);
+void e_web_view_gtkhtml_stop_loading (EWebViewGtkHTML *web_view);
+void e_web_view_gtkhtml_update_actions
+ (EWebViewGtkHTML *web_view);
G_END_DECLS
diff --git a/e-util/e-web-view-preview.c b/e-util/e-web-view-preview.c
index b75814f..0c59d33 100644
--- a/e-util/e-web-view-preview.c
+++ b/e-util/e-web-view-preview.c
@@ -202,7 +202,6 @@ e_web_view_preview_new (void)
GtkTreeView *
e_web_view_preview_get_tree_view (EWebViewPreview *preview)
{
- g_return_val_if_fail (preview != NULL, NULL);
g_return_val_if_fail (E_IS_WEB_VIEW_PREVIEW (preview), NULL);
return GTK_TREE_VIEW (gtk_bin_get_child (GTK_BIN (gtk_paned_get_child1 (GTK_PANED (preview)))));
@@ -211,7 +210,6 @@ e_web_view_preview_get_tree_view (EWebViewPreview *preview)
GtkWidget *
e_web_view_preview_get_preview (EWebViewPreview *preview)
{
- g_return_val_if_fail (preview != NULL, NULL);
g_return_val_if_fail (E_IS_WEB_VIEW_PREVIEW (preview), NULL);
return gtk_bin_get_child (GTK_BIN (gtk_paned_get_child2 (GTK_PANED (preview))));
@@ -251,6 +249,14 @@ e_web_view_preview_hide_tree_view (EWebViewPreview *preview)
gtk_widget_hide (gtk_paned_get_child1 (GTK_PANED (preview)));
}
+gboolean
+e_web_view_preview_get_escape_values (EWebViewPreview *preview)
+{
+ g_return_val_if_fail (E_IS_WEB_VIEW_PREVIEW (preview), FALSE);
+
+ return preview->priv->escape_values;
+}
+
void
e_web_view_preview_set_escape_values (EWebViewPreview *preview,
gboolean escape)
@@ -260,16 +266,6 @@ e_web_view_preview_set_escape_values (EWebViewPreview *preview,
preview->priv->escape_values = escape;
}
-gboolean
-e_web_view_preview_get_escape_values (EWebViewPreview *preview)
-{
- g_return_val_if_fail (preview != NULL, FALSE);
- g_return_val_if_fail (E_IS_WEB_VIEW_PREVIEW (preview), FALSE);
- g_return_val_if_fail (preview->priv != NULL, FALSE);
-
- return preview->priv->escape_values;
-}
-
void
e_web_view_preview_begin_update (EWebViewPreview *preview)
{
diff --git a/e-util/e-web-view-preview.h b/e-util/e-web-view-preview.h
index 54963b6..00239fe 100644
--- a/e-util/e-web-view-preview.h
+++ b/e-util/e-web-view-preview.h
@@ -77,7 +77,7 @@ struct _EWebViewPreviewClass {
GtkVPanedClass parent_class;
};
-GType e_web_view_preview_get_type (void);
+GType e_web_view_preview_get_type (void) G_GNUC_CONST;
GtkWidget * e_web_view_preview_new (void);
GtkTreeView * e_web_view_preview_get_tree_view
(EWebViewPreview *preview);
@@ -88,11 +88,11 @@ void e_web_view_preview_show_tree_view
(EWebViewPreview *preview);
void e_web_view_preview_hide_tree_view
(EWebViewPreview *preview);
+gboolean e_web_view_preview_get_escape_values
+ (EWebViewPreview *preview);
void e_web_view_preview_set_escape_values
(EWebViewPreview *preview,
gboolean escape);
-gboolean e_web_view_preview_get_escape_values
- (EWebViewPreview *preview);
void e_web_view_preview_begin_update (EWebViewPreview *preview);
void e_web_view_preview_end_update (EWebViewPreview *preview);
void e_web_view_preview_add_header (EWebViewPreview *preview,
diff --git a/e-util/e-web-view.h b/e-util/e-web-view.h
index 6690725..f03be60 100644
--- a/e-util/e-web-view.h
+++ b/e-util/e-web-view.h
@@ -57,18 +57,12 @@ G_BEGIN_DECLS
typedef struct _EWebView EWebView;
typedef struct _EWebViewClass EWebViewClass;
typedef struct _EWebViewPrivate EWebViewPrivate;
-struct PangoFontDescription;
struct _EWebView {
WebKitWebView parent;
EWebViewPrivate *priv;
};
-typedef void (*EWebViewJSFunctionCallback) (EWebView *web_view,
- size_t arg_count,
- const JSValueRef args[],
- gpointer user_data);
-
struct _EWebViewClass {
WebKitWebViewClass parent_class;
@@ -109,7 +103,7 @@ struct _EWebViewClass {
const gchar *mailto_uri);
};
-GType e_web_view_get_type (void);
+GType e_web_view_get_type (void) G_GNUC_CONST;
GtkWidget * e_web_view_new (void);
void e_web_view_clear (EWebView *web_view);
void e_web_view_load_string (EWebView *web_view,
@@ -139,11 +133,11 @@ gboolean e_web_view_get_disable_save_to_disk
void e_web_view_set_disable_save_to_disk
(EWebView *web_view,
gboolean disable_save_to_disk);
-gboolean e_web_view_get_enable_frame_flattening
- (EWebView *web_view);
-void e_web_view_set_enable_frame_flattening
- (EWebView *web_view,
- gboolean enable_frame_flattening);
+gboolean e_web_view_get_enable_frame_flattening
+ (EWebView *web_view);
+void e_web_view_set_enable_frame_flattening
+ (EWebView *web_view,
+ gboolean enable_frame_flattening);
gboolean e_web_view_get_editable (EWebView *web_view);
void e_web_view_set_editable (EWebView *web_view,
gboolean editable);
@@ -177,10 +171,10 @@ void e_web_view_set_print_proxy (EWebView *web_view,
GtkAction * e_web_view_get_save_as_proxy (EWebView *web_view);
void e_web_view_set_save_as_proxy (EWebView *web_view,
GtkAction *save_as_proxy);
-GSList * e_web_view_get_highlights (EWebView *web_view);
-void e_web_view_add_highlight (EWebView *web_view,
- const gchar *highlight);
-void e_web_view_clear_highlights (EWebView *web_view);
+GSList * e_web_view_get_highlights (EWebView *web_view);
+void e_web_view_add_highlight (EWebView *web_view,
+ const gchar *highlight);
+void e_web_view_clear_highlights (EWebView *web_view);
GtkAction * e_web_view_get_action (EWebView *web_view,
const gchar *action_name);
GtkActionGroup *e_web_view_get_action_group (EWebView *web_view,
@@ -205,7 +199,7 @@ void e_web_view_status_message (EWebView *web_view,
const gchar *status_message);
void e_web_view_stop_loading (EWebView *web_view);
void e_web_view_update_actions (EWebView *web_view);
-gchar * e_web_view_get_selection_html (EWebView *web_view);
+gchar * e_web_view_get_selection_html (EWebView *web_view);
void e_web_view_set_settings (EWebView *web_view,
WebKitWebSettings *settings);
diff --git a/e-util/gal-define-views-dialog.c b/e-util/gal-define-views-dialog.c
index 4bed594..d2c839e 100644
--- a/e-util/gal-define-views-dialog.c
+++ b/e-util/gal-define-views-dialog.c
@@ -78,7 +78,7 @@ gal_define_views_dialog_class_init (GalDefineViewsDialogClass *class)
"collection",
"Collection",
NULL,
- GAL_VIEW_COLLECTION_TYPE,
+ GAL_TYPE_VIEW_COLLECTION,
G_PARAM_READWRITE));
}
diff --git a/e-util/gal-define-views-model.c b/e-util/gal-define-views-model.c
index f9963ac..8d8dd51 100644
--- a/e-util/gal-define-views-model.c
+++ b/e-util/gal-define-views-model.c
@@ -32,7 +32,10 @@
#include "gal-define-views-model.h"
-G_DEFINE_TYPE (GalDefineViewsModel, gal_define_views_model, E_TYPE_TABLE_MODEL)
+G_DEFINE_TYPE (
+ GalDefineViewsModel,
+ gal_define_views_model,
+ E_TYPE_TABLE_MODEL)
enum {
PROP_0,
@@ -261,7 +264,7 @@ gal_define_views_model_class_init (GalDefineViewsModelClass *class)
"collection",
"Collection",
NULL,
- GAL_VIEW_COLLECTION_TYPE,
+ GAL_TYPE_VIEW_COLLECTION,
G_PARAM_READWRITE));
model_class->column_count = gdvm_col_count;
@@ -294,11 +297,7 @@ gal_define_views_model_init (GalDefineViewsModel *model)
ETableModel *
gal_define_views_model_new (void)
{
- GalDefineViewsModel *et;
-
- et = g_object_new (GAL_DEFINE_VIEWS_MODEL_TYPE, NULL);
-
- return E_TABLE_MODEL (et);
+ return g_object_new (GAL_TYPE_DEFINE_VIEWS_MODEL, NULL);
}
/**
diff --git a/e-util/gal-define-views-model.h b/e-util/gal-define-views-model.h
index 7219384..19a5028 100644
--- a/e-util/gal-define-views-model.h
+++ b/e-util/gal-define-views-model.h
@@ -25,46 +25,63 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _GAL_DEFINE_VIEWS_MODEL_H_
-#define _GAL_DEFINE_VIEWS_MODEL_H_
+#ifndef GAL_DEFINE_VIEWS_MODEL_H
+#define GAL_DEFINE_VIEWS_MODEL_H
#include <e-util/e-table-model.h>
#include <e-util/gal-view.h>
#include <e-util/gal-view-collection.h>
+/* Standard GObject macros */
+#define GAL_TYPE_DEFINE_VIEWS_MODEL \
+ (gal_define_views_model_get_type ())
+#define GAL_DEFINE_VIEWS_MODEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), GAL_TYPE_DEFINE_VIEWS_MODEL, GalDefineViewsModel))
+#define GAL_DEFINE_VIEWS_MODEL_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), GAL_TYPE_DEFINE_VIEWS_MODEL, GalDefineViewsModelClass))
+#define GAL_IS_DEFINE_VIEWS_MODEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), GAL_TYPE_DEFINE_VIEWS_MODEL))
+#define GAL_IS_DEFINE_VIEWS_MODEL_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), GAL_TYPE_DEFINE_VIEWS_MODEL))
+#define GAL_DEFINE_VIEWS_MODEL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), GAL_TYPE_DEFINE_VIEWS_MODEL, GalDefineViewsModelClass))
+
G_BEGIN_DECLS
-#define GAL_DEFINE_VIEWS_MODEL_TYPE (gal_define_views_model_get_type ())
-#define GAL_DEFINE_VIEWS_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_DEFINE_VIEWS_MODEL_TYPE, GalDefineViewsModel))
-#define GAL_DEFINE_VIEWS_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GAL_DEFINE_VIEWS_MODEL_TYPE, GalDefineViewsModelClass))
-#define GAL_IS_DEFINE_VIEWS_MODEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_DEFINE_VIEWS_MODEL_TYPE))
-#define GAL_IS_DEFINE_VIEWS_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_DEFINE_VIEWS_MODEL_TYPE))
+typedef struct _GalDefineViewsModel GalDefineViewsModel;
+typedef struct _GalDefineViewsModelClass GalDefineViewsModelClass;
-typedef struct {
+struct _GalDefineViewsModel {
ETableModel parent;
/* item specific fields */
GalViewCollection *collection;
guint editable : 1;
-} GalDefineViewsModel;
+};
-typedef struct {
+struct _GalDefineViewsModelClass {
ETableModelClass parent_class;
-} GalDefineViewsModelClass;
-
-GType gal_define_views_model_get_type (void);
-ETableModel *gal_define_views_model_new (void);
+};
-void gal_define_views_model_append (GalDefineViewsModel *model,
- GalView *view);
-GalView *gal_define_views_model_get_view (GalDefineViewsModel *model,
- gint i);
-void gal_define_views_model_delete_view (GalDefineViewsModel *model,
- gint i);
-void gal_define_views_model_copy_view (GalDefineViewsModel *model,
- gint i);
+GType gal_define_views_model_get_type (void) G_GNUC_CONST;
+ETableModel * gal_define_views_model_new (void);
+void gal_define_views_model_append (GalDefineViewsModel *model,
+ GalView *view);
+GalView * gal_define_views_model_get_view (GalDefineViewsModel *model,
+ gint i);
+void gal_define_views_model_delete_view
+ (GalDefineViewsModel *model,
+ gint i);
+void gal_define_views_model_copy_view
+ (GalDefineViewsModel *model,
+ gint i);
G_END_DECLS
-#endif /* _GAL_DEFINE_VIEWS_MODEL_H_ */
+#endif /* GAL_DEFINE_VIEWS_MODEL_H */
diff --git a/e-util/gal-view-collection.c b/e-util/gal-view-collection.c
index bcbad52..24d70a6 100644
--- a/e-util/gal-view-collection.c
+++ b/e-util/gal-view-collection.c
@@ -250,7 +250,7 @@ gal_view_collection_init (GalViewCollection *collection)
GalViewCollection *
gal_view_collection_new (void)
{
- return g_object_new (GAL_VIEW_COLLECTION_TYPE, NULL);
+ return g_object_new (GAL_TYPE_VIEW_COLLECTION, NULL);
}
void
diff --git a/e-util/gal-view-collection.h b/e-util/gal-view-collection.h
index 980f7c0..0457a19 100644
--- a/e-util/gal-view-collection.h
+++ b/e-util/gal-view-collection.h
@@ -24,24 +24,39 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _GAL_VIEW_SET_H_
-#define _GAL_VIEW_SET_H_
+#ifndef GAL_VIEW_COLLECTION_H
+#define GAL_VIEW_COLLECTION_H
#include <e-util/gal-view-factory.h>
+/* Standard GObject macros */
+#define GAL_TYPE_VIEW_COLLECTION \
+ (gal_view_collection_get_type ())
+#define GAL_VIEW_COLLECTION(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), GAL_TYPE_VIEW_COLLECTION, GalViewCollection))
+#define GAL_VIEW_COLLECTION_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), GAL_TYPE_VIEW_COLLECTION, GalViewCollectionClass))
+#define GAL_IS_VIEW_COLLECTION(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), GAL_TYPE_VIEW_COLLECTION))
+#define GAL_IS_VIEW_COLLECTION_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), GAL_TYPE_VIEW_COLLECTION))
+#define GAL_VIEW_COLLECTION_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), GAL_TYPE_VIEW_COLLECTION, GalViewCollectionClass))
+
G_BEGIN_DECLS
-#define GAL_VIEW_COLLECTION_TYPE (gal_view_collection_get_type ())
-#define GAL_VIEW_COLLECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_COLLECTION_TYPE, GalViewCollection))
-#define GAL_VIEW_COLLECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GAL_VIEW_COLLECTION_TYPE, GalViewCollectionClass))
-#define GAL_IS_VIEW_COLLECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_VIEW_COLLECTION_TYPE))
-#define GAL_IS_VIEW_COLLECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_VIEW_COLLECTION_TYPE))
-#define GAL_VIEW_COLLECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GAL_VIEW_COLLECTION_TYPE, GalViewCollectionClass))
+typedef struct _GalViewCollection GalViewCollection;
+typedef struct _GalViewCollectionClass GalViewCollectionClass;
-typedef struct GalViewCollectionItem GalViewCollectionItem;
+typedef struct _GalViewCollectionItem GalViewCollectionItem;
-typedef struct {
- GObject base;
+struct _GalViewCollection {
+ GObject parent;
GalViewCollectionItem **view_data;
gint view_count;
@@ -60,20 +75,18 @@ typedef struct {
gchar *default_view;
gchar *title;
-} GalViewCollection;
+};
-typedef struct {
+struct _GalViewCollectionClass {
GObjectClass parent_class;
- /*
- * Signals
- */
- void (*display_view) (GalViewCollection *collection,
- GalView *view);
- void (*changed) (GalViewCollection *collection);
-} GalViewCollectionClass;
+ /* Signals */
+ void (*display_view) (GalViewCollection *collection,
+ GalView *view);
+ void (*changed) (GalViewCollection *collection);
+};
-struct GalViewCollectionItem {
+struct _GalViewCollectionItem {
GalView *view;
gchar *id;
guint changed : 1;
@@ -86,64 +99,77 @@ struct GalViewCollectionItem {
guint view_changed_id;
};
-/* Standard functions */
-GType gal_view_collection_get_type (void);
-GalViewCollection *gal_view_collection_new (void);
-
-void gal_view_collection_set_title (GalViewCollection *collection,
- const gchar *title);
-/* Set up the view collection. Call these two functions before ever doing load or save and never call them again. */
-void gal_view_collection_set_storage_directories (GalViewCollection *collection,
- const gchar *system_dir,
- const gchar *local_dir);
-void gal_view_collection_add_factory (GalViewCollection *collection,
- GalViewFactory *factory);
+GType gal_view_collection_get_type (void) G_GNUC_CONST;
+GalViewCollection *
+ gal_view_collection_new (void);
+void gal_view_collection_set_title (GalViewCollection *collection,
+ const gchar *title);
+
+/* Set up the view collection. Call these two functions
+ * before ever doing load or save and never call them again. */
+void gal_view_collection_set_storage_directories
+ (GalViewCollection *collection,
+ const gchar *system_dir,
+ const gchar *local_dir);
+void gal_view_collection_add_factory (GalViewCollection *collection,
+ GalViewFactory *factory);
/* Send the display view signal. This function is deprecated. */
-void gal_view_collection_display_view (GalViewCollection *collection,
- GalView *view);
+void gal_view_collection_display_view
+ (GalViewCollection *collection,
+ GalView *view);
/* Query the view collection. */
-gint gal_view_collection_get_count (GalViewCollection *collection);
-GalView *gal_view_collection_get_view (GalViewCollection *collection,
- gint n);
-GalViewCollectionItem *gal_view_collection_get_view_item (GalViewCollection *collection,
- gint n);
-gint gal_view_collection_get_view_index_by_id (GalViewCollection *collection,
- const gchar *view_id);
-gchar *gal_view_collection_get_view_id_by_index (GalViewCollection *collection,
- gint n);
+gint gal_view_collection_get_count (GalViewCollection *collection);
+GalView * gal_view_collection_get_view (GalViewCollection *collection,
+ gint n);
+GalViewCollectionItem *
+ gal_view_collection_get_view_item
+ (GalViewCollection *collection,
+ gint n);
+gint gal_view_collection_get_view_index_by_id
+ (GalViewCollection *collection,
+ const gchar *view_id);
+gchar * gal_view_collection_get_view_id_by_index
+ (GalViewCollection *collection,
+ gint n);
/* Manipulate the view collection */
-void gal_view_collection_append (GalViewCollection *collection,
- GalView *view);
-void gal_view_collection_delete_view (GalViewCollection *collection,
- gint i);
-void gal_view_collection_copy_view (GalViewCollection *collection,
- gint i);
-/* Call set_storage_directories and add factories for anything that
- * might be found there before doing either of these. */
-void gal_view_collection_load (GalViewCollection *collection);
-void gal_view_collection_save (GalViewCollection *collection);
-gboolean gal_view_collection_loaded (GalViewCollection *collection);
+void gal_view_collection_append (GalViewCollection *collection,
+ GalView *view);
+void gal_view_collection_delete_view (GalViewCollection *collection,
+ gint i);
+void gal_view_collection_copy_view (GalViewCollection *collection,
+ gint i);
+
+/* Call set_storage_directories and add factories for anything
+ * that might be found there before doing either of these. */
+void gal_view_collection_load (GalViewCollection *collection);
+void gal_view_collection_save (GalViewCollection *collection);
+gboolean gal_view_collection_loaded (GalViewCollection *collection);
/* Use factory list to load a GalView file. */
-GalView *gal_view_collection_load_view_from_file (GalViewCollection *collection,
- const gchar *type,
- const gchar *filename);
+GalView * gal_view_collection_load_view_from_file
+ (GalViewCollection *collection,
+ const gchar *type,
+ const gchar *filename);
/* Returns id of the new view. These functions are used for
* GalViewInstanceSaveAsDialog. */
-const gchar *gal_view_collection_append_with_title (GalViewCollection *collection,
- const gchar *title,
- GalView *view);
-const gchar *gal_view_collection_set_nth_view (GalViewCollection *collection,
- gint i,
- GalView *view);
-
-const gchar *gal_view_collection_get_default_view (GalViewCollection *collection);
-void gal_view_collection_set_default_view (GalViewCollection *collection,
- const gchar *id);
+const gchar * gal_view_collection_append_with_title
+ (GalViewCollection *collection,
+ const gchar *title,
+ GalView *view);
+const gchar * gal_view_collection_set_nth_view
+ (GalViewCollection *collection,
+ gint i,
+ GalView *view);
+
+const gchar * gal_view_collection_get_default_view
+ (GalViewCollection *collection);
+void gal_view_collection_set_default_view
+ (GalViewCollection *collection,
+ const gchar *id);
G_END_DECLS
diff --git a/e-util/gal-view-factory-etable.h b/e-util/gal-view-factory-etable.h
index cc4b617..b26fa4e 100644
--- a/e-util/gal-view-factory-etable.h
+++ b/e-util/gal-view-factory-etable.h
@@ -67,10 +67,10 @@ struct _GalViewFactoryEtableClass {
};
GType gal_view_factory_etable_get_type (void);
+GalViewFactory *gal_view_factory_etable_new (ETableSpecification *specification);
ETableSpecification *
gal_view_factory_etable_get_specification
(GalViewFactoryEtable *factory);
-GalViewFactory *gal_view_factory_etable_new (ETableSpecification *specification);
G_END_DECLS
diff --git a/e-util/gal-view-instance-save-as-dialog.c b/e-util/gal-view-instance-save-as-dialog.c
index c71892e..b383001 100644
--- a/e-util/gal-view-instance-save-as-dialog.c
+++ b/e-util/gal-view-instance-save-as-dialog.c
@@ -239,7 +239,7 @@ gal_view_instance_save_as_dialog_class_init (GalViewInstanceSaveAsDialogClass *c
"instance",
"Instance",
NULL,
- GAL_VIEW_INSTANCE_TYPE,
+ GAL_TYPE_VIEW_INSTANCE,
G_PARAM_READWRITE));
}
diff --git a/e-util/gal-view-instance.c b/e-util/gal-view-instance.c
index e0a107f..2b526c1 100644
--- a/e-util/gal-view-instance.c
+++ b/e-util/gal-view-instance.c
@@ -329,7 +329,7 @@ GalViewInstance *
gal_view_instance_new (GalViewCollection *collection,
const gchar *instance_id)
{
- GalViewInstance *instance = g_object_new (GAL_VIEW_INSTANCE_TYPE, NULL);
+ GalViewInstance *instance = g_object_new (GAL_TYPE_VIEW_INSTANCE, NULL);
if (gal_view_instance_construct (instance, collection, instance_id))
return instance;
else {
diff --git a/e-util/gal-view-instance.h b/e-util/gal-view-instance.h
index c5debd1..33427d4 100644
--- a/e-util/gal-view-instance.h
+++ b/e-util/gal-view-instance.h
@@ -25,21 +25,37 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef _GAL_VIEW_INSTANCE_H_
-#define _GAL_VIEW_INSTANCE_H_
+#ifndef GAL_VIEW_INSTANCE_H
+#define GAL_VIEW_INSTANCE_H
#include <e-util/gal-view-collection.h>
+/* Standard GObject macros */
+#define GAL_TYPE_VIEW_INSTANCE \
+ (gal_view_instance_get_type ())
+#define GAL_VIEW_INSTANCE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), GAL_TYPE_VIEW_INSTANCE, GalViewInstance))
+#define GAL_VIEW_INSTANCE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), GAL_TYPE_VIEW_INSTANCE, GalViewInstanceClass))
+#define GAL_IS_VIEW_INSTANCE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), GAL_TYPE_VIEW_INSTANCE))
+#define GAL_IS_VIEW_INSTANCE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), GAL_TYPE_VIEW_INSTANCE))
+#define GAL_VIEW_INSTANCE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), GAL_TYPE_VIEW_INSTANCE, GalViewInstanceClass))
+
G_BEGIN_DECLS
-#define GAL_VIEW_INSTANCE_TYPE (gal_view_instance_get_type ())
-#define GAL_VIEW_INSTANCE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_INSTANCE_TYPE, GalViewInstance))
-#define GAL_VIEW_INSTANCE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GAL_VIEW_INSTANCE_TYPE, GalViewInstanceClass))
-#define GAL_IS_VIEW_INSTANCE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_VIEW_INSTANCE_TYPE))
-#define GAL_IS_VIEW_INSTANCE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_VIEW_INSTANCE_TYPE))
+typedef struct _GalViewInstance GalViewInstance;
+typedef struct _GalViewInstanceClass GalViewInstanceClass;
-typedef struct {
- GObject base;
+struct _GalViewInstance {
+ GObject parent;
GalViewCollection *collection;
@@ -58,57 +74,62 @@ typedef struct {
guint loaded : 1;
gchar *default_view;
-} GalViewInstance;
+};
-typedef struct {
+struct _GalViewInstanceClass {
GObjectClass parent_class;
- /*
- * Signals
- */
- void (*display_view) (GalViewInstance *instance,
- GalView *view);
- void (*changed) (GalViewInstance *instance);
- void (*loaded) (GalViewInstance *instance);
-} GalViewInstanceClass;
+ /* Signals */
+ void (*display_view) (GalViewInstance *instance,
+ GalView *view);
+ void (*changed) (GalViewInstance *instance);
+ void (*loaded) (GalViewInstance *instance);
+};
-/* Standard functions */
-GType gal_view_instance_get_type (void);
+GType gal_view_instance_get_type (void) G_GNUC_CONST;
-/* */
/*collection should be loaded when you call this.
instance_id: Which instance of this type of object is this (for most of evo, this is the folder id.) */
-GalViewInstance *gal_view_instance_new (GalViewCollection *collection,
- const gchar *instance_id);
-GalViewInstance *gal_view_instance_construct (GalViewInstance *instance,
- GalViewCollection *collection,
- const gchar *instance_id);
+GalViewInstance *
+ gal_view_instance_new (GalViewCollection *collection,
+ const gchar *instance_id);
+GalViewInstance *
+ gal_view_instance_construct (GalViewInstance *instance,
+ GalViewCollection *collection,
+ const gchar *instance_id);
/* Manipulate the current view. */
-gchar *gal_view_instance_get_current_view_id (GalViewInstance *instance);
-void gal_view_instance_set_current_view_id (GalViewInstance *instance,
- const gchar *view_id);
-GalView *gal_view_instance_get_current_view (GalViewInstance *instance);
+gchar * gal_view_instance_get_current_view_id
+ (GalViewInstance *instance);
+void gal_view_instance_set_current_view_id
+ (GalViewInstance *instance,
+ const gchar *view_id);
+GalView * gal_view_instance_get_current_view
+ (GalViewInstance *instance);
/* Sets the current view to the given custom view. */
-void gal_view_instance_set_custom_view (GalViewInstance *instance,
- GalView *view);
+void gal_view_instance_set_custom_view
+ (GalViewInstance *instance,
+ GalView *view);
/* Returns true if this instance has ever been used before. */
-gboolean gal_view_instance_exists (GalViewInstance *instance);
+gboolean gal_view_instance_exists (GalViewInstance *instance);
/* Manipulate the view collection */
-/* void gal_view_instance_set_as_default (GalViewInstance *instance); */
-void gal_view_instance_save_as (GalViewInstance *instance);
+void gal_view_instance_save_as (GalViewInstance *instance);
-/* This is idempotent. Once it's been called once, the rest of the calls are ignored. */
-void gal_view_instance_load (GalViewInstance *instance);
+/* This is idempotent. Once it's been called
+ * once, the rest of the calls are ignored. */
+void gal_view_instance_load (GalViewInstance *instance);
-/* These only mean anything before gal_view_instance_load is called the first time. */
-const gchar *gal_view_instance_get_default_view (GalViewInstance *instance);
-void gal_view_instance_set_default_view (GalViewInstance *instance,
- const gchar *id);
+/* These only mean anything before gal_view_instance_load()
+ * is called the first time. */
+const gchar * gal_view_instance_get_default_view
+ (GalViewInstance *instance);
+void gal_view_instance_set_default_view
+ (GalViewInstance *instance,
+ const gchar *id);
G_END_DECLS
-#endif /* _GAL_VIEW_INSTANCE_H_ */
+#endif /* GAL_VIEW_INSTANCE_H */
diff --git a/e-util/gal-view-new-dialog.c b/e-util/gal-view-new-dialog.c
index 1df95a1..aef751b 100644
--- a/e-util/gal-view-new-dialog.c
+++ b/e-util/gal-view-new-dialog.c
@@ -181,7 +181,7 @@ gal_view_new_dialog_new (GalViewCollection *collection)
{
GtkWidget *widget =
gal_view_new_dialog_construct (
- g_object_new (GAL_VIEW_NEW_DIALOG_TYPE, NULL),
+ g_object_new (GAL_TYPE_VIEW_NEW_DIALOG, NULL),
collection);
return widget;
}
diff --git a/e-util/gal-view-new-dialog.h b/e-util/gal-view-new-dialog.h
index 503a594..0d0be9c 100644
--- a/e-util/gal-view-new-dialog.h
+++ b/e-util/gal-view-new-dialog.h
@@ -24,33 +24,37 @@
#error "Only <e-util/e-util.h> should be included directly."
#endif
-#ifndef __GAL_VIEW_NEW_DIALOG_H__
-#define __GAL_VIEW_NEW_DIALOG_H__
+#ifndef GAL_VIEW_NEW_DIALOG_H
+#define GAL_VIEW_NEW_DIALOG_H
#include <gtk/gtk.h>
#include <e-util/gal-view-collection.h>
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define GAL_TYPE_VIEW_NEW_DIALOG \
+ (gal_view_new_dialog_get_type ())
+#define GAL_VIEW_NEW_DIALOG(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), GAL_TYPE_VIEW_NEW_DIALOG, GalViewNewDialog))
+#define GAL_VIEW_NEW_DIALOG_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), GAL_TYPE_VIEW_NEW_DIALOG, GalViewNewDialogClass))
+#define GAL_IS_VIEW_NEW_DIALOG(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), GAL_TYPE_VIEW_NEW_DIALOG))
+#define GAL_IS_VIEW_NEW_DIALOG_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), GAL_TYPE_VIEW_NEW_DIALOG))
+#define GAL_VIEW_NEW_DIALOG_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), GAL_TYPE_VIEW_NEW_DIALOG, GalViewNewDialogClass))
-/* GalViewNewDialog - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name type read/write description
- * --------------------------------------------------------------------------------
- */
-
-#define GAL_VIEW_NEW_DIALOG_TYPE (gal_view_new_dialog_get_type ())
-#define GAL_VIEW_NEW_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_VIEW_NEW_DIALOG_TYPE, GalViewNewDialog))
-#define GAL_VIEW_NEW_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_VIEW_NEW_DIALOG_TYPE, GalViewNewDialogClass))
-#define GAL_IS_VIEW_NEW_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_VIEW_NEW_DIALOG_TYPE))
-#define GAL_IS_VIEW_NEW_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GAL_VIEW_NEW_DIALOG_TYPE))
+G_BEGIN_DECLS
-typedef struct _GalViewNewDialog GalViewNewDialog;
+typedef struct _GalViewNewDialog GalViewNewDialog;
typedef struct _GalViewNewDialogClass GalViewNewDialogClass;
-struct _GalViewNewDialog
-{
+struct _GalViewNewDialog {
GtkDialog parent;
/* item specific fields */
@@ -65,17 +69,15 @@ struct _GalViewNewDialog
GtkWidget *list;
};
-struct _GalViewNewDialogClass
-{
+struct _GalViewNewDialogClass {
GtkDialogClass parent_class;
};
-GtkWidget *gal_view_new_dialog_new (GalViewCollection *collection);
-GType gal_view_new_dialog_get_type (void);
-
-GtkWidget *gal_view_new_dialog_construct (GalViewNewDialog *dialog,
- GalViewCollection *collection);
+GType gal_view_new_dialog_get_type (void) G_GNUC_CONST;
+GtkWidget * gal_view_new_dialog_new (GalViewCollection *collection);
+GtkWidget * gal_view_new_dialog_construct (GalViewNewDialog *dialog,
+ GalViewCollection *collection);
G_END_DECLS
-#endif /* __GAL_VIEW_NEW_DIALOG_H__ */
+#endif /* GAL_VIEW_NEW_DIALOG_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
