From 9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 14 Nov 2007 22:04:21 +0000 Subject: ** Remove trailing whitespace from source code. 2007-11-14 Matthew Barnes ** Remove trailing whitespace from source code. svn path=/trunk/; revision=34537 --- plugins/save-calendar/csv-format.c | 82 +++++++++++++++++------------------ plugins/save-calendar/ical-format.c | 22 +++++----- plugins/save-calendar/rdf-format.c | 24 +++++----- plugins/save-calendar/save-calendar.c | 38 ++++++++-------- 4 files changed, 83 insertions(+), 83 deletions(-) (limited to 'plugins/save-calendar') diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 8ee52e2641..8deaf05282 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -84,7 +84,7 @@ static GString * add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type) { - /* + /* * This one will write 'ECalComponentText' and 'const char' GSLists. It will * put quotes around the complete written value if there's was only one value * but it required having quotes and if there was more than one value (in which @@ -122,7 +122,7 @@ add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type) if (list) tmp = g_string_append (tmp, config->delimiter); } - + if (needquotes) line = g_string_append (line, config->quote); line = g_string_append_len (line, tmp->str, tmp->len); @@ -139,7 +139,7 @@ static GString * add_nummeric_to_csv (GString *line, gint *nummeric, CsvConfig *config) { - /* + /* * This one will write {-1}..{00}..{01}..{99} * it prepends a 0 if it's < 10 and > -1 */ @@ -159,25 +159,25 @@ add_time_to_csv (GString *line, icaltimetype *time, CsvConfig *config) gboolean needquotes = FALSE; struct tm mytm = icaltimetype_to_tm (time); gchar *str = (gchar*) g_malloc (sizeof (gchar) * 200); - - /* + + /* * Translator: the %F %T is the thirth argument for a strftime function. * It lets you define the formatting of the date in the csv-file. * */ e_utf8_strftime (str, 200, _("%F %T"), &mytm); - + needquotes = string_needsquotes (str, config); - + if (needquotes) - line = g_string_append (line, config->quote); - + line = g_string_append (line, config->quote); + line = g_string_append (line, str); - + if (needquotes) line = g_string_append (line, config->quote); - + g_free (str); - + } line = g_string_append (line, config->delimiter); @@ -191,8 +191,8 @@ string_needsquotes (const char *value, CsvConfig *config) /* This is the actual need for quotes-checker */ - /* - * These are the simple substring-checks + /* + * These are the simple substring-checks * * Example: {Mom, can you please do that for me?} * Will be written as {"Mom, can you please do that for me?"} @@ -202,15 +202,15 @@ string_needsquotes (const char *value, CsvConfig *config) if (!needquotes) { needquotes = strstr (value, config->newline) ? TRUE:FALSE; - if (!needquotes) + if (!needquotes) needquotes = strstr (value, config->quote) ? TRUE:FALSE; } - /* + /* * If the special-char is char+onespace (so like {, } {" }, {\n }) and it occurs * the value that is going to be written - * + * * In this case we don't trust the user . . . and are going to quote the string * just to play save -- Quoting is always allowed in the CSV format. If you can * avoid it, it's better to do so since a lot applications don't support CSV @@ -220,7 +220,7 @@ string_needsquotes (const char *value, CsvConfig *config) * This example will be written as {"Mom,can you please do that for me?"} because * there's a {,} behind {Mom} and the delimiter is {, } (so we searched only the * first character of {, } and didn't trust the user). - */ + */ if (!needquotes) { @@ -234,7 +234,7 @@ string_needsquotes (const char *value, CsvConfig *config) if (!needquotes) { len = strlen (config->quote); if ((len == 2) && (config->quote[1] == ' ')) { - needquotes = strchr + needquotes = strchr (value, config->quote[0])?TRUE:FALSE; } } @@ -283,13 +283,13 @@ userstring_to_systemstring (const gchar *userstring) case '\\': str = g_string_append_c (str, '\\'); i++; - break; + break; case 'r': str = g_string_append_c (str, '\r'); - i++; + i++; break; case 't': - str = g_string_append_c (str, '\t'); + str = g_string_append_c (str, '\t'); i++; break; } @@ -303,17 +303,17 @@ userstring_to_systemstring (const gchar *userstring) retval = str->str; g_string_free (str, FALSE); - return retval; + return retval; } static void do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri) { - /* - * According to some documentation about CSV, newlines 'are' allowed + /* + * According to some documentation about CSV, newlines 'are' allowed * in CSV-files. But you 'do' have to put the value between quotes. - * The helper 'string_needsquotes' will check for that + * The helper 'string_needsquotes' will check for that * * http://www.creativyst.com/Doc/Articles/CSV/CSV01.htm * http://www.creativyst.com/cgi-bin/Prod/15/eg/csv2xml.pl @@ -347,7 +347,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource } config = g_new (CsvConfig, 1); - + tmp = gtk_entry_get_text (GTK_ENTRY(d->delimiter_entry)); config->delimiter = userstring_to_systemstring (tmp?tmp:", "); tmp = gtk_entry_get_text (GTK_ENTRY(d->newline_entry)); @@ -368,15 +368,15 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource if (result != GNOME_VFS_OK) { gnome_vfs_create (&handle, dest_uri, GNOME_VFS_OPEN_WRITE, TRUE, GNOME_VFS_PERM_USER_ALL); result = gnome_vfs_open_uri (&handle, uri, GNOME_VFS_OPEN_WRITE); - } + } } if (result == GNOME_VFS_OK && doit && e_cal_get_object_list_as_comp (source_client, "#t", &objects, NULL)) { if (config->header) { - + gint i=0; - + static gchar *labels[] = { N_("UID"), N_("Summary"), @@ -403,14 +403,14 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource line = g_string_append(line, config->delimiter); line = g_string_append(line, _(labels[i])); } - + line = g_string_append (line, config->newline); gnome_vfs_write (handle, line->str, line->len, NULL); g_string_free (line, TRUE); } - + while (objects != NULL) { ECalComponent *comp = objects->data; gchar *delimiter_temp = NULL; @@ -419,7 +419,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource ECalComponentDateTime temp_dt; struct icaltimetype *temp_time; int *temp_int; - ECalComponentText temp_comptext; + ECalComponentText temp_comptext; line = g_string_new (""); @@ -501,7 +501,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource /* Append a newline (record delimiter) */ delimiter_temp = config->delimiter; config->delimiter = config->newline; - + line = add_time_to_csv (line, temp_time, config); /* And restore for the next record */ @@ -548,7 +548,7 @@ create_options_widget (FormatHandler *handler) *csv_options = gtk_expander_new (_("Advanced options for the CSV format")), *vbox = gtk_vbox_new (FALSE, 0); CsvPluginData *d = handler->data; - + d->delimiter_entry = gtk_entry_new (); d->newline_entry = gtk_entry_new (); d->quote_entry = gtk_entry_new (); @@ -563,20 +563,20 @@ create_options_widget (FormatHandler *handler) gtk_table_set_col_spacings (GTK_TABLE (table), 5); label = gtk_label_new (_("Value delimiter:")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_table_attach (GTK_TABLE (table), d->delimiter_entry, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); label = gtk_label_new (_("Record delimiter:")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_table_attach (GTK_TABLE (table), d->newline_entry, 1, 2, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); label = gtk_label_new (_("Encapsulate values with:")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_table_attach (GTK_TABLE (table), d->quote_entry, 1, 2, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index 46be87e53a..ce57d00576 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -1,8 +1,8 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Authors: Rodrigo Moya + * Authors: Rodrigo Moya * Philip Van Hoof - * + * * Copyright 2004 Novell, Inc. (www.novell.com) * * This program is free software; you can redistribute it and/or @@ -68,16 +68,16 @@ insert_tz_comps (icalparameter *param, void *cb_data) GError *error = NULL; tzid = icalparameter_get_tzid (param); - + if (g_hash_table_lookup (tdata->zones, tzid)) return; - + if (!e_cal_get_timezone (tdata->ecal, tzid, &zone, &error)) { g_warning ("Could not get the timezone information for %s : %s \n", tzid, error->message); g_error_free (error); return; } - + tzcomp = icalcomponent_new_clone (icaltimezone_get_component (zone)); g_hash_table_insert (tdata->zones, (gpointer) tzid, (gpointer) tzcomp); } @@ -97,7 +97,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc GList *objects; icalcomponent *top_level = NULL; GnomeVFSURI *uri; - gboolean doit = TRUE; + gboolean doit = TRUE; primary_source = e_source_selector_peek_primary_selection (target->selector); @@ -127,7 +127,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc while (objects != NULL) { icalcomponent *icalcomp = objects->data; - + icalcomponent_foreach_tzid (icalcomp, insert_tz_comps, &tdata); icalcomponent_add_component (top_level, icalcomp); @@ -142,7 +142,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc /* save the file */ uri = gnome_vfs_uri_new (dest_uri); - + result = gnome_vfs_open_uri (&handle, uri, GNOME_VFS_OPEN_READ); if (result == GNOME_VFS_OK) doit = e_error_run(GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), @@ -157,18 +157,18 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc gnome_vfs_result_to_string (result)); } } - + if (result == GNOME_VFS_OK) { char *ical_str; GnomeVFSFileSize bytes_written; - + ical_str = icalcomponent_as_ical_string (top_level); if ((result = gnome_vfs_write (handle, (gconstpointer) ical_str, strlen (ical_str), &bytes_written)) != GNOME_VFS_OK) { display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), gnome_vfs_result_to_string (result)); } - + gnome_vfs_close (handle); } } diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index c3f2dbbefa..33cded34bd 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -48,7 +48,7 @@ #include "format-handler.h" -static void +static void add_string_to_rdf (xmlNodePtr node, const gchar *tag, const char *value); /* Use { */ @@ -72,7 +72,7 @@ calendar_config_get_timezone (void) config = gconf_client_get_default (); retval = gconf_client_get_string (config, CALENDAR_CONFIG_TIMEZONE, NULL); - if (!retval) + if (!retval) retval = g_strdup ("UTC"); return retval; @@ -97,7 +97,7 @@ display_error_message (GtkWidget *parent, GError *error) } /* Some helpers for the xml stuff */ -static void +static void add_list_to_rdf (xmlNodePtr node, const gchar *tag, GSList *list_in, gint type) { if (list_in) { @@ -126,7 +126,7 @@ add_list_to_rdf (xmlNodePtr node, const gchar *tag, GSList *list_in, gint type) } } -static void +static void add_nummeric_to_rdf (xmlNodePtr node, const gchar *tag, gint *nummeric) { if (nummeric) { @@ -149,7 +149,7 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time) /* * Translator: the %FT%T is the thirth argument for a strftime function. * It lets you define the formatting of the date in the rdf-file. - * Also check out http://www.w3.org/2002/12/cal/tzd + * Also check out http://www.w3.org/2002/12/cal/tzd * */ e_utf8_strftime (str, 200, _("%FT%T"), &mytm); @@ -166,7 +166,7 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time) } -static void +static void add_string_to_rdf (xmlNodePtr node, const gchar *tag, const char *value) { if (value) { @@ -183,10 +183,10 @@ static void do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri) { - /* - * According to some documentation about CSV, newlines 'are' allowed + /* + * According to some documentation about CSV, newlines 'are' allowed * in CSV-files. But you 'do' have to put the value between quotes. - * The helper 'string_needsquotes' will check for that + * The helper 'string_needsquotes' will check for that * * http://www.creativyst.com/Doc/Articles/CSV/CSV01.htm * http://www.creativyst.com/cgi-bin/Prod/15/eg/csv2xml.pl @@ -219,7 +219,7 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource uri = gnome_vfs_uri_new (dest_uri); result = gnome_vfs_open_uri (&handle, uri, GNOME_VFS_OPEN_READ); - if (result == GNOME_VFS_OK) + if (result == GNOME_VFS_OK) doit = e_error_run(GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), E_ERROR_ASK_FILE_EXISTS_OVERWRITE, dest_uri, NULL) == GTK_RESPONSE_OK; @@ -228,7 +228,7 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource if (result != GNOME_VFS_OK) { gnome_vfs_create (&handle, dest_uri, GNOME_VFS_OPEN_WRITE, TRUE, GNOME_VFS_PERM_USER_ALL); result = gnome_vfs_open_uri (&handle, uri, GNOME_VFS_OPEN_WRITE); - } + } } @@ -274,7 +274,7 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource ECalComponentDateTime temp_dt; struct icaltimetype *temp_time; int *temp_int; - ECalComponentText temp_comptext; + ECalComponentText temp_comptext; xmlNodePtr c_node = xmlNewChild (fnode, NULL, (const unsigned char *)"component", NULL); xmlNodePtr node = xmlNewChild (c_node, NULL, (const unsigned char *)"Vevent", NULL); diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index bce7bc3504..bd5dff3f06 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -53,14 +53,14 @@ void org_gnome_save_calendar (EPlugin *ep, ECalPopupTargetSource *target); void org_gnome_save_tasks (EPlugin *ep, ECalPopupTargetSource *target); -static void +static void extra_widget_foreach_hide (GtkWidget *widget, gpointer data) { if (widget != data) gtk_widget_hide (widget); } -static void +static void on_type_combobox_changed (GtkComboBox *combobox, gpointer data) { FormatHandler *handler = NULL; @@ -68,23 +68,23 @@ on_type_combobox_changed (GtkComboBox *combobox, gpointer data) GtkTreeIter iter; GtkTreeModel *model = gtk_combo_box_get_model (combobox); - gtk_container_foreach (GTK_CONTAINER (extra_widget), + gtk_container_foreach (GTK_CONTAINER (extra_widget), extra_widget_foreach_hide, combobox); gtk_combo_box_get_active_iter (combobox, &iter); - gtk_tree_model_get (model, &iter, + gtk_tree_model_get (model, &iter, DEST_HANDLER, &handler, -1); if (handler->options_widget) { gtk_widget_show (handler->options_widget); - } + } } -static void +static void format_handlers_foreach_free (gpointer data, gpointer user_data) { FormatHandler *handler = data; @@ -98,14 +98,14 @@ format_handlers_foreach_free (gpointer data, gpointer user_data) g_free (data); } -static void +static void ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type) { FormatHandler *handler = NULL; GtkWidget *extra_widget = gtk_vbox_new (FALSE, 0); GtkComboBox *combo = GTK_COMBO_BOX(gtk_combo_box_new ()); - GtkTreeModel *model = GTK_TREE_MODEL (gtk_list_store_new + GtkTreeModel *model = GTK_TREE_MODEL (gtk_list_store_new (N_DEST_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER)); GtkCellRenderer *renderer=NULL; GtkListStore *store = GTK_LIST_STORE (model); @@ -116,33 +116,33 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource GList *format_handlers = NULL; /* The available formathandlers */ - format_handlers = g_list_append (format_handlers, + format_handlers = g_list_append (format_handlers, ical_format_handler_new ()); - format_handlers = g_list_append (format_handlers, + format_handlers = g_list_append (format_handlers, csv_format_handler_new ()); - format_handlers = g_list_append (format_handlers, + format_handlers = g_list_append (format_handlers, rdf_format_handler_new ()); /* The Type GtkComboBox */ - gtk_box_pack_start (GTK_BOX (extra_widget), GTK_WIDGET (combo), + gtk_box_pack_start (GTK_BOX (extra_widget), GTK_WIDGET (combo), TRUE, TRUE, 0); gtk_combo_box_set_model (combo, model); gtk_list_store_clear (store); renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer, "text", DEST_NAME_COLUMN, NULL); while (format_handlers) { handler = format_handlers->data; gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, DEST_NAME_COLUMN, + gtk_list_store_set (store, &iter, DEST_NAME_COLUMN, handler->combo_label, -1); gtk_list_store_set (store, &iter, DEST_HANDLER, handler, -1); if (handler->options_widget) { - gtk_box_pack_start (GTK_BOX (extra_widget), + gtk_box_pack_start (GTK_BOX (extra_widget), GTK_WIDGET (handler->options_widget), TRUE, TRUE, 0); gtk_widget_hide (handler->options_widget); } @@ -157,7 +157,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource } - g_signal_connect (G_OBJECT(combo), "changed", + g_signal_connect (G_OBJECT(combo), "changed", G_CALLBACK (on_type_combobox_changed), extra_widget); dialog = gtk_file_chooser_dialog_new (_("Select destination file"), @@ -178,10 +178,10 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource char *tmp = NULL; gtk_combo_box_get_active_iter (combo, &iter); - gtk_tree_model_get (model, &iter, + gtk_tree_model_get (model, &iter, DEST_HANDLER, &handler, -1); - dest_uri = gtk_file_chooser_get_uri + dest_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); tmp = strstr (dest_uri, handler->filename_ext); @@ -202,7 +202,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource g_list_free (format_handlers); /* Now we can destroy it */ - gtk_widget_destroy (dialog); + gtk_widget_destroy (dialog); g_free (dest_uri); } -- cgit v1.2.3