From e77ee5d5d38ad95bce550db62bf4105f43cf88c6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 Jan 2010 22:46:23 -0600 Subject: Coding style and whitespace cleanup. --- widgets/table/e-cell-pixbuf.c | 3 ++- widgets/table/e-table-header-utils.c | 3 ++- widgets/table/e-table-memory-callbacks.c | 17 +++++++++-------- widgets/table/e-table-state.c | 18 ++++++++++++------ widgets/table/e-tree-memory.c | 19 +++++++++++++++---- widgets/table/gal-a11y-e-cell.c | 7 ++++--- 6 files changed, 44 insertions(+), 23 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index cf90909d6f..666f556ec3 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -99,7 +99,8 @@ pixbuf_kill_view (ECellView *ecell_view) ECellPixbufView *pixbuf_view = (ECellPixbufView *) ecell_view; if (pixbuf_view->cell_view.kill_view_cb) - (pixbuf_view->cell_view.kill_view_cb)(ecell_view, pixbuf_view->cell_view.kill_view_cb_data); + pixbuf_view->cell_view.kill_view_cb ( + ecell_view, pixbuf_view->cell_view.kill_view_cb_data); if (pixbuf_view->cell_view.kill_view_cb_data) g_list_free(pixbuf_view->cell_view.kill_view_cb_data); diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 2f682bb442..a5b0aac0af 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -228,7 +228,8 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc, * @x: X insertion point for the string. * @y: Y insertion point for the string's baseline. * @layout: the PangoLayout to draw. - * @str: the string we're drawing, passed in so we can change the layout if it needs eliding. + * @str: the string we're drawing, passed in so we can change the layout if + * it needs eliding. * @max_width: Maximum width in which the string must fit. * @center: Whether to center the string in the available area if it does fit. * diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index d39a396c64..e37c1aab88 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -171,15 +171,16 @@ e_table_memory_callbacks_init (ETableMemoryCalbacks *etmc) * @value_to_string: * @data: closure pointer. * - * This initializes a new ETableMemoryCalbacksModel object. ETableMemoryCalbacksModel is - * an implementaiton of the abstract class ETableModel. The ETableMemoryCalbacksModel - * is designed to allow people to easily create ETableModels without having - * to create a new GType derived from ETableModel every time they need one. + * This initializes a new ETableMemoryCalbacksModel object. + * ETableMemoryCalbacksModel is an implementaiton of the abstract class + * ETableModel. The ETableMemoryCalbacksModel is designed to allow people + * to easily create ETableModels without having to create a new GType + * derived from ETableModel every time they need one. * - * Instead, ETableMemoryCalbacksModel uses a setup based in callback functions, every - * callback function signature mimics the signature of each ETableModel method - * and passes the extra @data pointer to each one of the method to provide them - * with any context they might want to use. + * Instead, ETableMemoryCalbacksModel uses a setup based in callback + * functions, every callback function signature mimics the signature of + * each ETableModel method and passes the extra @data pointer to each one + * of the method to provide them with any context they might want to use. * * Returns: An ETableMemoryCalbacksModel object (which is also an ETableModel * object). diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 9f24f30d28..86694eccac 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -245,21 +245,27 @@ e_table_state_save_to_node (ETableState *state, xmlNode *node; if (parent) - node = xmlNewChild (parent, NULL, (const guchar *)"ETableState", NULL); + node = xmlNewChild ( + parent, NULL, (const guchar *) "ETableState", NULL); else - node = xmlNewNode (NULL, (const guchar *)"ETableState"); + node = xmlNewNode (NULL, (const guchar *) "ETableState"); - e_xml_set_double_prop_by_name(node, (const guchar *)"state-version", STATE_VERSION); + e_xml_set_double_prop_by_name ( + node, (const guchar *)"state-version", STATE_VERSION); for (i = 0; i < state->col_count; i++) { gint column = state->columns[i]; double expansion = state->expansions[i]; xmlNode *new_node; - new_node = xmlNewChild(node, NULL, (const guchar *)"column", NULL); - e_xml_set_integer_prop_by_name (new_node, (const guchar *)"source", column); + new_node = xmlNewChild ( + node, NULL, (const guchar *) "column", NULL); + e_xml_set_integer_prop_by_name ( + new_node, (const guchar *) "source", column); if (expansion >= -1) - e_xml_set_double_prop_by_name(new_node, (const guchar *)"expansion", expansion); + e_xml_set_double_prop_by_name ( + new_node, (const guchar *) + "expansion", expansion); } e_table_sort_info_save_to_node(state->sort_info, node); diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 8cd2f06cb9..b40dda8e3e 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -65,7 +65,11 @@ struct ETreeMemoryPath { struct ETreeMemoryPriv { ETreeMemoryPath *root; - gboolean expanded_default; /* whether nodes are created expanded or collapsed by default */ + + /* whether nodes are created expanded + * or collapsed by default */ + gboolean expanded_default; + gint frozen; GFunc destroy_func; gpointer destroy_user_data; @@ -97,7 +101,9 @@ e_tree_memory_path_depth (ETreeMemoryPath *path) } static void -e_tree_memory_path_insert (ETreeMemoryPath *parent, gint position, ETreeMemoryPath *child) +e_tree_memory_path_insert (ETreeMemoryPath *parent, + gint position, + ETreeMemoryPath *child) { g_return_if_fail (position <= parent->num_children && position >= -1); @@ -522,9 +528,14 @@ e_tree_memory_node_insert (ETreeMemory *tree_model, return new_path; } -ETreePath e_tree_memory_node_insert_id (ETreeMemory *etree, ETreePath parent, gint position, gpointer node_data, gchar *id) +ETreePath +e_tree_memory_node_insert_id (ETreeMemory *etree, + ETreePath parent, + gint position, + gpointer node_data, + gchar *id) { - return e_tree_memory_node_insert(etree, parent, position, node_data); + return e_tree_memory_node_insert (etree, parent, position, node_data); } /** diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c index 211afa401c..65f08f22d3 100644 --- a/widgets/table/gal-a11y-e-cell.c +++ b/widgets/table/gal-a11y-e-cell.c @@ -35,7 +35,6 @@ #include "gal-a11y-e-cell-vbox.h" #include "gal-a11y-e-table-item.h" -#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellClass)) static GObjectClass *parent_class; #define PARENT_TYPE (atk_object_get_type ()) @@ -209,8 +208,10 @@ gal_a11y_e_cell_grab_focus (AtkComponent *component) atk_selection_clear_selection (ATK_SELECTION (a11yTableItem)); atk_selection_add_selection (ATK_SELECTION (a11yTableItem), index); - gtk_widget_grab_focus (GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas)); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas)); + gtk_widget_grab_focus ( + GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas)); + toplevel = gtk_widget_get_toplevel ( + GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas)); if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel)) gtk_window_present (GTK_WINDOW (toplevel)); -- cgit