aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-10-04 00:08:28 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-04 01:29:20 +0800
commit9675f18d915fcbae59dd4b32b8a2ff36b3d27cc1 (patch)
treeaa1d53c8cedef6dc09455fbadd4b63216f9b7228 /widgets
parentc9c3c3be92f3dbf133a5b1b42fb55905a1060d0e (diff)
downloadgsoc2013-evolution-9675f18d915fcbae59dd4b32b8a2ff36b3d27cc1.tar
gsoc2013-evolution-9675f18d915fcbae59dd4b32b8a2ff36b3d27cc1.tar.gz
gsoc2013-evolution-9675f18d915fcbae59dd4b32b8a2ff36b3d27cc1.tar.bz2
gsoc2013-evolution-9675f18d915fcbae59dd4b32b8a2ff36b3d27cc1.tar.lz
gsoc2013-evolution-9675f18d915fcbae59dd4b32b8a2ff36b3d27cc1.tar.xz
gsoc2013-evolution-9675f18d915fcbae59dd4b32b8a2ff36b3d27cc1.tar.zst
gsoc2013-evolution-9675f18d915fcbae59dd4b32b8a2ff36b3d27cc1.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'widgets')
-rw-r--r--widgets/menus/gal-define-views-model.c6
-rw-r--r--widgets/table/e-table-group-container.c20
-rw-r--r--widgets/table/e-table-group-leaf.c50
-rw-r--r--widgets/table/e-table.c4
-rw-r--r--widgets/text/e-text.c8
5 files changed, 51 insertions, 37 deletions
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index 2274fd8c78..38a1080992 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -205,7 +205,8 @@ gal_define_views_model_append (GalDefineViewsModel *model,
e_table_model_pre_change (etm);
gal_view_collection_append (model->collection, view);
- e_table_model_row_inserted (etm, gal_view_collection_get_count (model->collection) - 1);
+ e_table_model_row_inserted (
+ etm, gal_view_collection_get_count (model->collection) - 1);
}
static void
@@ -315,5 +316,6 @@ gal_define_views_model_copy_view (GalDefineViewsModel *model,
ETableModel *etm = E_TABLE_MODEL (model);
e_table_model_pre_change (etm);
gal_view_collection_copy_view (model->collection, n);
- e_table_model_row_inserted (etm, gal_view_collection_get_count (model->collection) - 1);
+ e_table_model_row_inserted (
+ etm, gal_view_collection_get_count (model->collection) - 1);
}
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index a2b7be785c..c3d44c777a 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1239,13 +1239,13 @@ e_table_group_container_print_page (EPrintable *ep,
pango_font_description_free (desc);
while (1) {
- child_height = e_printable_height(child_printable, context, width,yd, quantize);
+ child_height = e_printable_height (child_printable, context, width,yd, quantize);
if (child_height < 0)
child_height = -child_height;
if (yd < 2 * TEXT_AREA_HEIGHT + 20 + child_height )
{
cairo_show_page (cr);
- cairo_translate(cr, -2 * TEXT_AREA_HEIGHT, -TEXT_AREA_HEIGHT);
+ cairo_translate (cr, -2 * TEXT_AREA_HEIGHT, -TEXT_AREA_HEIGHT);
break;
}
@@ -1288,10 +1288,10 @@ e_table_group_container_print_page (EPrintable *ep,
e_printable_print_page (child_printable, context, width-2 * TEXT_AREA_HEIGHT, child_margin, quantize);
yd -= child_height + TEXT_AREA_HEIGHT;
- if (e_printable_data_left (child_printable)){
+ if (e_printable_data_left (child_printable)) {
cairo_restore (cr);
- cairo_translate(cr, -2 * TEXT_AREA_HEIGHT, -TEXT_AREA_HEIGHT);
- break;
+ cairo_translate (cr, -2 * TEXT_AREA_HEIGHT, -TEXT_AREA_HEIGHT);
+ break;
}
child = child->next;
@@ -1303,11 +1303,11 @@ e_table_group_container_print_page (EPrintable *ep,
child_node = child->data;
if (child_printable)
g_object_unref (child_printable);
-
- child_printable = e_table_group_get_printable(child_node->child);
- cairo_restore(cr);
- cairo_translate(cr, -2 * TEXT_AREA_HEIGHT, child_height + child_margin + 20);
-
+
+ child_printable = e_table_group_get_printable (child_node->child);
+ cairo_restore (cr);
+ cairo_translate (cr, -2 * TEXT_AREA_HEIGHT, child_height + child_margin + 20);
+
if (child_printable)
g_object_ref (child_printable);
e_printable_reset (child_printable);
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 3e63af004d..a111999ba9 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -112,24 +112,26 @@ etgl_dispose (GObject *object)
static void
e_table_group_leaf_construct (GnomeCanvasGroup *parent,
- ETableGroupLeaf *etgl,
- ETableHeader *full_header,
- ETableHeader *header,
- ETableModel *model,
- ETableSortInfo *sort_info)
+ ETableGroupLeaf *etgl,
+ ETableHeader *full_header,
+ ETableHeader *header,
+ ETableModel *model,
+ ETableSortInfo *sort_info)
{
- etgl->is_grouped = e_table_sort_info_grouping_get_count (sort_info) > 0 ? TRUE : FALSE;
+ etgl->is_grouped =
+ (e_table_sort_info_grouping_get_count (sort_info) > 0);
if (etgl->is_grouped)
- etgl->ets = E_TABLE_SUBSET (e_table_sorted_variable_new (model,
- full_header,
- sort_info));
+ etgl->ets = E_TABLE_SUBSET (
+ e_table_sorted_variable_new (
+ model, full_header, sort_info));
else
- etgl->ets = E_TABLE_SUBSET (e_table_sorted_new (model,
- full_header,
- sort_info));
+ etgl->ets = E_TABLE_SUBSET (
+ e_table_sorted_new (
+ model, full_header, sort_info));
- e_table_group_construct (parent, E_TABLE_GROUP (etgl), full_header, header, model);
+ e_table_group_construct (
+ parent, E_TABLE_GROUP (etgl), full_header, header, model);
}
/**
@@ -146,11 +148,11 @@ e_table_group_leaf_construct (GnomeCanvasGroup *parent,
* Returns: The new %ETableGroupLeaf.
*/
ETableGroup *
-e_table_group_leaf_new (GnomeCanvasGroup *parent,
- ETableHeader *full_header,
- ETableHeader *header,
- ETableModel *model,
- ETableSortInfo *sort_info)
+e_table_group_leaf_new (GnomeCanvasGroup *parent,
+ ETableHeader *full_header,
+ ETableHeader *header,
+ ETableModel *model,
+ ETableSortInfo *sort_info)
{
ETableGroupLeaf *etgl;
@@ -316,7 +318,8 @@ etgl_add (ETableGroup *etg, gint row)
ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
if (E_IS_TABLE_SUBSET_VARIABLE (etgl->ets)) {
- e_table_subset_variable_add (E_TABLE_SUBSET_VARIABLE (etgl->ets), row);
+ e_table_subset_variable_add (
+ E_TABLE_SUBSET_VARIABLE (etgl->ets), row);
}
}
@@ -326,7 +329,8 @@ etgl_add_array (ETableGroup *etg, const gint *array, gint count)
ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
if (E_IS_TABLE_SUBSET_VARIABLE (etgl->ets)) {
- e_table_subset_variable_add_array (E_TABLE_SUBSET_VARIABLE (etgl->ets), array, count);
+ e_table_subset_variable_add_array (
+ E_TABLE_SUBSET_VARIABLE (etgl->ets), array, count);
}
}
@@ -336,7 +340,8 @@ etgl_add_all (ETableGroup *etg)
ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
if (E_IS_TABLE_SUBSET_VARIABLE (etgl->ets)) {
- e_table_subset_variable_add_all (E_TABLE_SUBSET_VARIABLE (etgl->ets));
+ e_table_subset_variable_add_all (
+ E_TABLE_SUBSET_VARIABLE (etgl->ets));
}
}
@@ -346,7 +351,8 @@ etgl_remove (ETableGroup *etg, gint row)
ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
if (E_IS_TABLE_SUBSET_VARIABLE (etgl->ets)) {
- return e_table_subset_variable_remove (E_TABLE_SUBSET_VARIABLE (etgl->ets), row);
+ return e_table_subset_variable_remove (
+ E_TABLE_SUBSET_VARIABLE (etgl->ets), row);
}
return FALSE;
}
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 23640b2d9f..47983f6da8 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -1257,7 +1257,9 @@ click_to_add_event (ETableClickToAdd *etcta, GdkEventKey *key, ETable *etable)
focus_first_etable_item (etable->group);
else
gtk_widget_child_focus (
- gtk_widget_get_toplevel (GTK_WIDGET (etable->table_canvas)), GTK_DIR_TAB_FORWARD);
+ gtk_widget_get_toplevel (
+ GTK_WIDGET (etable->table_canvas)),
+ GTK_DIR_TAB_FORWARD);
break;
}
}
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 67e29a84be..2ea35ed6c0 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -3036,12 +3036,16 @@ e_text_insert (EText *text, const gchar *string)
}
}
*j = 0;
- e_text_model_insert_length (text->model, text->selection_start, new_string, utf8len);
+ e_text_model_insert_length (
+ text->model, text->selection_start,
+ new_string, utf8len);
g_free (new_string);
}
else {
utf8len = g_utf8_strlen (string, -1);
- e_text_model_insert_length (text->model, text->selection_start, string, utf8len);
+ e_text_model_insert_length (
+ text->model, text->selection_start,
+ string, utf8len);
}
}
}