aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-01-23 12:04:56 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-01-23 12:04:56 +0800
commit9acd121a93cf023501b48992ebe4341d4220301c (patch)
tree2506a9361c0043d7513d124abdd964467a750b98
parent53d9c34bb570d65740de43f8a711dc6cc53d5977 (diff)
downloadgsoc2013-evolution-9acd121a93cf023501b48992ebe4341d4220301c.tar.gz
gsoc2013-evolution-9acd121a93cf023501b48992ebe4341d4220301c.tar.zst
gsoc2013-evolution-9acd121a93cf023501b48992ebe4341d4220301c.zip
Coding style and whitespace cleanups.
-rw-r--r--addressbook/gui/widgets/ea-minicard.c4
-rw-r--r--calendar/gui/dialogs/copy-source-dialog.c4
-rw-r--r--calendar/gui/ea-day-view.c7
-rw-r--r--composer/e-composer-private.c26
-rw-r--r--e-util/e-event.c17
-rw-r--r--e-util/e-text-event-processor.c3
-rw-r--r--filter/e-filter-rule.c49
-rw-r--r--mail/em-format-hook.c11
-rw-r--r--modules/addressbook/e-book-shell-view-private.h4
-rw-r--r--plugins/mark-all-read/mark-all-read.c68
-rw-r--r--widgets/table/e-cell-date-edit.c46
-rw-r--r--widgets/table/e-table-extras.c42
-rw-r--r--widgets/table/e-table-header.c26
13 files changed, 202 insertions, 105 deletions
diff --git a/addressbook/gui/widgets/ea-minicard.c b/addressbook/gui/widgets/ea-minicard.c
index 8791a68e73..66d9bde67c 100644
--- a/addressbook/gui/widgets/ea-minicard.c
+++ b/addressbook/gui/widgets/ea-minicard.c
@@ -232,7 +232,9 @@ static gboolean atk_action_interface_do_action (AtkAction *iface, gint i)
{
EMinicard *minicard = NULL;
- minicard = E_MINICARD (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (iface)));
+ minicard = E_MINICARD (
+ atk_gobject_accessible_get_object (
+ ATK_GOBJECT_ACCESSIBLE (iface)));
if ( minicard == NULL )
return FALSE;
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 49cf8b3ce4..20e779a2a7 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -42,7 +42,9 @@ show_error (GtkWindow *parent, const gchar *msg)
{
GtkWidget *dialog;
- dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", msg);
+ dialog = gtk_message_dialog_new (
+ parent, 0, GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE, "%s", msg);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index 1e6842905f..1d0199df3a 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -144,7 +144,9 @@ ea_day_view_get_name (AtkObject *accessible)
if (n_events >= 1)
/* To translators: Here, "It" is either like "Work Week View: July
10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006." */
- event_str = g_strdup_printf (ngettext ("It has %d event.", "It has %d events.", n_events), n_events);
+ event_str = g_strdup_printf (
+ ngettext ("It has %d event.",
+ "It has %d events.", n_events), n_events);
else
/* To translators: Here, "It" is either like "Work Week View: July
10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006." */
@@ -243,7 +245,8 @@ ea_day_view_ref_child (AtkObject *accessible, gint index)
if (index == 0) {
/* index == 0 is the main item */
- atk_object = atk_gobject_accessible_for_object (G_OBJECT (day_view->main_canvas_item));
+ atk_object = atk_gobject_accessible_for_object (
+ G_OBJECT (day_view->main_canvas_item));
g_object_ref (atk_object);
}
else {
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 0f7ffbb64c..2507025b93 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -263,13 +263,17 @@ e_composer_private_constructed (EMsgComposer *composer)
gtk_box_pack_start ((GtkBox *)tmp, tmp1, FALSE, FALSE, 0);
tmp1 = gtk_label_new_with_mnemonic (_("S_end"));
gtk_box_pack_start ((GtkBox *)tmp, tmp1, FALSE, FALSE, 6);
- gtk_widget_show_all(tmp);
+ gtk_widget_show_all (tmp);
gtk_widget_reparent (send_widget, tmp_box);
- gtk_box_set_child_packing ((GtkBox *)tmp_box, send_widget, FALSE, FALSE, 6, GTK_PACK_END);
+ gtk_box_set_child_packing (
+ GTK_BOX (tmp_box), send_widget,
+ FALSE, FALSE, 6, GTK_PACK_END);
gtk_tool_item_set_is_important (GTK_TOOL_ITEM (send_widget), TRUE);
send_widget = gtk_bin_get_child ((GtkBin *)send_widget);
- gtk_container_remove((GtkContainer *)send_widget, gtk_bin_get_child ((GtkBin *)send_widget));
- gtk_container_add((GtkContainer *)send_widget, tmp);
+ gtk_container_remove (
+ GTK_CONTAINER (send_widget),
+ gtk_bin_get_child (GTK_BIN (send_widget)));
+ gtk_container_add ((GtkContainer *)send_widget, tmp);
gtk_button_set_relief ((GtkButton *)send_widget, GTK_RELIEF_NORMAL);
path = "/main-toolbar/pre-main-toolbar/save-draft";
send_widget = gtk_ui_manager_get_widget (ui_manager, path);
@@ -279,16 +283,20 @@ e_composer_private_constructed (EMsgComposer *composer)
gtk_box_pack_start ((GtkBox *)tmp, tmp1, FALSE, FALSE, 0);
tmp1 = gtk_label_new_with_mnemonic (_("Save draft"));
gtk_box_pack_start ((GtkBox *)tmp, tmp1, FALSE, FALSE, 3);
- gtk_widget_show_all(tmp);
+ gtk_widget_show_all (tmp);
gtk_widget_reparent (send_widget, tmp_box);
- gtk_box_set_child_packing ((GtkBox *)tmp_box, send_widget, FALSE, FALSE, 6, GTK_PACK_END);
+ gtk_box_set_child_packing (
+ GTK_BOX (tmp_box), send_widget,
+ FALSE, FALSE, 6, GTK_PACK_END);
gtk_tool_item_set_is_important (GTK_TOOL_ITEM (send_widget), TRUE);
send_widget = gtk_bin_get_child ((GtkBin *)send_widget);
- gtk_container_remove((GtkContainer *)send_widget, gtk_bin_get_child ((GtkBin *)send_widget));
- gtk_container_add((GtkContainer *)send_widget, tmp);
+ gtk_container_remove (
+ GTK_CONTAINER (send_widget),
+ gtk_bin_get_child (GTK_BIN (send_widget)));
+ gtk_container_add ((GtkContainer *)send_widget, tmp);
gtk_button_set_relief ((GtkButton *)send_widget, GTK_RELIEF_NORMAL);
- gtk_widget_show(tmp_box);
+ gtk_widget_show (tmp_box);
gtk_box_pack_end (GTK_BOX (container), tmp_box, FALSE, FALSE, 3);
}
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 7d0680082c..c1902082bc 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -170,7 +170,10 @@ EEvent *e_event_construct(EEvent *ep, const gchar *id)
* Return value: An opaque key which can later be passed to remove_items.
**/
gpointer
-e_event_add_items(EEvent *event, GSList *items, EEventItemsFunc freefunc, gpointer data)
+e_event_add_items (EEvent *event,
+ GSList *items,
+ EEventItemsFunc freefunc,
+ gpointer data)
{
struct _event_node *node;
@@ -234,7 +237,8 @@ ee_cmp(gconstpointer ap, gconstpointer bp)
* e_event_emit:
* @ee: An initialised EEvent, potentially with registered event listeners.
* @id: Event name. This will be compared against EEventItem.id.
- * @target: The target describing the event context. This will be implementation defined.
+ * @target: The target describing the event context. This will be
+ * implementation defined.
*
* Emit an event. @target will automatically be freed once its
* emission is complete.
@@ -280,7 +284,8 @@ e_event_emit(EEvent *event, const gchar *id, EEventTarget *target)
struct _event_info *info = events->data;
EEventItem *item = info->item;
- d(printf("event '%s' mask %08x target %08x\n", item->id, item->enable, target->mask));
+ d(printf("event '%s' mask %08x target %08x\n",
+ item->id, item->enable, target->mask));
if (item->enable & target->mask)
continue;
@@ -553,7 +558,9 @@ e_event_hook_get_type(void)
* map enumerates a single target type and th eenable mask bit names,
* so that the type can be loaded automatically by the base EEvent class.
**/
-void e_event_hook_class_add_target_map(EEventHookClass *class, const EEventHookTargetMap *map)
+void e_event_hook_class_add_target_map (EEventHookClass *class,
+ const EEventHookTargetMap *map)
{
- g_hash_table_insert(class->target_map, (gpointer)map->type, (gpointer)map);
+ g_hash_table_insert (
+ class->target_map, (gpointer)map->type, (gpointer)map);
}
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 6496a63294..870aeed58f 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -90,7 +90,8 @@ e_text_event_processor_init (ETextEventProcessor *tep)
}
gint
-e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)
+e_text_event_processor_handle_event (ETextEventProcessor *tep,
+ ETextEventProcessorEvent *event)
{
if (E_TEXT_EVENT_PROCESSOR_GET_CLASS(tep)->event)
return E_TEXT_EVENT_PROCESSOR_GET_CLASS(tep)->event(tep, event);
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index f660d722f8..08bf921507 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -91,7 +91,9 @@ part_combobox_changed (GtkComboBox *combobox,
gint index, i;
index = gtk_combo_box_get_active (combobox);
- for (i = 0, part = e_rule_context_next_part (data->context, part); part && i < index; i++, part = e_rule_context_next_part (data->context, part)) {
+ for (i = 0, part = e_rule_context_next_part (data->context, part);
+ part && i < index;
+ i++, part = e_rule_context_next_part (data->context, part)) {
/* traverse until reached index */
}
@@ -430,7 +432,9 @@ filter_rule_xml_encode (EFilterRule *rule)
node = xmlNewNode (NULL, (xmlChar *)"rule");
- xmlSetProp (node, (xmlChar *)"enabled", (xmlChar *)(rule->enabled ? "true" : "false"));
+ xmlSetProp (
+ node, (xmlChar *)"enabled",
+ (xmlChar *)(rule->enabled ? "true" : "false"));
switch (rule->grouping) {
case E_FILTER_GROUP_ALL:
@@ -542,7 +546,9 @@ filter_rule_xml_decode (EFilterRule *rule,
while (work) {
if (!strcmp ((gchar *)work->name, "partset")) {
filter_rule_load_set (work, rule, context);
- } else if (!strcmp ((gchar *)work->name, "title") || !strcmp ((gchar *)work->name, "_title")) {
+ } else if (!strcmp ((gchar *)work->name, "title") ||
+ !strcmp ((gchar *)work->name, "_title")) {
+
if (!rule->name) {
gchar *str, *decstr = NULL;
@@ -679,7 +685,8 @@ filter_rule_get_widget (EFilterRule *rule,
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
- text = g_strdup_printf ("<b>%s</b>", _("Find items that meet the following conditions"));
+ text = g_strdup_printf ("<b>%s</b>",
+ _("Find items that meet the following conditions"));
label = gtk_label_new (text);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -714,12 +721,17 @@ filter_rule_get_widget (EFilterRule *rule,
hbox = gtk_hbox_new (FALSE, 3);
add = gtk_button_new_with_mnemonic (_("A_dd Condition"));
- gtk_button_set_image (GTK_BUTTON (add), gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON));
+ gtk_button_set_image (
+ GTK_BUTTON (add), gtk_image_new_from_stock (
+ GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON));
g_signal_connect (add, "clicked", G_CALLBACK (more_parts), data);
gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 0);
if (context->flags & E_RULE_CONTEXT_GROUPING) {
- const gchar *thread_types[] = { N_("If all conditions are met"), N_("If any conditions are met") };
+ const gchar *thread_types[] = {
+ N_("If all conditions are met"),
+ N_("If any conditions are met")
+ };
label = gtk_label_new_with_mnemonic (_("_Find items:"));
combobox = gtk_combo_box_new_text ();
@@ -741,8 +753,15 @@ filter_rule_get_widget (EFilterRule *rule,
}
if (context->flags & E_RULE_CONTEXT_THREADING) {
- /* Translators: "None" for not including threads; part of "Include threads: None" */
- const gchar *thread_types[] = { N_("None"), N_("All related"), N_("Replies"), N_("Replies and parents"), N_("No reply or parent") };
+ const gchar *thread_types[] = {
+ /* Translators: "None" for not including threads;
+ * part of "Include threads: None" */
+ N_("None"),
+ N_("All related"),
+ N_("Replies"),
+ N_("Replies and parents"),
+ N_("No reply or parent")
+ };
label = gtk_label_new_with_mnemonic (_("I_nclude threads"));
combobox = gtk_combo_box_new_text ();
@@ -776,12 +795,14 @@ filter_rule_get_widget (EFilterRule *rule,
hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);
vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);
- scrolledwindow = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
-
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);
+ scrolledwindow = gtk_scrolled_window_new (
+ GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));
+ gtk_scrolled_window_set_policy (
+ GTK_SCROLLED_WINDOW (scrolledwindow),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+ gtk_scrolled_window_add_with_viewport (
+ GTK_SCROLLED_WINDOW (scrolledwindow), parts);
gtk_box_pack_start (GTK_BOX (inruleame), scrolledwindow, TRUE, TRUE, 3);
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 31aa123bdd..78c46d99b4 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -63,7 +63,10 @@ static const EPluginHookTargetKey emfh_flag_map[] = {
};
static void
-emfh_format_format(EMFormat *md, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emfh_format_format (EMFormat *md,
+ CamelStream *stream,
+ CamelMimePart *part,
+ const EMFormatHandler *info)
{
struct _EMFormatHookItem *item = (EMFormatHookItem *)info;
@@ -182,8 +185,10 @@ emfh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
for (;l;l=g_slist_next(l)) {
EMFormatHookItem *item = l->data;
/* TODO: only add handlers if enabled? */
- /* Well, disabling is handled by the callback, if we leave as is,
- then we can enable the plugin after startup and it will start working automagically */
+ /* Well, disabling is handled by the callback,
+ * if we leave as is, then we can enable the
+ * plugin after startup and it will start
+ * working automagically */
em_format_class_add_handler(klass, &item->handler);
}
}
diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h
index 97fe64e5c5..1a0c803ca3 100644
--- a/modules/addressbook/e-book-shell-view-private.h
+++ b/modules/addressbook/e-book-shell-view-private.h
@@ -111,7 +111,9 @@ struct _EBookShellViewPrivate {
gint preview_index;
- gint search_locked; /* can track whether search changed while locked, but it is not usable at the moment */
+ /* Can track whether search changed while locked,
+ * but it is not usable at the moment. */
+ gint search_locked;
};
void e_book_shell_view_private_init
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index baaa80c573..3923f86c2b 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -47,9 +47,6 @@
gboolean e_plugin_ui_init (GtkUIManager *ui_manager,
EShellView *shell_view);
-static void mar_got_folder (gchar *uri, CamelFolder *folder, gpointer data);
-static void mar_all_sub_folders (CamelStore *store, CamelFolderInfo *fi, CamelException *ex);
-
static void
button_clicked_cb (GtkButton *button,
GtkDialog *dialog)
@@ -208,13 +205,42 @@ mark_all_as_read (CamelFolder *folder)
uids = camel_folder_get_uids (folder);
camel_folder_freeze(folder);
for (i=0;i<uids->len;i++)
- camel_folder_set_message_flags(folder, uids->pdata[i], CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
+ camel_folder_set_message_flags (
+ folder, uids->pdata[i],
+ CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
camel_folder_thaw(folder);
camel_folder_free_uids (folder, uids);
}
static void
-mar_got_folder (gchar *uri, CamelFolder *folder, gpointer data)
+mar_all_sub_folders (CamelStore *store,
+ CamelFolderInfo *fi,
+ CamelException *ex)
+{
+ while (fi) {
+ CamelFolder *folder;
+
+ if (fi->child) {
+ mar_all_sub_folders (store, fi->child, ex);
+ if (camel_exception_is_set (ex))
+ return;
+ }
+
+ if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
+ return;
+
+ if (!CAMEL_IS_VEE_FOLDER (folder)) {
+ mark_all_as_read (folder);
+ }
+
+ fi = fi->next;
+ }
+}
+
+static void
+mar_got_folder (gchar *uri,
+ CamelFolder *folder,
+ gpointer data)
{
CamelFolderInfo *info;
CamelStore *store;
@@ -248,30 +274,11 @@ out:
}
static void
-mar_all_sub_folders (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
-{
- while (fi) {
- CamelFolder *folder;
-
- if (fi->child) {
- mar_all_sub_folders (store, fi->child, ex);
- if (camel_exception_is_set (ex))
- return;
- }
-
- if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
- return;
-
- if (!CAMEL_IS_VEE_FOLDER (folder)) {
- mark_all_as_read (folder);
- }
-
- fi = fi->next;
- }
-}
-
-static void
-has_unread_mail (GtkTreeModel *model, GtkTreeIter *parent, gboolean is_root, gboolean *has_unread, gboolean *applicable)
+has_unread_mail (GtkTreeModel *model,
+ GtkTreeIter *parent,
+ gboolean is_root,
+ gboolean *has_unread,
+ gboolean *applicable)
{
guint unread = 0;
GtkTreeIter iter, child;
@@ -346,7 +353,8 @@ static GtkActionEntry entries[] = {
};
static void
-update_actions_cb (EShellView *shell_view, gpointer user_data)
+update_actions_cb (EShellView *shell_view,
+ gpointer user_data)
{
GtkActionGroup *action_group;
EShellWindow *shell_window;
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 39443c3960..f67a03ceed 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -95,7 +95,8 @@ static void e_cell_date_edit_on_today_clicked (GtkWidget *button,
ECellDateEdit *ecde);
static void e_cell_date_edit_update_cell (ECellDateEdit *ecde,
const gchar *text);
-static void e_cell_date_edit_on_time_selected (GtkTreeSelection *selection, ECellDateEdit *ecde);
+static void e_cell_date_edit_on_time_selected (GtkTreeSelection *selection,
+ ECellDateEdit *ecde);
static void e_cell_date_edit_hide_popup (ECellDateEdit *ecde);
/* Our arguments. */
@@ -272,20 +273,26 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
gtk_tree_view_append_column (
GTK_TREE_VIEW (tree_view),
- gtk_tree_view_column_new_with_attributes ("Text", gtk_cell_renderer_text_new (), "text", 0, NULL));
+ gtk_tree_view_column_new_with_attributes (
+ "Text", gtk_cell_renderer_text_new (), "text", 0, NULL));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
- gtk_container_set_focus_vadjustment (GTK_CONTAINER (tree_view),
- gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
- gtk_container_set_focus_hadjustment (GTK_CONTAINER (tree_view),
- gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+ gtk_scrolled_window_add_with_viewport (
+ GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
+ gtk_container_set_focus_vadjustment (
+ GTK_CONTAINER (tree_view),
+ gtk_scrolled_window_get_vadjustment (
+ GTK_SCROLLED_WINDOW (scrolled_window)));
+ gtk_container_set_focus_hadjustment (
+ GTK_CONTAINER (tree_view),
+ gtk_scrolled_window_get_hadjustment (
+ GTK_SCROLLED_WINDOW (scrolled_window)));
gtk_widget_show (tree_view);
ecde->time_tree_view = tree_view;
- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), "changed",
- G_CALLBACK (e_cell_date_edit_on_time_selected),
- ecde);
+ g_signal_connect (
+ gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), "changed",
+ G_CALLBACK (e_cell_date_edit_on_time_selected), ecde);
bbox = gtk_hbutton_box_new ();
gtk_container_set_border_width (GTK_CONTAINER (bbox), 4);
@@ -527,7 +534,9 @@ e_cell_date_edit_set_popup_values (ECellDateEdit *ecde)
if (status == E_TIME_PARSE_NONE || status == E_TIME_PARSE_INVALID) {
gtk_entry_set_text (GTK_ENTRY (ecde->time_entry), "");
e_calendar_item_set_selection (calitem, NULL, NULL);
- gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (ecde->time_tree_view)));
+ gtk_tree_selection_unselect_all (
+ gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (ecde->time_tree_view)));
} else {
if (is_date) {
buffer[0] = '\0';
@@ -543,7 +552,9 @@ e_cell_date_edit_set_popup_values (ECellDateEdit *ecde)
e_calendar_item_set_selection (calitem, &date, &date);
if (is_date) {
- gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (ecde->time_tree_view)));
+ gtk_tree_selection_unselect_all (
+ gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (ecde->time_tree_view)));
} else {
e_cell_date_edit_select_matching_time (ecde, buffer);
}
@@ -575,8 +586,12 @@ e_cell_date_edit_select_matching_time (ECellDateEdit *ecde,
if (g_str_equal (str, time)) {
GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (ecde->time_tree_view), path, NULL, FALSE);
- gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (ecde->time_tree_view), path, NULL, FALSE, 0.0, 0.0);
+ gtk_tree_view_set_cursor (
+ GTK_TREE_VIEW (ecde->time_tree_view),
+ path, NULL, FALSE);
+ gtk_tree_view_scroll_to_cell (
+ GTK_TREE_VIEW (ecde->time_tree_view),
+ path, NULL, FALSE, 0.0, 0.0);
gtk_tree_path_free (path);
found = TRUE;
@@ -740,7 +755,8 @@ e_cell_date_edit_rebuild_time_list (ECellDateEdit *ecde)
struct tm tmp_tm;
gint hour, min;
- store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (ecde->time_tree_view)));
+ store = GTK_LIST_STORE (gtk_tree_view_get_model (
+ GTK_TREE_VIEW (ecde->time_tree_view)));
gtk_list_store_clear (store);
/* Fill the struct tm with some sane values. */
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index 101e3e426b..cdb0360a81 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -101,8 +101,8 @@ static gint
e_strint_compare (gconstpointer data1,
gconstpointer data2)
{
- gint int1 = atoi(data1);
- gint int2 = atoi(data2);
+ gint int1 = atoi (data1);
+ gint int2 = atoi (data2);
return e_int_compare (GINT_TO_POINTER (int1), GINT_TO_POINTER (int2));
}
@@ -256,35 +256,45 @@ ete_init (ETableExtras *extras)
(GDestroyNotify) g_free,
(GDestroyNotify) NULL);
- e_table_extras_add_compare(extras, "string", (GCompareDataFunc) e_str_compare);
- e_table_extras_add_compare(extras, "stringcase", e_table_str_case_compare);
- e_table_extras_add_compare(extras, "collate", e_table_collate_compare);
- e_table_extras_add_compare(extras, "integer", (GCompareDataFunc) e_int_compare);
- e_table_extras_add_compare(extras, "string-integer", (GCompareDataFunc) e_strint_compare);
-
- e_table_extras_add_search(extras, "string", e_string_search);
+ e_table_extras_add_compare (
+ extras, "string",
+ (GCompareDataFunc) e_str_compare);
+ e_table_extras_add_compare (
+ extras, "stringcase",
+ (GCompareDataFunc) e_table_str_case_compare);
+ e_table_extras_add_compare (
+ extras, "collate",
+ (GCompareDataFunc) e_table_collate_compare);
+ e_table_extras_add_compare (
+ extras, "integer",
+ (GCompareDataFunc) e_int_compare);
+ e_table_extras_add_compare (
+ extras, "string-integer",
+ (GCompareDataFunc) e_strint_compare);
+
+ e_table_extras_add_search (extras, "string", e_string_search);
cell = e_cell_checkbox_new ();
- e_table_extras_add_cell(extras, "checkbox", cell);
+ e_table_extras_add_cell (extras, "checkbox", cell);
cell = e_cell_date_new (NULL, GTK_JUSTIFY_LEFT);
- e_table_extras_add_cell(extras, "date", cell);
+ e_table_extras_add_cell (extras, "date", cell);
cell = e_cell_number_new (NULL, GTK_JUSTIFY_RIGHT);
- e_table_extras_add_cell(extras, "number", cell);
+ e_table_extras_add_cell (extras, "number", cell);
cell = e_cell_pixbuf_new ();
- e_table_extras_add_cell(extras, "pixbuf", cell);
+ e_table_extras_add_cell (extras, "pixbuf", cell);
cell = e_cell_size_new (NULL, GTK_JUSTIFY_RIGHT);
- e_table_extras_add_cell(extras, "size", cell);
+ e_table_extras_add_cell (extras, "size", cell);
cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
- e_table_extras_add_cell(extras, "string", cell);
+ e_table_extras_add_cell (extras, "string", cell);
cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
cell = e_cell_tree_new (NULL, NULL, TRUE, cell);
- e_table_extras_add_cell(extras, "tree-string", cell);
+ e_table_extras_add_cell (extras, "tree-string", cell);
}
ETableExtras *
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 8d382f5a92..e5587ab3e2 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -91,7 +91,8 @@ dequeue_idle (ETableHeader *eth)
gint column, width;
dequeue (eth, &column, &width);
- while (eth->change_queue && ((struct two_ints *) eth->change_queue->data)->column == column)
+ while (eth->change_queue && ((struct two_ints *)
+ eth->change_queue->data)->column == column)
dequeue (eth, &column, &width);
if (column == -1)
@@ -207,7 +208,9 @@ eth_set_property (GObject *object, guint prop_id, const GValue *val, GParamSpec
case PROP_SORT_INFO:
if (eth->sort_info) {
if (eth->sort_info_group_change_id)
- g_signal_handler_disconnect(G_OBJECT(eth->sort_info), eth->sort_info_group_change_id);
+ g_signal_handler_disconnect (
+ G_OBJECT(eth->sort_info),
+ eth->sort_info_group_change_id);
g_object_unref (eth->sort_info);
}
eth->sort_info = E_TABLE_SORT_INFO(g_value_get_object (val));
@@ -631,7 +634,9 @@ e_table_header_move (ETableHeader *eth, gint source_index, gint target_index)
g_return_if_fail (source_index >= 0);
g_return_if_fail (target_index >= 0);
g_return_if_fail (source_index < eth->col_count);
- g_return_if_fail (target_index < eth->col_count + 1); /* Can be moved beyond the last item. */
+
+ /* Can be moved beyond the last item. */
+ g_return_if_fail (target_index < eth->col_count + 1);
if (source_index < target_index)
target_index --;
@@ -769,7 +774,9 @@ eth_set_size (ETableHeader *eth, gint idx, gint size)
old_expansion = expansion;
old_expansion -= eth->columns[idx]->expansion;
/* Set the new expansion so that it will generate the desired size. */
- eth->columns[idx]->expansion = expansion * (((double)(size - (eth->columns[idx]->min_width + eth->width_extras)))/((double)total_extra));
+ eth->columns[idx]->expansion =
+ expansion * (((double)(size - (eth->columns[idx]->min_width +
+ eth->width_extras))) / ((double)total_extra));
/* The expansion left for the columns on the right. */
expansion -= eth->columns[idx]->expansion;
@@ -861,7 +868,9 @@ eth_calc_widths (ETableHeader *eth)
extra -= e_table_sort_info_grouping_get_count(eth->sort_info) * GROUP_INDENT;
if (expansion != 0 && extra > 0) {
for (i = 0; i < last_resizable; i++) {
- next_position += extra * (eth->columns[i]->resizable ? eth->columns[i]->expansion : 0)/expansion;
+ next_position +=
+ extra * (eth->columns[i]->resizable ?
+ eth->columns[i]->expansion : 0) / expansion;
widths[i] += next_position - last_position;
last_position = next_position;
}
@@ -927,7 +936,9 @@ e_table_header_prioritized_column (ETableHeader *eth)
}
ETableCol *
-e_table_header_prioritized_column_selected (ETableHeader *eth, ETableColCheckFunc check_func, gpointer user_data)
+e_table_header_prioritized_column_selected (ETableHeader *eth,
+ ETableColCheckFunc check_func,
+ gpointer user_data)
{
ETableCol *best_col = NULL;
gint best_priority = G_MININT;
@@ -940,7 +951,8 @@ e_table_header_prioritized_column_selected (ETableHeader *eth, ETableColCheckFun
for (i = 1; i < count; i++) {
ETableCol *col = e_table_header_get_column (eth, i);
if (col) {
- if ((best_col == NULL || col->priority > best_priority) && check_func (col, user_data)) {
+ if ((best_col == NULL || col->priority > best_priority)
+ && check_func (col, user_data)) {
best_priority = col->priority;
best_col = col;
}