diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-07-01 01:13:41 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-07-02 22:34:10 +0800 |
commit | c1e8c1869d42b766663be94041b40839a9c4a53f (patch) | |
tree | adca0ccf7660c54e04325d75cfe857eeecbfee15 | |
parent | 0af0c8427e740f8f16e8da3d81b6465b2163a719 (diff) | |
download | gsoc2013-evolution-c1e8c1869d42b766663be94041b40839a9c4a53f.tar gsoc2013-evolution-c1e8c1869d42b766663be94041b40839a9c4a53f.tar.gz gsoc2013-evolution-c1e8c1869d42b766663be94041b40839a9c4a53f.tar.bz2 gsoc2013-evolution-c1e8c1869d42b766663be94041b40839a9c4a53f.tar.lz gsoc2013-evolution-c1e8c1869d42b766663be94041b40839a9c4a53f.tar.xz gsoc2013-evolution-c1e8c1869d42b766663be94041b40839a9c4a53f.tar.zst gsoc2013-evolution-c1e8c1869d42b766663be94041b40839a9c4a53f.zip |
Remove e_table_specification_load_from_node().
No longer used.
-rw-r--r-- | doc/reference/evolution-util/evolution-util-sections.txt | 1 | ||||
-rw-r--r-- | e-util/e-table-specification.c | 91 | ||||
-rw-r--r-- | e-util/e-table-specification.h | 5 |
3 files changed, 0 insertions, 97 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt index fe0ca2988b..e71381ea6c 100644 --- a/doc/reference/evolution-util/evolution-util-sections.txt +++ b/doc/reference/evolution-util/evolution-util-sections.txt @@ -3924,7 +3924,6 @@ e_table_specification_ref_columns e_table_specification_get_column_index e_table_specification_load_from_file e_table_specification_load_from_string -e_table_specification_load_from_node <SUBSECTION Standard> E_TABLE_SPECIFICATION E_IS_TABLE_SPECIFICATION diff --git a/e-util/e-table-specification.c b/e-util/e-table-specification.c index 5554aaa043..381504ecd6 100644 --- a/e-util/e-table-specification.c +++ b/e-util/e-table-specification.c @@ -22,13 +22,9 @@ #include <string.h> #include <glib/gstdio.h> -#include <libxml/parser.h> -#include <libxml/xmlmemory.h> #include <libedataserver/libedataserver.h> -#include "e-xml-utils.h" - #define E_TABLE_SPECIFICATION_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_TABLE_SPECIFICATION, ETableSpecificationPrivate)) @@ -621,90 +617,3 @@ e_table_specification_load_from_string (ETableSpecification *specification, return success; } -/** - * e_table_specification_load_from_node: - * @specification: an #ETableSpecification - * @node: an #xmlNode containing an #ETable specification - * - * Parses the contents of @node and configures @specification. - */ -void -e_table_specification_load_from_node (ETableSpecification *specification, - const xmlNode *node) -{ - gchar *temp; - xmlNode *children; - - specification->no_headers = e_xml_get_bool_prop_by_name (node, (const guchar *)"no-headers"); - specification->click_to_add = e_xml_get_bool_prop_by_name (node, (const guchar *)"click-to-add"); - specification->click_to_add_end = e_xml_get_bool_prop_by_name (node, (const guchar *)"click-to-add-end") && specification->click_to_add; - specification->alternating_row_colors = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"alternating-row-colors", TRUE); - specification->horizontal_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"horizontal-draw-grid"); - specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"vertical-draw-grid"); - if (e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"draw-grid", TRUE) == - e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"draw-grid", FALSE)) { - specification->horizontal_draw_grid = - specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"draw-grid"); - } - specification->draw_focus = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"draw-focus", TRUE); - specification->horizontal_scrolling = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"horizontal-scrolling", FALSE); - specification->horizontal_resize = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"horizontal-resize", FALSE); - specification->allow_grouping = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"allow-grouping", TRUE); - - specification->selection_mode = GTK_SELECTION_MULTIPLE; - temp = e_xml_get_string_prop_by_name (node, (const guchar *)"selection-mode"); - if (temp && !g_ascii_strcasecmp (temp, "single")) { - specification->selection_mode = GTK_SELECTION_SINGLE; - } else if (temp && !g_ascii_strcasecmp (temp, "browse")) { - specification->selection_mode = GTK_SELECTION_BROWSE; - } else if (temp && !g_ascii_strcasecmp (temp, "extended")) { - specification->selection_mode = GTK_SELECTION_MULTIPLE; - } - g_free (temp); - - specification->cursor_mode = E_CURSOR_SIMPLE; - temp = e_xml_get_string_prop_by_name (node, (const guchar *)"cursor-mode"); - if (temp && !g_ascii_strcasecmp (temp, "line")) { - specification->cursor_mode = E_CURSOR_LINE; - } else if (temp && !g_ascii_strcasecmp (temp, "spreadsheet")) { - specification->cursor_mode = E_CURSOR_SPREADSHEET; - } - g_free (temp); - - g_free (specification->click_to_add_message); - specification->click_to_add_message = - e_xml_get_string_prop_by_name ( - node, (const guchar *)"_click-to-add-message"); - - g_free (specification->domain); - specification->domain = - e_xml_get_string_prop_by_name ( - node, (const guchar *)"gettext-domain"); - if (specification->domain && !*specification->domain) { - g_free (specification->domain); - specification->domain = NULL; - } - - if (specification->state) - g_object_unref (specification->state); - specification->state = NULL; - - g_ptr_array_set_size (specification->priv->columns, 0); - - for (children = node->xmlChildrenNode; children; children = children->next) { - if (!strcmp ((gchar *) children->name, "ETableColumn")) { - ETableColumnSpecification *col_spec = e_table_column_specification_new (); - - e_table_column_specification_load_from_node (col_spec, children); - g_ptr_array_add (specification->priv->columns, col_spec); - } else if (specification->state == NULL && !strcmp ((gchar *) children->name, "ETableState")) { - specification->state = e_table_state_new (specification); - e_table_state_load_from_node (specification->state, children); - e_table_sort_info_set_can_group (specification->state->sort_info, specification->allow_grouping); - } - } - - if (specification->state == NULL) - specification->state = e_table_state_vanilla (specification); -} - diff --git a/e-util/e-table-specification.h b/e-util/e-table-specification.h index bce9c38f6a..5abd0618a8 100644 --- a/e-util/e-table-specification.h +++ b/e-util/e-table-specification.h @@ -23,8 +23,6 @@ #ifndef E_TABLE_SPECIFICATION_H #define E_TABLE_SPECIFICATION_H -#include <libxml/tree.h> - #include <e-util/e-selection-model.h> #include <e-util/e-table-column-specification.h> #include <e-util/e-table-defines.h> @@ -96,9 +94,6 @@ gboolean e_table_specification_load_from_file gboolean e_table_specification_load_from_string (ETableSpecification *specification, const gchar *xml); -void e_table_specification_load_from_node - (ETableSpecification *specification, - const xmlNode *node); G_END_DECLS |