aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lahey <clahey@src.gnome.org>2000-06-02 08:29:48 +0800
committerChris Lahey <clahey@src.gnome.org>2000-06-02 08:29:48 +0800
commit9b20ec31fa7fa1a438d124a6909ab2f722ab8a79 (patch)
tree8190492d296e5ed74e8971dbbf863176e17ce901
parentabac1b7524f99c9cdbd317671fd2debabd7d4d0c (diff)
downloadgsoc2013-evolution-9b20ec31fa7fa1a438d124a6909ab2f722ab8a79.tar.gz
gsoc2013-evolution-9b20ec31fa7fa1a438d124a6909ab2f722ab8a79.tar.zst
gsoc2013-evolution-9b20ec31fa7fa1a438d124a6909ab2f722ab8a79.zip
Accidental commit fix.
svn path=/trunk/; revision=3354
-rw-r--r--widgets/e-table/e-cell-text.c12
-rw-r--r--widgets/table/e-cell-text.c12
2 files changed, 18 insertions, 6 deletions
diff --git a/widgets/e-table/e-cell-text.c b/widgets/e-table/e-cell-text.c
index d7ef682fde..d2de76f04f 100644
--- a/widgets/e-table/e-cell-text.c
+++ b/widgets/e-table/e-cell-text.c
@@ -1046,12 +1046,14 @@ ect_height (ECellView *ecell_view, int model_col, int view_col, int row)
GdkFont *font;
font = text_view->font;
+#if 0
if (text_view->filter) {
char *string = text_view->filter(e_table_model_value_at (ecell_view->e_table_model, model_col, row));
int value = (font->ascent + font->descent) * number_of_lines(string) + TEXT_PAD;
g_free(string);
return value;
} else
+#endif
return (font->ascent + font->descent) * number_of_lines(e_table_model_value_at (ecell_view->e_table_model, model_col, row)) + TEXT_PAD;
}
@@ -1103,12 +1105,16 @@ ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
edit->pointer_in = FALSE;
edit->default_cursor_shown = TRUE;
+#if 0
if (ect->filter) {
str = ect->filter(e_table_model_value_at (ecell_view->e_table_model, model_col, row));
edit->old_text = str;
- } else {
- edit->old_text = g_strdup (str);
- }
+ } else
+#endif
+ {
+ str = e_table_model_value_at (ecell_view->e_table_model, model_col, row);
+ edit->old_text = g_strdup (str);
+ }
edit->cell.text = g_strdup (str);
#if 0
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index d7ef682fde..d2de76f04f 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -1046,12 +1046,14 @@ ect_height (ECellView *ecell_view, int model_col, int view_col, int row)
GdkFont *font;
font = text_view->font;
+#if 0
if (text_view->filter) {
char *string = text_view->filter(e_table_model_value_at (ecell_view->e_table_model, model_col, row));
int value = (font->ascent + font->descent) * number_of_lines(string) + TEXT_PAD;
g_free(string);
return value;
} else
+#endif
return (font->ascent + font->descent) * number_of_lines(e_table_model_value_at (ecell_view->e_table_model, model_col, row)) + TEXT_PAD;
}
@@ -1103,12 +1105,16 @@ ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
edit->pointer_in = FALSE;
edit->default_cursor_shown = TRUE;
+#if 0
if (ect->filter) {
str = ect->filter(e_table_model_value_at (ecell_view->e_table_model, model_col, row));
edit->old_text = str;
- } else {
- edit->old_text = g_strdup (str);
- }
+ } else
+#endif
+ {
+ str = e_table_model_value_at (ecell_view->e_table_model, model_col, row);
+ edit->old_text = g_strdup (str);
+ }
edit->cell.text = g_strdup (str);
#if 0