From fcc9045e90a0312645302053fd52aae04f25e8f7 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 2 Mar 2005 18:24:54 +0000 Subject: Reverted not approved patch svn path=/trunk/; revision=28943 --- plugins/save-calendar/ChangeLog | 4 -- plugins/save-calendar/csv-format.c | 80 ++++++++++++-------------------------- plugins/save-calendar/rdf-format.c | 25 +++++------- 3 files changed, 34 insertions(+), 75 deletions(-) (limited to 'plugins') diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog index e9c35b06c3..1989b35e5a 100644 --- a/plugins/save-calendar/ChangeLog +++ b/plugins/save-calendar/ChangeLog @@ -1,7 +1,3 @@ -2005-03-02 Philip Van Hoof - - * csv-format.c: Fixes for Bug #73099 and Bug #73098 - 2005-02-24 Björn Torkelsson * org-gnome-save-calendar.eplug.in: Fixed description and added diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 4f10d14a2a..80a32d2386 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -34,8 +34,6 @@ #include #include #include -#include -#include #include #include #include @@ -157,34 +155,25 @@ add_nummeric_to_csv (GString *line, gint *nummeric, CsvConfig *config) static GString * add_time_to_csv (GString *line, icaltimetype *time, CsvConfig *config) { + /* + * Perhaps we should check for quotes, delimiter and newlines in the + * resulting string: The translators can put it there! + * + * Or perhaps we shouldn't make this translatable? + * Or perhaps there is a library-function to do this? + */ if (time) { - gboolean needquotes = FALSE; - struct tm mytm = icaltimetype_to_tm (time); - char *str = (char*) malloc (sizeof (char) * 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, str); - - if (needquotes) - line = g_string_append (line, config->quote); - - free (str); - + g_string_append_printf (line, _("%s%d/%s%d/%s%d %s%d:%s%d:%s%d"), + (time->month < 10)?"0":"", time->month, + (time->day < 10)?"0":"", time->day, + (time->year < 10)?"0":"", time->year, + (time->hour < 10)?"0":"", time->hour, + (time->minute < 10)?"0":"", time->minute, + (time->second < 10)?"0":"", time->second); } line = g_string_append (line, config->delimiter); - return line; } @@ -363,7 +352,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource 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))), + doit = e_error_run(gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), E_ERROR_ASK_FILE_EXISTS_OVERWRITE, dest_uri, NULL) == GTK_RESPONSE_OK; if (doit) { @@ -377,37 +366,16 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource 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"), - N_("Description List"), - N_("Categories List"), - N_("Comment List"), - N_("Completed"), - N_("Created"), - N_("Contact List"), - N_("Start"), - N_("End"), - N_("Due"), - N_("percent Done"), - N_("Priority"), - N_("Url"), - N_("Attendees List"), - N_("Location"), - N_("Modified"), - }; - line = g_string_new (""); - for (i=0;i0) - line = g_string_append(line, config->delimiter); - line = g_string_append(line, _(labels[i])); - } - - line = g_string_append (line, config->newline); + g_string_append_printf (line, _("Uid%sSummary%sDescription List%sCategories List%s" + "Comment List%sCompleted%sCreated%sContact List%s" + "Start%sEnd%sDue%sPercent Done%sPriority%sUrl%s" + "Attendees List%sLocation%sModified%s"), + config->delimiter, config->delimiter, config->delimiter, config->delimiter, + config->delimiter, config->delimiter, config->delimiter, config->delimiter, + config->delimiter, config->delimiter, config->delimiter, config->delimiter, + config->delimiter, config->delimiter, config->delimiter, config->delimiter, + config->newline); gnome_vfs_write (handle, line->str, line->len, NULL); g_string_free (line, TRUE); diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 268b17798a..eb8154f782 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -38,8 +38,6 @@ #include #include #include -#include -#include #include #include #include @@ -63,18 +61,18 @@ add_string_to_rdf (xmlNodePtr node, const gchar *tag, const char *value); #define CALENDAR_CONFIG_PREFIX "/apps/evolution/calendar" #define CALENDAR_CONFIG_TIMEZONE CALENDAR_CONFIG_PREFIX "/display/timezone" -static GConfClient *config = NULL; +GConfClient *config = NULL; static gchar * calendar_config_get_timezone (void) { - gchar *retval = NULL; if (!config) config = gconf_client_get_default (); retval = gconf_client_get_string (config, CALENDAR_CONFIG_TIMEZONE, NULL); + if (!retval) retval = g_strdup ("UTC"); @@ -145,17 +143,14 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time) { if (time) { xmlNodePtr cur_node = NULL; - struct tm mytm = icaltimetype_to_tm (time); - gchar *str = (gchar*) g_malloc (sizeof (char) * 200); gchar *tmp = NULL; - - /* - * 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 - * */ - e_utf8_strftime (str, 200, _("%FT%T"), &mytm); - + gchar *str = g_strdup_printf ("%s%d-%s%d-%s%dT%s%d:%s%d:%s%d", + (time->year < 10)?"0":"", time->year, + (time->month < 10)?"0":"", time->month, + (time->day < 10)?"0":"", time->day, + (time->hour < 10)?"0":"", time->hour, + (time->minute < 10)?"0":"", time->minute, + (time->second < 10)?"0":"", time->second); cur_node = xmlNewChild (node, NULL, tag, str); /* Not sure about this property */ @@ -222,7 +217,7 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource 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))), + doit = e_error_run(gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), E_ERROR_ASK_FILE_EXISTS_OVERWRITE, dest_uri, NULL) == GTK_RESPONSE_OK; if (doit) { -- cgit