|
 |
4b6d7b |
diff -up evolution-3.12.11/calendar/gui/e-calendar-view.c.calendar-tooltip-date-format evolution-3.12.11/calendar/gui/e-calendar-view.c
|
|
|
4b6d7b |
--- evolution-3.12.11/calendar/gui/e-calendar-view.c.calendar-tooltip-date-format 2015-06-16 22:46:01.311668442 +0200
|
|
|
4b6d7b |
+++ evolution-3.12.11/calendar/gui/e-calendar-view.c 2015-06-16 22:46:01.329668304 +0200
|
|
|
4b6d7b |
@@ -1948,7 +1948,7 @@ get_label (struct icaltimetype *tt,
|
|
|
4b6d7b |
|
|
|
4b6d7b |
tmp_tm = icaltimetype_to_tm_with_zone (tt, f_zone, t_zone);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- return e_datetime_format_format_tm ("calendar", "table", DTFormatKindDateTime, &tmp_tm);
|
|
|
4b6d7b |
+ return e_datetime_format_format_tm ("calendar", "table", tt->is_date ? DTFormatKindDate : DTFormatKindDateTime, &tmp_tm);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
|
|
|
4b6d7b |
void
|
|
|
4b6d7b |
diff -up evolution-3.12.11/calendar/gui/e-memo-table.c.calendar-tooltip-date-format evolution-3.12.11/calendar/gui/e-memo-table.c
|
|
|
4b6d7b |
--- evolution-3.12.11/calendar/gui/e-memo-table.c.calendar-tooltip-date-format 2014-10-09 11:05:48.000000000 +0200
|
|
|
4b6d7b |
+++ evolution-3.12.11/calendar/gui/e-memo-table.c 2015-06-16 22:46:01.329668304 +0200
|
|
|
4b6d7b |
@@ -459,9 +459,7 @@ memo_table_query_tooltip (GtkWidget *wid
|
|
|
4b6d7b |
gchar *tmp;
|
|
|
4b6d7b |
const gchar *str;
|
|
|
4b6d7b |
GString *tmp2;
|
|
|
4b6d7b |
- gchar buff[1001];
|
|
|
4b6d7b |
gboolean free_text = FALSE;
|
|
|
4b6d7b |
- gboolean use_24_hour_format;
|
|
|
4b6d7b |
ECalComponent *new_comp;
|
|
|
4b6d7b |
ECalComponentOrganizer organizer;
|
|
|
4b6d7b |
ECalComponentDateTime dtstart, dtdue;
|
|
|
4b6d7b |
@@ -586,41 +584,42 @@ memo_table_query_tooltip (GtkWidget *wid
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
|
|
|
4b6d7b |
tmp2 = g_string_new ("");
|
|
|
4b6d7b |
- use_24_hour_format = e_cal_model_get_use_24_hour_format (model);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
if (dtstart.value) {
|
|
|
4b6d7b |
- buff[0] = 0;
|
|
|
4b6d7b |
+ gchar *str;
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- tmp_tm = icaltimetype_to_tm_with_zone (
|
|
|
4b6d7b |
- dtstart.value, zone, default_zone);
|
|
|
4b6d7b |
- e_time_format_date_and_time (
|
|
|
4b6d7b |
- &tmp_tm, use_24_hour_format,
|
|
|
4b6d7b |
- FALSE, FALSE, buff, 1000);
|
|
|
4b6d7b |
+ tmp_tm = icaltimetype_to_tm_with_zone (dtstart.value, zone, default_zone);
|
|
|
4b6d7b |
+ str = e_datetime_format_format_tm ("calendar", "table",
|
|
|
4b6d7b |
+ dtstart.value->is_date ? DTFormatKindDate : DTFormatKindDateTime,
|
|
|
4b6d7b |
+ &tmp_tm);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- if (buff[0]) {
|
|
|
4b6d7b |
+ if (str && *str) {
|
|
|
4b6d7b |
/* Translators: This is followed by an event's start date/time */
|
|
|
4b6d7b |
g_string_append (tmp2, _("Start: "));
|
|
|
4b6d7b |
- g_string_append (tmp2, buff);
|
|
|
4b6d7b |
+ g_string_append (tmp2, str);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
+
|
|
|
4b6d7b |
+ g_free (str);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
|
|
|
4b6d7b |
if (dtdue.value) {
|
|
|
4b6d7b |
- buff[0] = 0;
|
|
|
4b6d7b |
+ gchar *str;
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- tmp_tm = icaltimetype_to_tm_with_zone (
|
|
|
4b6d7b |
- dtdue.value, zone, default_zone);
|
|
|
4b6d7b |
- e_time_format_date_and_time (
|
|
|
4b6d7b |
- &tmp_tm, use_24_hour_format,
|
|
|
4b6d7b |
- FALSE, FALSE, buff, 1000);
|
|
|
4b6d7b |
+ tmp_tm = icaltimetype_to_tm_with_zone (dtdue.value, zone, default_zone);
|
|
|
4b6d7b |
+ str = e_datetime_format_format_tm ("calendar", "table",
|
|
|
4b6d7b |
+ dtdue.value->is_date ? DTFormatKindDate : DTFormatKindDateTime,
|
|
|
4b6d7b |
+ &tmp_tm);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- if (buff[0]) {
|
|
|
4b6d7b |
+ if (str && *str) {
|
|
|
4b6d7b |
if (tmp2->len)
|
|
|
4b6d7b |
g_string_append (tmp2, "; ");
|
|
|
4b6d7b |
|
|
|
4b6d7b |
/* Translators: This is followed by an event's due date/time */
|
|
|
4b6d7b |
g_string_append (tmp2, _("Due: "));
|
|
|
4b6d7b |
- g_string_append (tmp2, buff);
|
|
|
4b6d7b |
+ g_string_append (tmp2, str);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
+
|
|
|
4b6d7b |
+ g_free (str);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
|
|
|
4b6d7b |
if (tmp2->len) {
|
|
|
4b6d7b |
diff -up evolution-3.12.11/calendar/gui/e-task-table.c.calendar-tooltip-date-format evolution-3.12.11/calendar/gui/e-task-table.c
|
|
|
4b6d7b |
--- evolution-3.12.11/calendar/gui/e-task-table.c.calendar-tooltip-date-format 2014-10-09 11:05:52.000000000 +0200
|
|
|
4b6d7b |
+++ evolution-3.12.11/calendar/gui/e-task-table.c 2015-06-16 22:46:01.330668296 +0200
|
|
|
4b6d7b |
@@ -760,9 +760,7 @@ task_table_query_tooltip (GtkWidget *wid
|
|
|
4b6d7b |
gchar *tmp;
|
|
|
4b6d7b |
const gchar *str;
|
|
|
4b6d7b |
GString *tmp2;
|
|
|
4b6d7b |
- gchar buff[1001];
|
|
|
4b6d7b |
gboolean free_text = FALSE;
|
|
|
4b6d7b |
- gboolean use_24_hour_format;
|
|
|
4b6d7b |
ECalComponent *new_comp;
|
|
|
4b6d7b |
ECalComponentOrganizer organizer;
|
|
|
4b6d7b |
ECalComponentDateTime dtstart, dtdue;
|
|
|
4b6d7b |
@@ -871,7 +869,6 @@ task_table_query_tooltip (GtkWidget *wid
|
|
|
4b6d7b |
e_cal_component_get_due (new_comp, &dtdue);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
default_zone = e_cal_model_get_timezone (model);
|
|
|
4b6d7b |
- use_24_hour_format = e_cal_model_get_use_24_hour_format (model);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
if (dtstart.tzid) {
|
|
|
4b6d7b |
zone = icalcomponent_get_timezone (
|
|
|
4b6d7b |
@@ -889,36 +886,38 @@ task_table_query_tooltip (GtkWidget *wid
|
|
|
4b6d7b |
tmp2 = g_string_new ("");
|
|
|
4b6d7b |
|
|
|
4b6d7b |
if (dtstart.value) {
|
|
|
4b6d7b |
- buff[0] = 0;
|
|
|
4b6d7b |
+ gchar *str;
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- tmp_tm = icaltimetype_to_tm_with_zone (
|
|
|
4b6d7b |
- dtstart.value, zone, default_zone);
|
|
|
4b6d7b |
- e_time_format_date_and_time (
|
|
|
4b6d7b |
- &tmp_tm, use_24_hour_format,
|
|
|
4b6d7b |
- FALSE, FALSE, buff, 1000);
|
|
|
4b6d7b |
+ tmp_tm = icaltimetype_to_tm_with_zone (dtstart.value, zone, default_zone);
|
|
|
4b6d7b |
+ str = e_datetime_format_format_tm ("calendar", "table",
|
|
|
4b6d7b |
+ dtstart.value->is_date ? DTFormatKindDate : DTFormatKindDateTime,
|
|
|
4b6d7b |
+ &tmp_tm);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- if (buff[0]) {
|
|
|
4b6d7b |
+ if (str && *str) {
|
|
|
4b6d7b |
g_string_append (tmp2, _("Start: "));
|
|
|
4b6d7b |
- g_string_append (tmp2, buff);
|
|
|
4b6d7b |
+ g_string_append (tmp2, str);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
+
|
|
|
4b6d7b |
+ g_free (str);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
|
|
|
4b6d7b |
if (dtdue.value) {
|
|
|
4b6d7b |
- buff[0] = 0;
|
|
|
4b6d7b |
+ gchar *str;
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- tmp_tm = icaltimetype_to_tm_with_zone (
|
|
|
4b6d7b |
- dtdue.value, zone, default_zone);
|
|
|
4b6d7b |
- e_time_format_date_and_time (
|
|
|
4b6d7b |
- &tmp_tm, use_24_hour_format,
|
|
|
4b6d7b |
- FALSE, FALSE, buff, 1000);
|
|
|
4b6d7b |
+ tmp_tm = icaltimetype_to_tm_with_zone (dtdue.value, zone, default_zone);
|
|
|
4b6d7b |
+ str = e_datetime_format_format_tm ("calendar", "table",
|
|
|
4b6d7b |
+ dtdue.value->is_date ? DTFormatKindDate : DTFormatKindDateTime,
|
|
|
4b6d7b |
+ &tmp_tm);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- if (buff[0]) {
|
|
|
4b6d7b |
+ if (str && *str) {
|
|
|
4b6d7b |
if (tmp2->len)
|
|
|
4b6d7b |
g_string_append (tmp2, "; ");
|
|
|
4b6d7b |
|
|
|
4b6d7b |
g_string_append (tmp2, _("Due: "));
|
|
|
4b6d7b |
- g_string_append (tmp2, buff);
|
|
|
4b6d7b |
+ g_string_append (tmp2, str);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
+
|
|
|
4b6d7b |
+ g_free (str);
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
|
|
|
4b6d7b |
if (tmp2->len) {
|