aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-07-13 11:33:07 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-07-13 11:33:07 +0800
commit0274669179600ac77475eed9870d2eab52c2cf14 (patch)
tree80f228649b670efac7f76ba5c0da5ed22a3a05c9 /widgets/table
parentadb63f0f2156554a21dbfd8daba447001985e967 (diff)
downloadgsoc2013-evolution-0274669179600ac77475eed9870d2eab52c2cf14.tar
gsoc2013-evolution-0274669179600ac77475eed9870d2eab52c2cf14.tar.gz
gsoc2013-evolution-0274669179600ac77475eed9870d2eab52c2cf14.tar.bz2
gsoc2013-evolution-0274669179600ac77475eed9870d2eab52c2cf14.tar.lz
gsoc2013-evolution-0274669179600ac77475eed9870d2eab52c2cf14.tar.xz
gsoc2013-evolution-0274669179600ac77475eed9870d2eab52c2cf14.tar.zst
gsoc2013-evolution-0274669179600ac77475eed9870d2eab52c2cf14.zip
Fix excessive whitespace.
Diffstat (limited to 'widgets/table')
-rw-r--r--widgets/table/e-cell-combo.c15
-rw-r--r--widgets/table/e-cell-combo.h2
-rw-r--r--widgets/table/e-cell-hbox.h1
-rw-r--r--widgets/table/e-cell-popup.c23
-rw-r--r--widgets/table/e-cell-popup.h3
-rw-r--r--widgets/table/e-cell-text.c14
-rw-r--r--widgets/table/e-cell-text.h1
-rw-r--r--widgets/table/e-cell-toggle.c1
-rw-r--r--widgets/table/e-cell-toggle.h1
-rw-r--r--widgets/table/e-cell-tree.c3
-rw-r--r--widgets/table/e-cell-tree.h2
-rw-r--r--widgets/table/e-cell-vbox.c3
-rw-r--r--widgets/table/e-cell-vbox.h1
-rw-r--r--widgets/table/e-table-click-to-add.c1
-rw-r--r--widgets/table/e-table-config.c4
-rw-r--r--widgets/table/e-table-config.h1
-rw-r--r--widgets/table/e-table-defines.h1
-rw-r--r--widgets/table/e-table-example-2.c2
-rw-r--r--widgets/table/e-table-field-chooser-dialog.h3
-rw-r--r--widgets/table/e-table-field-chooser.h2
-rw-r--r--widgets/table/e-table-group-container.c6
-rw-r--r--widgets/table/e-table-group-container.h1
-rw-r--r--widgets/table/e-table-group-leaf.h1
-rw-r--r--widgets/table/e-table-header-item.c2
-rw-r--r--widgets/table/e-table-header-utils.c1
-rw-r--r--widgets/table/e-table-item.c9
-rw-r--r--widgets/table/e-table-item.h1
-rw-r--r--widgets/table/e-table-memory-store.c2
-rw-r--r--widgets/table/e-table-memory.h1
-rw-r--r--widgets/table/e-table-model.c4
-rw-r--r--widgets/table/e-table-model.h2
-rw-r--r--widgets/table/e-table-one.c1
-rw-r--r--widgets/table/e-table-selection-model.h1
-rw-r--r--widgets/table/e-table-simple.h1
-rw-r--r--widgets/table/e-table-sort-info.c2
-rw-r--r--widgets/table/e-table-sorted-variable.c1
-rw-r--r--widgets/table/e-table-sorter.c3
-rw-r--r--widgets/table/e-table-sorting-utils.c4
-rw-r--r--widgets/table/e-table-sorting-utils.h4
-rw-r--r--widgets/table/e-table-state.c1
-rw-r--r--widgets/table/e-table-without.h1
-rw-r--r--widgets/table/e-table.c8
-rw-r--r--widgets/table/e-tree-memory-callbacks.c2
-rw-r--r--widgets/table/e-tree-memory-callbacks.h1
-rw-r--r--widgets/table/e-tree-memory.h1
-rw-r--r--widgets/table/e-tree-model.c1
-rw-r--r--widgets/table/e-tree-model.h4
-rw-r--r--widgets/table/e-tree-selection-model.c3
-rw-r--r--widgets/table/e-tree-selection-model.h2
-rw-r--r--widgets/table/e-tree-simple.h1
-rw-r--r--widgets/table/e-tree-sorted-variable.c3
-rw-r--r--widgets/table/e-tree-sorted.c4
-rw-r--r--widgets/table/e-tree-sorted.h1
-rw-r--r--widgets/table/e-tree-table-adapter.c2
-rw-r--r--widgets/table/e-tree.c3
55 files changed, 0 insertions, 169 deletions
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index ef1bb5bc42..988ba8e12f 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -70,7 +70,6 @@
#define d(x)
-
/* The height to make the popup list if there aren't any items in it. */
#define E_CELL_COMBO_LIST_EMPTY_HEIGHT 15
@@ -120,7 +119,6 @@ e_cell_combo_class_init (ECellComboClass *klass)
ecpc->popup = e_cell_combo_do_popup;
}
-
static void
e_cell_combo_init (ECellCombo *ecc)
{
@@ -191,7 +189,6 @@ e_cell_combo_init (ECellCombo *ecc)
G_CALLBACK (e_cell_combo_key_press), ecc);
}
-
/**
* e_cell_combo_new:
*
@@ -207,7 +204,6 @@ e_cell_combo_new (void)
return (ECell*) ecc;
}
-
/*
* GObject::dispose method
*/
@@ -223,8 +219,6 @@ e_cell_combo_dispose (GObject *object)
G_OBJECT_CLASS (e_cell_combo_parent_class)->dispose (object);
}
-
-
void
e_cell_combo_set_popdown_strings (ECellCombo *ecc,
GList *strings)
@@ -247,7 +241,6 @@ e_cell_combo_set_popdown_strings (ECellCombo *ecc,
}
}
-
static gint
e_cell_combo_do_popup (ECellPopup *ecp,
GdkEvent *event,
@@ -287,7 +280,6 @@ e_cell_combo_do_popup (ECellPopup *ecp,
return TRUE;
}
-
static void
e_cell_combo_select_matching_item (ECellCombo *ecc)
{
@@ -362,7 +354,6 @@ e_cell_combo_show_popup (ECellCombo *ecc, gint row, gint view_col)
d(g_print("%s: popup_shown = TRUE\n", __FUNCTION__));
}
-
/* Calculates the size and position of the popup window (like GtkCombo). */
static void
e_cell_combo_get_popup_pos (ECellCombo *ecc,
@@ -555,7 +546,6 @@ e_cell_combo_button_press (GtkWidget *popup_window,
return TRUE;
}
-
/* This handles button release events in the popup window. If the button is
released inside the list, we want to hide the popup window and update the
cell with the new selection. */
@@ -592,7 +582,6 @@ e_cell_combo_button_release (GtkWidget *popup_window,
return TRUE;
}
-
/* This handles key press events in the popup window. If the Escape key is
pressed we hide the popup, and do not change the cell contents. */
static gint
@@ -627,7 +616,6 @@ e_cell_combo_key_press (GtkWidget *popup_window,
return TRUE;
}
-
static void
e_cell_combo_update_cell (ECellCombo *ecc)
{
@@ -665,7 +653,6 @@ e_cell_combo_update_cell (ECellCombo *ecc)
g_free (text);
}
-
static void
e_cell_combo_restart_edit (ECellCombo *ecc)
{
@@ -678,5 +665,3 @@ e_cell_combo_restart_edit (ECellCombo *ecc)
#endif
}
-
-
diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h
index fafda30031..728addeed9 100644
--- a/widgets/table/e-cell-combo.h
+++ b/widgets/table/e-cell-combo.h
@@ -39,7 +39,6 @@
#define E_IS_CELL_COMBO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_COMBO_TYPE))
#define E_IS_CELL_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_COMBO_TYPE))
-
typedef struct {
ECellPopup parent;
@@ -52,7 +51,6 @@ typedef struct {
ECellPopupClass parent_class;
} ECellComboClass;
-
GType e_cell_combo_get_type (void);
ECell *e_cell_combo_new (void);
diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h
index def14d81ed..fda96de9e2 100644
--- a/widgets/table/e-cell-hbox.h
+++ b/widgets/table/e-cell-hbox.h
@@ -63,7 +63,6 @@ void e_cell_hbox_append (ECellHbox *vbox,
gint model_col,
gint size);
-
G_END_DECLS
#endif /* _E_CELL_HBOX_H_ */
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 8dff44914a..b427a0c24f 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -45,10 +45,8 @@
#define E_CELL_POPUP_ARROW_XPAD 3
#define E_CELL_POPUP_ARROW_YPAD 3
-
static void e_cell_popup_dispose (GObject *object);
-
static ECellView* ecp_new_view (ECell *ecell,
ETableModel *table_model,
void *e_table_item_view);
@@ -143,7 +141,6 @@ e_cell_popup_class_init (ECellPopupClass *klass)
gal_a11y_e_cell_popup_new);
}
-
static void
e_cell_popup_init (ECellPopup *ecp)
{
@@ -151,7 +148,6 @@ e_cell_popup_init (ECellPopup *ecp)
ecp->popup_model = NULL;
}
-
/**
* e_cell_popup_new:
*
@@ -167,7 +163,6 @@ e_cell_popup_new (void)
return (ECell*) ecp;
}
-
/*
* GtkObject::destroy method
*/
@@ -183,8 +178,6 @@ e_cell_popup_dispose (GObject *object)
G_OBJECT_CLASS (e_cell_popup_parent_class)->dispose (object);
}
-
-
/*
* ECell::new_view method
*/
@@ -211,7 +204,6 @@ ecp_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
return (ECellView*) ecp_view;
}
-
/*
* ECell::kill_view method
*/
@@ -231,7 +223,6 @@ ecp_kill_view (ECellView *ecv)
g_free (ecp_view);
}
-
/*
* ECell::realize method
*/
@@ -246,7 +237,6 @@ ecp_realize (ECellView *ecv)
(* E_CELL_CLASS (e_cell_popup_parent_class)->realize) (ecv);
}
-
/*
* ECell::unrealize method
*/
@@ -261,7 +251,6 @@ ecp_unrealize (ECellView *ecv)
(* E_CELL_CLASS (e_cell_popup_parent_class)->unrealize) (ecv);
}
-
/*
* ECell::draw method
*/
@@ -321,7 +310,6 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable,
}
}
-
/*
* ECell::event method
*/
@@ -364,7 +352,6 @@ ecp_event (ECellView *ecv, GdkEvent *event, gint model_col, gint view_col,
row, flags, actions);
}
-
/*
* ECell::height method
*/
@@ -376,7 +363,6 @@ ecp_height (ECellView *ecv, gint model_col, gint view_col, gint row)
return e_cell_height (ecp_view->child_view, model_col, view_col, row);
}
-
/*
* ECellView::enter_edit method
*/
@@ -388,7 +374,6 @@ ecp_enter_edit (ECellView *ecv, gint model_col, gint view_col, gint row)
return e_cell_enter_edit (ecp_view->child_view, model_col, view_col, row);
}
-
/*
* ECellView::leave_edit method
*/
@@ -402,7 +387,6 @@ ecp_leave_edit (ECellView *ecv, gint model_col, gint view_col, gint row,
edit_context);
}
-
static void
ecp_print (ECellView *ecv, GtkPrintContext *context,
gint model_col, gint view_col, gint row, double width, double height)
@@ -413,7 +397,6 @@ ecp_print (ECellView *ecv, GtkPrintContext *context,
width, height);
}
-
static gdouble
ecp_print_height (ECellView *ecv, GtkPrintContext *context,
gint model_col, gint view_col, gint row,
@@ -425,7 +408,6 @@ ecp_print_height (ECellView *ecv, GtkPrintContext *context,
view_col, row, width);
}
-
static gint
ecp_max_width (ECellView *ecv,
gint model_col,
@@ -436,7 +418,6 @@ ecp_max_width (ECellView *ecv,
return e_cell_max_width (ecp_view->child_view, model_col, view_col);
}
-
static void
ecp_show_tooltip (ECellView *ecv,
gint model_col,
@@ -459,8 +440,6 @@ ecp_get_bg_color (ECellView *ecell_view, gint row)
return e_cell_get_bg_color (ecp_view->child_view, row);
}
-
-
ECell*
e_cell_popup_get_child (ECellPopup *ecp)
{
@@ -469,7 +448,6 @@ e_cell_popup_get_child (ECellPopup *ecp)
return ecp->child;
}
-
void
e_cell_popup_set_child (ECellPopup *ecp,
ECell *child)
@@ -483,7 +461,6 @@ e_cell_popup_set_child (ECellPopup *ecp,
g_object_ref (child);
}
-
static gint
e_cell_popup_do_popup (ECellPopupView *ecp_view,
GdkEvent *event,
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
index a8ce08f44f..4ea1127da6 100644
--- a/widgets/table/e-cell-popup.h
+++ b/widgets/table/e-cell-popup.h
@@ -66,7 +66,6 @@ typedef struct {
ETableModel *popup_model;
} ECellPopup;
-
typedef struct {
ECellClass parent_class;
@@ -74,14 +73,12 @@ typedef struct {
gint (*popup) (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col);
} ECellPopupClass;
-
struct _ECellPopupView {
ECellView cell_view;
ECellView *child_view;
};
-
GType e_cell_popup_get_type (void);
ECell *e_cell_popup_new (void);
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index c62e2d52c5..e2b0f991b3 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -91,7 +91,6 @@ enum {
PROP_BG_COLOR_COLUMN
};
-
enum {
E_SELECTION_PRIMARY,
E_SELECTION_CLIPBOARD
@@ -121,7 +120,6 @@ typedef struct {
gint ref_count;
} ECellTextLineBreaks;
-
typedef struct _CellEdit CellEdit;
typedef struct {
@@ -137,7 +135,6 @@ typedef struct {
*/
CellEdit *edit;
-
gint xofs, yofs; /* This gets added to the x
and y for the cell text. */
double ellipsis_width[2]; /* The width of the ellipsis. */
@@ -361,13 +358,11 @@ ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
text_view->cell_view.kill_view_cb = NULL;
text_view->cell_view.kill_view_cb_data = NULL;
-
text_view->canvas = canvas;
text_view->xofs = 0.0;
text_view->yofs = 0.0;
-
return (ECellView *)text_view;
}
@@ -454,7 +449,6 @@ ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap)
}
}
-
static PangoAttrList*
build_attr_list (ECellTextView *text_view, gint row, gint text_length)
{
@@ -513,7 +507,6 @@ layout_with_preedit (ECellTextView *text_view, gint row, const gchar *text, gint
gint text_length = strlen (text);
gint mlen = MIN(edit->selection_start,text_length);
-
gtk_im_context_get_preedit_string (edit->im_context,
&preedit_string,&preedit_attrs,
NULL);
@@ -659,7 +652,6 @@ generate_layout (ECellTextView *text_view, gint model_col, gint view_col, gint r
return layout;
}
-
static void
draw_pango_rectangle (GdkDrawable *drawable, GdkGC *gc, gint x1, gint y1, PangoRectangle rect)
{
@@ -875,7 +867,6 @@ ect_get_bg_color(ECellView *ecell_view, gint row)
return color_spec;
}
-
/*
* Selects the entire string
*/
@@ -1344,7 +1335,6 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
gchar *string;
double ty, ly, text_width = 0.0, text_height = 0.0;
-
cr = gtk_print_context_get_cairo_context (context);
string = e_cell_text_get_text(ect, ecell_view->e_table_model, model_col, row);
@@ -1793,8 +1783,6 @@ e_cell_text_class_init (ECellTextClass *klass)
G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT,
G_TYPE_INT, G_TYPE_INT);
-
-
g_object_class_install_property (object_class, PROP_STRIKEOUT_COLUMN,
g_param_spec_int ("strikeout_column",
_("Strikeout Column"),
@@ -1852,7 +1840,6 @@ e_cell_text_class_init (ECellTextClass *klass)
gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_TEXT_TYPE, gal_a11y_e_cell_text_new);
}
-
/* IM Context Callbacks */
static void
@@ -2065,7 +2052,6 @@ e_cell_text_new (const gchar *fontname, GtkJustification justify)
return (ECell *) ect;
}
-
/* fixme: Handle Font attributes */
/* position is in BYTES */
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index f3ecc415b4..740db82880 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -128,4 +128,3 @@ G_END_DECLS
#endif /* _E_CELL_TEXT_H_ */
-
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 4057c06440..b1748b4350 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -139,7 +139,6 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
if (E_TABLE_ITEM (ecell_view->e_table_item_view)->alternating_row_colors && (row % 2) == 0)
cache_seq += 3;
-
image = toggle->images[value];
if ((x2 - x1) < gdk_pixbuf_get_width (image)){
diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h
index 96e3d01a55..09b458f43c 100644
--- a/widgets/table/e-cell-toggle.h
+++ b/widgets/table/e-cell-toggle.h
@@ -61,4 +61,3 @@ G_END_DECLS
#endif /* _E_CELL_TOGGLE_H_ */
-
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 7e7325684d..27698f8f67 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -51,10 +51,8 @@
#include "tree-expanded.xpm"
#include "tree-unexpanded.xpm"
-
G_DEFINE_TYPE (ECellTree, e_cell_tree, E_CELL_TYPE)
-
typedef struct {
ECellView cell_view;
ECellView *subcell_view;
@@ -887,7 +885,6 @@ e_cell_tree_construct (ECellTree *ect,
ect->draw_lines = draw_lines;
}
-
/**
* e_cell_tree_new:
* @open_pixbuf: pixbuf to be used instead of the '-' icon.
diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h
index 36d4a85541..465af77ca2 100644
--- a/widgets/table/e-cell-tree.h
+++ b/widgets/table/e-cell-tree.h
@@ -42,7 +42,6 @@ G_BEGIN_DECLS
#define E_IS_CELL_TREE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_TREE_TYPE))
#define E_IS_CELL_TREE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_TREE_TYPE))
-
typedef struct {
ECell parent;
@@ -75,4 +74,3 @@ G_END_DECLS
#endif /* _E_CELL_TREE_H_ */
-
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 3d18894530..7759203d32 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -178,7 +178,6 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
break;
}
-
for (i = 0; i < vbox_view->subcell_view_count; i++) {
gint height = e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row);
if (y < subcell_offset + height)
@@ -373,7 +372,6 @@ ecv_print (ECellView *ecell_view, GnomePrintContext *context,
width -= subcell_offset;
}
-
e_cell_print (vbox_view->subcell_view, context, model_col, view_col, row, width, height);
}
@@ -454,7 +452,6 @@ e_cell_vbox_init (ECellVbox *ecv)
ecv->subcell_count = 0;
}
-
/**
* e_cell_vbox_new:
*
diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h
index 58aa523c58..7762e62869 100644
--- a/widgets/table/e-cell-vbox.h
+++ b/widgets/table/e-cell-vbox.h
@@ -65,7 +65,6 @@ void e_cell_vbox_append (ECellVbox *vbox,
ECell *subcell,
gint model_col);
-
G_END_DECLS
#endif /* _E_CELL_VBOX_H_ */
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index eceae68bc8..c2024e4bcb 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -172,7 +172,6 @@ etcta_drop_message (ETableClickToAdd *etcta)
etcta->message = NULL;
}
-
static void
etcta_dispose (GObject *object)
{
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 3a0ee849e8..3de22f54f3 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -504,7 +504,6 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
? config->sort [0].combo
: config->group [0].combo));
-
if (is_sort)
dialog = GTK_DIALOG (config->dialog_sort);
else
@@ -592,7 +591,6 @@ do_fields_config_dialog (ETableConfig *config)
config_fields_info_update (config);
}
-
static ETableMemoryStoreColumnInfo store_columns[] = {
E_TABLE_MEMORY_STORE_STRING,
E_TABLE_MEMORY_STORE_INTEGER,
@@ -974,7 +972,6 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui)
config->group [i].e_table_config = config;
}
-
for (l = config->column_names; l; l = l->next){
gchar *label = l->data;
@@ -1131,7 +1128,6 @@ config_button_down (GtkWidget *widget, ETableConfig *config)
if (columns == NULL)
return;
-
new_shown = g_new (int, config->temp_state->col_count);
new_expansions = g_new (double, config->temp_state->col_count);
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index 72357fb8f6..c3f994a635 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -50,7 +50,6 @@ typedef struct {
gpointer e_table_config;
} ETableConfigSortWidgets;
-
typedef struct {
GObject parent;
diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h
index de23cb994d..d7b261160b 100644
--- a/widgets/table/e-table-defines.h
+++ b/widgets/table/e-table-defines.h
@@ -37,5 +37,4 @@ G_BEGIN_DECLS
G_END_DECLS
-
#endif
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
index 391873b043..f5dc15d74d 100644
--- a/widgets/table/e-table-example-2.c
+++ b/widgets/table/e-table-example-2.c
@@ -331,8 +331,6 @@ create_table ()
gtk_widget_show_all (window);
}
-
-
gint
main (gint argc, gchar *argv [])
{
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
index 8d12eb34db..e2d1c2ef9b 100644
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ b/widgets/table/e-table-field-chooser-dialog.h
@@ -43,7 +43,6 @@ G_BEGIN_DECLS
#define E_IS_TABLE_FIELD_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
#define E_IS_TABLE_FIELD_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
-
typedef struct _ETableFieldChooserDialog ETableFieldChooserDialog;
typedef struct _ETableFieldChooserDialogClass ETableFieldChooserDialogClass;
@@ -63,11 +62,9 @@ struct _ETableFieldChooserDialogClass
GtkDialogClass parent_class;
};
-
GtkWidget *e_table_field_chooser_dialog_new(void);
GType e_table_field_chooser_dialog_get_type (void);
G_END_DECLS
-
#endif /* __E_TABLE_FIELD_CHOOSER_DIALOG_H__ */
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
index 71e17244f1..996ae9f9b6 100644
--- a/widgets/table/e-table-field-chooser.h
+++ b/widgets/table/e-table-field-chooser.h
@@ -44,7 +44,6 @@ G_BEGIN_DECLS
#define E_IS_TABLE_FIELD_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
#define E_IS_TABLE_FIELD_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
-
typedef struct _ETableFieldChooser ETableFieldChooser;
typedef struct _ETableFieldChooserClass ETableFieldChooserClass;
@@ -70,7 +69,6 @@ struct _ETableFieldChooserClass
GtkVBoxClass parent_class;
};
-
GtkWidget *e_table_field_chooser_new(void);
GType e_table_field_chooser_get_type (void);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 1ba845e2c3..6ec62e5607 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -64,7 +64,6 @@ enum {
static EPrintable *
etgc_get_printable (ETableGroup *etg);
-
static void
e_table_group_container_child_node_free (ETableGroupContainer *etgc,
ETableGroupContainerChildNode *child_node)
@@ -197,7 +196,6 @@ e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header
return E_TABLE_GROUP (etgc);
}
-
static gint
etgc_event (GnomeCanvasItem *item, GdkEvent *event)
{
@@ -1019,7 +1017,6 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
if (frozen)
return;
-
if (GTK_OBJECT_FLAGS(etgc)& GNOME_CANVAS_ITEM_REALIZED){
gdouble running_height = 0;
gdouble running_width = 0;
@@ -1139,15 +1136,12 @@ e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, gpointer c
}
}
-
typedef struct {
ETableGroupContainer *etgc;
GList *child;
EPrintable *child_printable;
} ETGCPrintContext;
-
-
#define CHECK(x) if((x) == -1) return -1;
#if 0
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
index 168b2f8a5a..911b7f3290 100644
--- a/widgets/table/e-table-group-container.h
+++ b/widgets/table/e-table-group-container.h
@@ -93,7 +93,6 @@ typedef struct {
gint count;
} ETableGroupContainerChildNode;
-
ETableGroup *e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header, ETableHeader *header,
ETableModel *model, ETableSortInfo *sort_info, gint n);
void e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc,
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
index 8d05874c01..d34f0343b0 100644
--- a/widgets/table/e-table-group-leaf.h
+++ b/widgets/table/e-table-group-leaf.h
@@ -83,7 +83,6 @@ ETableGroup *e_table_group_leaf_new (GnomeCanvasGroup *parent,
ETableSortInfo *sort_info);
GType e_table_group_leaf_get_type (void);
-
G_END_DECLS
#endif /* _E_TABLE_GROUP_LEAF_H_ */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 67695e87b3..cc6886f848 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -874,7 +874,6 @@ ethi_realize (GnomeCanvasItem *item)
{ (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
};
-
if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize)
(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item);
@@ -944,7 +943,6 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wi
gint col;
GHashTable *arrows = g_hash_table_new (NULL, NULL);
-
if (ethi->sort_info) {
gint length = e_table_sort_info_grouping_get_count(ethi->sort_info);
gint i;
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index bfc6768817..3e3c7f44c9 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -276,7 +276,6 @@ e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget,
else
arrow_width = ARROW_WIDTH;
-
lines = pango_layout_get_lines (layout);
line = lines->data;
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index e5eb2f2d11..8d34e5c663 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -107,7 +107,6 @@ enum {
#define DOUBLE_CLICK_TIME 250
#define TRIPLE_CLICK_TIME 500
-
static gint eti_get_height (ETableItem *eti);
static gint eti_row_height (ETableItem *eti, gint row);
static void e_table_item_focus (ETableItem *eti, gint col, gint row, GdkModifierType state);
@@ -596,7 +595,6 @@ eti_remove_header_model (ETableItem *eti)
}
g_object_unref (eti->header);
-
eti->header_structure_change_id = 0;
eti->header_dim_change_id = 0;
eti->header_request_width_id = 0;
@@ -691,7 +689,6 @@ calculate_height_cache (ETableItem *eti)
confirm_height_cache(eti);
}
-
/*
* eti_row_height:
*
@@ -1686,7 +1683,6 @@ eti_realize (GnomeCanvasItem *item)
if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)
(*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item);
-
eti->rows = e_table_model_row_count (eti->table_model);
/*
@@ -1812,8 +1808,6 @@ eti_unrealize (GnomeCanvasItem *item)
(*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item);
}
-
-
static void
eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height)
{
@@ -2496,7 +2490,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
}
#endif
-
if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1))
return TRUE;
@@ -2505,7 +2498,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
"cursor_col", &cursor_col,
NULL);
-
d(g_print("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n"
"eti_editing: %s, row:%d:%d, col:%d:%d\n", __FUNCTION__, e->button.button, __LINE__,
eti_editing(eti)?"true":"false", cursor_row, view_to_model_row(eti, row), cursor_col, view_to_model_col(eti, col)));
@@ -3348,7 +3340,6 @@ eti_selection_row_change (ESelectionModel *selection, gint row, ETableItem *eti)
}
}
-
/**
* e_table_item_enter_edit
* @eti: %ETableItem which will start being edited
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 92e8e0c2fd..cd3bf1d26b 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -187,7 +187,6 @@ typedef struct {
} ETableItemClass;
GType e_table_item_get_type (void);
-
/*
* Focus
*/
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 95ea4bee99..2775d2d461 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -86,7 +86,6 @@ free_value (ETableMemoryStore *etms, gint col, gpointer value)
}
}
-
static gint
etms_column_count (ETableModel *etm)
{
@@ -323,7 +322,6 @@ e_table_memory_store_construct (ETableMemoryStore *etms, ETableMemoryStoreColumn
return E_TABLE_MODEL (etms);
}
-
void
e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, gint col, gint row, gpointer value)
{
diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h
index 07a79b6856..8de51b7c5e 100644
--- a/widgets/table/e-table-memory.h
+++ b/widgets/table/e-table-memory.h
@@ -48,7 +48,6 @@ struct ETableMemoryClass {
ETableModelClass parent_class;
};
-
GType e_table_memory_get_type (void);
void e_table_memory_construct (ETableMemory *etable);
ETableMemory *e_table_memory_new (void);
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 2badb768c9..3962550dd8 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -36,7 +36,6 @@
d(static gint depth = 0;)
-
G_DEFINE_TYPE (ETableModel, e_table_model, G_TYPE_OBJECT)
enum {
@@ -68,7 +67,6 @@ e_table_model_column_count (ETableModel *e_table_model)
return ETM_CLASS (e_table_model)->column_count (e_table_model);
}
-
/**
* e_table_model_row_count:
* @e_table_model: the e-table-model to operate on
@@ -171,7 +169,6 @@ e_table_model_is_cell_editable (ETableModel *e_table_model, gint col, gint row)
return ETM_CLASS (e_table_model)->is_cell_editable (e_table_model, col, row);
}
-
gpointer
e_table_model_duplicate_value (ETableModel *e_table_model, gint col, gconstpointer value)
{
@@ -289,7 +286,6 @@ e_table_model_class_init (ETableModelClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
-
e_table_model_signals [MODEL_CHANGED] =
g_signal_new ("model_changed",
G_TYPE_FROM_CLASS (object_class),
diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h
index 571c2f8a12..e319b1ff42 100644
--- a/widgets/table/e-table-model.h
+++ b/widgets/table/e-table-model.h
@@ -69,7 +69,6 @@ typedef struct {
/* Return an allocated string. */
gchar *(*value_to_string) (ETableModel *etm, gint col, gconstpointer value);
-
/*
* Signals
*/
@@ -124,7 +123,6 @@ gchar *e_table_model_get_save_id (ETableModel *etm,
/**/
gboolean e_table_model_has_change_pending (ETableModel *etm);
-
/**/
void *e_table_model_duplicate_value (ETableModel *e_table_model,
gint col,
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index a604e7a590..07da209088 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -144,7 +144,6 @@ one_dispose (GObject *object)
{
ETableOne *one = E_TABLE_ONE (object);
-
if (one->data) {
gint i;
gint col_count;
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 380f49cccd..ab504ac711 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -68,5 +68,4 @@ ETableSelectionModel *e_table_selection_model_new (void);
G_END_DECLS
-
#endif /* _E_TABLE_SELECTION_MODEL_H_ */
diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h
index c93b313a82..81752a517f 100644
--- a/widgets/table/e-table-simple.h
+++ b/widgets/table/e-table-simple.h
@@ -95,7 +95,6 @@ ETableModel *e_table_simple_new (ETableSimpleColumnCountFn
ETableSimpleValueToStringFn value_to_string,
void *data);
-
/* Helper functions for if your values are all just strings. */
void *e_table_simple_string_duplicate_value (ETableModel *etm,
gint col,
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index bed0c5d679..e4a3874bf0 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -251,7 +251,6 @@ e_table_sort_info_grouping_set_nth (ETableSortInfo *info, gint n, ETableSortCo
e_table_sort_info_group_info_changed(info);
}
-
/**
* e_table_sort_info_get_count:
* @info: The ETableSortInfo object
@@ -472,4 +471,3 @@ e_table_sort_info_get_can_group (ETableSortInfo *info)
return info->can_group;
}
-
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index 4676db8ac4..a65046234a 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -119,7 +119,6 @@ etsv_insert_idle(ETableSortedVariable *etsv)
return FALSE;
}
-
static void
etsv_add (ETableSubsetVariable *etssv,
gint row)
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 766d94dd58..2124ea4019 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -306,7 +306,6 @@ ets_clean(ETableSorter *ets)
ets->needs_sorting = -1;
}
-
static void
ets_sort(ETableSorter *ets)
{
@@ -380,7 +379,6 @@ ets_backsort(ETableSorter *ets)
}
}
-
static gint
ets_model_to_sorted (ESorter *es, gint row)
{
@@ -445,7 +443,6 @@ ets_get_sorted_to_model_array (ESorter *es, gint **array, gint *count)
}
}
-
static gboolean
ets_needs_sorting(ESorter *es)
{
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index cf1b503b09..344a7cf6b1 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -176,7 +176,6 @@ e_table_sorting_utils_affects_sort (ETableSortInfo *sort_info,
return FALSE;
}
-
/* FIXME: This could be done in time log n instead of time n with a binary search. */
gint
e_table_sorting_utils_insert(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint *map_table, gint rows, gint row)
@@ -214,9 +213,6 @@ e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_
return i;
}
-
-
-
/* This takes source rows. */
static gint
etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath path1, ETreePath path2)
diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h
index d348d4b6b1..318c331e53 100644
--- a/widgets/table/e-table-sorting-utils.h
+++ b/widgets/table/e-table-sorting-utils.h
@@ -33,8 +33,6 @@ gboolean e_table_sorting_utils_affects_sort (ETableSortInfo *sort_info,
ETableHeader *full_header,
gint col);
-
-
void e_table_sorting_utils_sort (ETableModel *source,
ETableSortInfo *sort_info,
ETableHeader *full_header,
@@ -53,8 +51,6 @@ gint e_table_sorting_utils_check_position (ETableModel *source,
gint rows,
gint view_row);
-
-
void e_table_sorting_utils_tree_sort (ETreeModel *source,
ETableSortInfo *sort_info,
ETableHeader *full_header,
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 6cbdcbacb9..9f24f30d28 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -262,7 +262,6 @@ e_table_state_save_to_node (ETableState *state,
e_xml_set_double_prop_by_name(new_node, (const guchar *)"expansion", expansion);
}
-
e_table_sort_info_save_to_node(state->sort_info, node);
return node;
diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h
index 799c107d20..ce4745cff9 100644
--- a/widgets/table/e-table-without.h
+++ b/widgets/table/e-table-without.h
@@ -82,6 +82,5 @@ void e_table_without_show (ETableWithout *etw,
void e_table_without_show_all (ETableWithout *etw);
G_END_DECLS
-
#endif /* _E_TABLE_WITHOUT_H_ */
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 703f645527..11938139f0 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -53,7 +53,6 @@
#include "e-table-subset.h"
#include "e-table-utils.h"
-
#define COLUMN_HEADER_HEIGHT 16
G_DEFINE_TYPE (ETable, e_table, GTK_TYPE_TABLE)
@@ -958,7 +957,6 @@ et_build_groups (ETable *et)
g_signal_connect (G_OBJECT (et->group), "start_drag",
G_CALLBACK (group_start_drag), et);
-
if (!(et->is_grouped) && was_grouped)
et_disconnect_model (et);
@@ -1228,7 +1226,6 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h
gtk_widget_show (GTK_WIDGET (e_table->table_canvas));
-
e_table->white_item = gnome_canvas_item_new(
gnome_canvas_root(e_table->table_canvas),
e_canvas_background_get_type(),
@@ -1430,7 +1427,6 @@ e_table_get_state_object (ETable *e_table)
state->sort_info = e_table->sort_info;
g_object_ref(state->sort_info);
-
state->col_count = e_table_header_count (e_table->header);
full_col_count = e_table_header_count (e_table->full_header);
state->columns = g_new(int, state->col_count);
@@ -1563,7 +1559,6 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
g_signal_connect (G_OBJECT (e_table->sort_info), "sort_info_changed",
G_CALLBACK (sort_info_changed), e_table);
-
g_value_set_object (val, e_table->sort_info);
g_object_set_property (G_OBJECT(e_table->header), "sort_info", val);
g_free (val);
@@ -2073,7 +2068,6 @@ e_table_invert_selection (ETable *table)
e_selection_model_invert_selection (E_SELECTION_MODEL (table->selection));
}
-
/**
* e_table_get_printable:
* @e_table: #ETable to query
@@ -2914,7 +2908,6 @@ scroll_timeout (gpointer data)
et->last_drop_y,
et->last_drop_time);
-
return TRUE;
}
@@ -3000,7 +2993,6 @@ et_drag_motion(GtkWidget *widget,
y,
time);
-
if (y < 20)
direction |= ET_SCROLL_UP;
if (y > widget->allocation.height - 20)
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index e961a067ca..dc7c28804b 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -50,7 +50,6 @@ etmc_column_count (ETreeModel *etm)
return 0;
}
-
static gboolean
etmc_has_save_id (ETreeModel *etm)
{
@@ -130,7 +129,6 @@ etmc_is_editable (ETreeModel *etm, ETreePath node, gint col)
return etmc->is_editable (etm, node, col, etmc->model_data);
}
-
/* The default for etmc_duplicate_value is to return the raw value. */
static gpointer
etmc_duplicate_value (ETreeModel *etm, gint col, gconstpointer value)
diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h
index e76c68793c..e37ef30d6c 100644
--- a/widgets/table/e-tree-memory-callbacks.h
+++ b/widgets/table/e-tree-memory-callbacks.h
@@ -33,7 +33,6 @@ G_BEGIN_DECLS
#define E_IS_TREE_MEMORY_CALLBACKS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_MEMORY_CALLBACKS_TYPE))
#define E_IS_TREE_MEMORY_CALLBACKS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_MEMORY_CALLBACKS_TYPE))
-
typedef GdkPixbuf* (*ETreeMemoryCallbacksIconAtFn) (ETreeModel *etree, ETreePath path, gpointer model_data);
typedef gint (*ETreeMemoryCallbacksColumnCountFn) (ETreeModel *etree, gpointer model_data);
diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h
index 0a56c8d37e..824f0b1399 100644
--- a/widgets/table/e-tree-memory.h
+++ b/widgets/table/e-tree-memory.h
@@ -55,7 +55,6 @@ struct ETreeMemoryClass {
void (*fill_in_children) (ETreeMemory *model, ETreePath node);
};
-
GType e_tree_memory_get_type (void);
void e_tree_memory_construct (ETreeMemory *etree);
ETreeMemory *e_tree_memory_new (void);
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 143ad61629..9a06feac10 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -504,7 +504,6 @@ e_tree_model_node_get_last_child (ETreeModel *etree, ETreePath node)
return NULL;
}
-
/**
* e_tree_model_node_get_next:
* @etree:
diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
index fdd7f26a66..c6600ddf83 100644
--- a/widgets/table/e-tree-model.h
+++ b/widgets/table/e-tree-model.h
@@ -28,10 +28,8 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib-object.h>
-
G_BEGIN_DECLS
-
#define E_TREE_MODEL_TYPE (e_tree_model_get_type ())
#define E_TREE_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_MODEL_TYPE, ETreeModel))
#define E_TREE_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_MODEL_TYPE, ETreeModelClass))
@@ -120,7 +118,6 @@ struct ETreeModelClass {
void (*node_request_collapse) (ETreeModel *etm, ETreePath node);
};
-
GType e_tree_model_get_type (void);
ETreeModel *e_tree_model_new (void);
@@ -227,7 +224,6 @@ void e_tree_model_node_deleted (ETreeModel *tree_model,
void e_tree_model_node_request_collapse (ETreeModel *tree_model,
ETreePath deleted_node);
-
G_END_DECLS
#endif /* _E_TREE_MODEL_H */
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 87140ef30a..eedb201fae 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -202,7 +202,6 @@ etsm_node_deleted (ETreeModel *etm, ETreePath child, ETreeSelectionModel *etsm)
restore_cursor (etsm, etm);
}
-
static void
add_model(ETreeSelectionModel *etsm, ETreeModel *model)
{
@@ -380,7 +379,6 @@ etsm_is_row_selected (ESelectionModel *selection,
return etsm_is_path_selected (etsm, path);
}
-
typedef struct {
ETreeSelectionModel *etsm;
EForeachFunc callback;
@@ -741,7 +739,6 @@ e_tree_selection_model_get_cursor (ETreeSelectionModel *etsm)
return etsm->priv->cursor_path;
}
-
static void
e_tree_selection_model_init (ETreeSelectionModel *etsm)
{
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
index c112c40786..e66abf3454 100644
--- a/widgets/table/e-tree-selection-model.h
+++ b/widgets/table/e-tree-selection-model.h
@@ -51,7 +51,6 @@ typedef struct {
ESelectionModelClass parent_class;
} ETreeSelectionModelClass;
-
GType e_tree_selection_model_get_type (void);
ESelectionModel *e_tree_selection_model_new (void);
void e_tree_selection_model_foreach (ETreeSelectionModel *etsm,
@@ -69,5 +68,4 @@ ETreePath e_tree_selection_model_get_cursor (ETreeSelectionModel
G_END_DECLS
-
#endif /* _E_TREE_SELECTION_MODEL_H_ */
diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h
index 47a5e6bdf1..8b71bd7728 100644
--- a/widgets/table/e-tree-simple.h
+++ b/widgets/table/e-tree-simple.h
@@ -36,7 +36,6 @@ G_BEGIN_DECLS
#define E_IS_TREE_SIMPLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_SIMPLE_TYPE))
#define E_TREE_SIMPLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TREE_SIMPLE_TYPE, ETreeSimpleClass))
-
typedef GdkPixbuf* (*ETreeSimpleIconAtFn) (ETreeModel *etree, ETreePath *path, gpointer model_data);
typedef gpointer (*ETreeSimpleValueAtFn) (ETreeModel *etree, ETreePath *path, gint col, gpointer model_data);
typedef void (*ETreeSimpleSetValueAtFn) (ETreeModel *etree, ETreePath *path, gint col, gconstpointer val, gpointer model_data);
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
index 822affeee8..7c7718d0cf 100644
--- a/widgets/table/e-tree-sorted-variable.c
+++ b/widgets/table/e-tree-sorted-variable.c
@@ -148,7 +148,6 @@ etsv_insert_idle(ETreeSortedVariable *etsv)
return FALSE;
}
-
ETableModel *
e_tree_sorted_variable_new (ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
{
@@ -242,7 +241,6 @@ etsv_compare(ETreeSortedVariable *etsv, const ETreePath *path1, const ETreePath
return comp_val;
}
-
static ETreeSortedVariable *etsv_closure;
gint cols_closure;
gint *ascending_closure;
@@ -409,7 +407,6 @@ etsv_add_node (ETreeSortedVariable *etsv, ETreePath *path, GNode *root)
etsv_sort_node(etsv, new_node);
-
#if 0
g_node_prepend(root, new_node);
etsv_sort_node(etsv, root);
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index cd4ef4a537..6beaa34d89 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -824,7 +824,6 @@ ets_column_count (ETreeModel *etm)
return e_tree_model_column_count(ets->priv->source);
}
-
static gboolean
ets_has_save_id (ETreeModel *etm)
{
@@ -869,7 +868,6 @@ ets_has_change_pending (ETreeModel *etm)
return ets->priv->sort_idle_id != 0;
}
-
static gpointer
ets_value_at (ETreeModel *etm, ETreePath node, gint col)
{
@@ -897,7 +895,6 @@ ets_is_editable (ETreeModel *etm, ETreePath node, gint col)
return e_tree_model_node_is_editable (ets->priv->source, path->corresponding, col);
}
-
/* The default for ets_duplicate_value is to return the raw value. */
static gpointer
ets_duplicate_value (ETreeModel *etm, gint col, gconstpointer value)
@@ -1349,7 +1346,6 @@ e_tree_sorted_set_sort_info (ETreeSorted *ets, ETableSortInfo *sort_info)
g_return_if_fail (ets != NULL);
-
if (ets->priv->sort_info) {
if (ets->priv->sort_info_changed_id != 0)
g_signal_handler_disconnect (G_OBJECT (ets->priv->sort_info),
diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h
index 45adbef1fb..74d9a70a32 100644
--- a/widgets/table/e-tree-sorted.h
+++ b/widgets/table/e-tree-sorted.h
@@ -55,7 +55,6 @@ struct ETreeSortedClass {
void (*node_resorted) (ETreeSorted *etm, ETreePath node);
};
-
GType e_tree_sorted_get_type (void);
void e_tree_sorted_construct (ETreeSorted *etree,
ETreeModel *source,
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 783f58c4cc..8d3b9a1d28 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -598,7 +598,6 @@ etta_has_change_pending (ETableModel *etm)
return e_tree_model_has_change_pending (etta->priv->source);
}
-
static gint
etta_row_count (ETableModel *etm)
{
@@ -1161,7 +1160,6 @@ e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path,
e_table_model_pre_change (E_TABLE_MODEL(etta));
e_table_model_row_changed(E_TABLE_MODEL(etta), row);
-
if (expanded) {
gint num_children = insert_children(etta, gnode);
update_child_counts(gnode, num_children);
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 92b79fefd3..796bec1f39 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -239,7 +239,6 @@ static void et_drag_data_received(GtkWidget *widget,
guint time,
ETree *et);
-
static void scroll_off (ETree *et);
static void scroll_on (ETree *et, guint scroll_direction);
static void hover_off (ETree *et);
@@ -1985,7 +1984,6 @@ e_tree_view_to_model_row (ETree *e_tree,
return view_row;
}
-
gboolean
e_tree_node_is_expanded (ETree *et, ETreePath path)
{
@@ -2775,7 +2773,6 @@ scroll_timeout (gpointer data)
et->priv->last_drop_y,
et->priv->last_drop_time);
-
return TRUE;
}