diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-21 02:16:11 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-21 03:31:53 +0800 |
| commit | 27e326c80fc40e9e99ecc4a2c6c3bf744d370e61 (patch) | |
| tree | 1d4557e5612e6127464658fa967d2608de9e5e56 | |
| parent | 7435afa54cb79587a95ee55f2e1e31eb39ee671e (diff) | |
| download | gsoc2013-evolution-27e326c80fc40e9e99ecc4a2c6c3bf744d370e61.tar gsoc2013-evolution-27e326c80fc40e9e99ecc4a2c6c3bf744d370e61.tar.gz gsoc2013-evolution-27e326c80fc40e9e99ecc4a2c6c3bf744d370e61.tar.bz2 gsoc2013-evolution-27e326c80fc40e9e99ecc4a2c6c3bf744d370e61.tar.lz gsoc2013-evolution-27e326c80fc40e9e99ecc4a2c6c3bf744d370e61.tar.xz gsoc2013-evolution-27e326c80fc40e9e99ecc4a2c6c3bf744d370e61.tar.zst gsoc2013-evolution-27e326c80fc40e9e99ecc4a2c6c3bf744d370e61.zip | |
Remove e_sorter_new().
ESorter itself does nothing useful, so there's no reason to create one.
ESorter should really be an interface.
| -rw-r--r-- | doc/reference/evolution-util/evolution-util-sections.txt | 1 | ||||
| -rw-r--r-- | e-util/e-sorter.c | 6 | ||||
| -rw-r--r-- | e-util/e-sorter.h | 1 | ||||
| -rw-r--r-- | e-util/e-tree.c | 14 |
4 files changed, 1 insertions, 21 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt index 176c0fe904..eede4cb59f 100644 --- a/doc/reference/evolution-util/evolution-util-sections.txt +++ b/doc/reference/evolution-util/evolution-util-sections.txt @@ -3064,7 +3064,6 @@ ESendOptionsDialogPrivate <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 diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c index 062a44d915..f2023d7ddf 100644 --- a/e-util/e-sorter.c +++ b/e-util/e-sorter.c @@ -73,12 +73,6 @@ e_sorter_init (ESorter *sorter) { } -ESorter * -e_sorter_new (void) -{ - return g_object_new (E_TYPE_SORTER, NULL); -} - gint e_sorter_model_to_sorted (ESorter *sorter, gint row) diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h index 6949cb0eda..4ab5e8420a 100644 --- a/e-util/e-sorter.h +++ b/e-util/e-sorter.h @@ -79,7 +79,6 @@ struct _ESorterClass { }; 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, diff --git a/e-util/e-tree.c b/e-util/e-tree.c index da1eaadae0..2aea98935a 100644 --- a/e-util/e-tree.c +++ b/e-util/e-tree.c @@ -120,7 +120,6 @@ struct _ETreePrivate { guint structure_change_id, expansion_change_id; ETableSortInfo *sort_info; - ESorter *sorter; guint sort_info_change_id, group_info_change_id; @@ -459,11 +458,6 @@ et_dispose (GObject *object) priv->spec = NULL; } - if (priv->sorter != NULL) { - g_object_unref (priv->sorter); - priv->sorter = NULL; - } - if (priv->header_canvas != NULL) { gtk_widget_destroy (GTK_WIDGET (priv->header_canvas)); priv->header_canvas = NULL; @@ -1552,11 +1546,8 @@ et_real_construct (ETree *tree, et_connect_to_etta (tree); - tree->priv->sorter = e_sorter_new (); - g_object_set ( tree->priv->selection, - "sorter", tree->priv->sorter, "model", tree->priv->model, "etta", tree->priv->etta, "selection_mode", specification->selection_mode, @@ -2057,10 +2048,7 @@ e_tree_view_to_model_row (ETree *tree, { g_return_val_if_fail (E_IS_TREE (tree), -1); - if (tree->priv->sorter) - return e_sorter_sorted_to_model (E_SORTER (tree->priv->sorter), view_row); - else - return view_row; + return view_row; } /** |