aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/calendar-config.c33
-rw-r--r--calendar/gui/calendar-model.c5
-rw-r--r--calendar/gui/e-day-view.c10
-rw-r--r--calendar/gui/e-itip-control.c1
-rw-r--r--calendar/gui/e-meeting-model.c10
-rw-r--r--calendar/gui/e-week-view.c6
-rw-r--r--calendar/gui/gnome-cal.c8
-rw-r--r--calendar/gui/itip-utils.c3
8 files changed, 24 insertions, 52 deletions
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 80f7f856d8..b2b7514b0a 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -70,7 +70,6 @@ typedef struct
CalUnits hide_completed_tasks_units;
gint hide_completed_tasks_value;
gboolean confirm_delete;
- gboolean confirm_expunge;
gboolean use_default_reminder;
int default_reminder_interval;
CalUnits default_reminder_units;
@@ -247,8 +246,6 @@ config_read (void)
/* Confirmation */
config->confirm_delete = bonobo_config_get_boolean_with_default (
db, "/Calendar/Other/ConfirmDelete", TRUE, NULL);
- config->confirm_expunge = bonobo_config_get_boolean_with_default (
- db, "/Calendar/Other/ConfirmExpunge", TRUE, NULL);
/* Default reminders */
config->use_default_reminder = bonobo_config_get_boolean_with_default (
@@ -361,7 +358,6 @@ calendar_config_write (void)
config->hide_completed_tasks_value, NULL);
bonobo_config_set_boolean (db, "/Calendar/Other/ConfirmDelete", config->confirm_delete, NULL);
- bonobo_config_set_boolean (db, "/Calendar/Other/ConfirmExpunge", config->confirm_expunge, NULL);
bonobo_config_set_boolean (db, "/Calendar/Other/UseDefaultReminder",
config->use_default_reminder, NULL);
@@ -407,9 +403,6 @@ calendar_config_write_on_exit (void)
bonobo_config_set_float (db, "/Calendar/Display/MonthVPanePosition",
config->month_vpane_pos, NULL);
- bonobo_config_set_boolean (db, "/Calendar/Other/ConfirmExpunge",
- config->confirm_expunge, NULL);
-
Bonobo_ConfigDatabase_sync (db, &ev);
bonobo_object_release_unref (db, NULL);
@@ -805,32 +798,6 @@ calendar_config_set_confirm_delete (gboolean confirm)
config->confirm_delete = confirm;
}
-/**
- * calendar_config_get_confirm_expunge:
- *
- * Queries the configuration value for whether a confirmation dialog is
- * presented when expunging calendar/tasks items.
- *
- * Return value: Whether confirmation is required when expunging items.
- **/
-gboolean
-calendar_config_get_confirm_expunge (void)
-{
- return config->confirm_expunge;
-}
-
-/**
- * calendar_config_set_confirm_expunge:
- * @confirm: Whether confirmation is required when expunging items.
- *
- * Sets the configuration value for whether a confirmation dialog is presented
- * when expunging calendar/tasks items.
- **/
-void
-calendar_config_set_confirm_expunge (gboolean confirm)
-{
- config->confirm_expunge = confirm;
-}
/* This sets all the common config settings for an ECalendar widget.
These are the week start day, and whether we show week numbers. */
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index e8317402ac..f2b9d8b428 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -1891,7 +1891,7 @@ query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *err
calendar_model_set_status_message (model, NULL);
if (status != CAL_QUERY_DONE_SUCCESS)
- g_warning ("query done: %s\n", error_str);
+ fprintf (stderr, "query done: %s\n", error_str);
}
/* Callback used when an evaluation error occurs when running a query */
@@ -1906,7 +1906,7 @@ query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)
calendar_model_set_status_message (model, NULL);
- g_warning ("eval error: %s\n", error_str);
+ fprintf (stderr, "eval error: %s\n", error_str);
}
/* Builds a complete query sexp for the calendar model by adding the predicates
@@ -1987,7 +1987,6 @@ update_query (CalendarModel *model)
if (!priv->query) {
g_message ("update_query(): Could not create the query");
- calendar_model_set_status_message (model, NULL);
return;
}
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 6b473950f7..dc8441e88a 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -4437,7 +4437,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
if (cal_client_update_object (day_view->client, comp)) {
- if (cal_component_has_attendees (comp) && send_component_dialog (comp, FALSE))
+ if (cal_component_has_attendees (comp) && send_component_dialog (comp))
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp);
} else {
g_message ("e_day_view_finish_long_event_resize(): Could not update the object!");
@@ -4498,7 +4498,7 @@ e_day_view_finish_resize (EDayView *day_view)
day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
if (cal_client_update_object (day_view->client, comp)) {
- if (cal_component_has_attendees (comp) && send_component_dialog (comp, FALSE))
+ if (cal_component_has_attendees (comp) && send_component_dialog (comp))
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp);
} else {
g_message ("e_day_view_finish_resize(): Could not update the object!");
@@ -5841,7 +5841,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
cal_component_set_summary (event->comp, &summary);
if (cal_client_update_object (day_view->client, event->comp)) {
- if (cal_component_has_attendees (event->comp) && send_component_dialog (event->comp, FALSE))
+ if (cal_component_has_attendees (event->comp) && send_component_dialog (event->comp))
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp);
} else {
g_message ("e_day_view_on_editing_stopped(): Could not update the object!");
@@ -6889,7 +6889,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
gnome_canvas_item_show (event->canvas_item);
if (cal_client_update_object (day_view->client, comp)) {
- if (cal_component_has_attendees (comp) && send_component_dialog (comp, FALSE))
+ if (cal_component_has_attendees (comp) && send_component_dialog (comp))
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp);
} else {
g_message ("e_day_view_on_top_canvas_drag_data_received(): Could "
@@ -7001,7 +7001,7 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget,
gnome_canvas_item_show (event->canvas_item);
if (cal_client_update_object (day_view->client, comp)) {
- if (cal_component_has_attendees (comp) && send_component_dialog (comp, FALSE))
+ if (cal_component_has_attendees (comp) && send_component_dialog (comp))
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp);
} else {
g_message ("e_day_view_on_main_canvas_drag_data_received(): "
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 66abdb89be..c7aece807c 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -187,6 +187,7 @@ static CalClient *
start_calendar_server (gboolean tasks)
{
CalClient *client;
+ char *cal_uri;
gboolean success;
client = cal_client_new ();
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c
index a3429aaf55..37632d4a2d 100644
--- a/calendar/gui/e-meeting-model.c
+++ b/calendar/gui/e-meeting-model.c
@@ -687,15 +687,15 @@ destroy (GtkObject *obj)
gtk_object_unref (GTK_OBJECT (priv->client));
if (priv->ebook != NULL)
- gtk_object_unref (GTK_OBJECT (priv->ebook));
+ gtk_object_unref (GTK_OBJECT (priv->ebook));
if (priv->corba_select_names != CORBA_OBJECT_NIL) {
- CORBA_Environment ev;
+ CORBA_Environment ev;
CORBA_exception_init (&ev);
bonobo_object_release_unref (priv->corba_select_names, &ev);
CORBA_exception_free (&ev);
- }
-
+ }
+
g_free (priv);
}
@@ -1181,6 +1181,8 @@ process_free_busy (EMeetingModel *im, EMeetingAttendee *ia, char *text)
if (main_comp == NULL)
return;
+ e_meeting_attendee_set_has_calendar_info (ia, TRUE);
+
kind = icalcomponent_isa (main_comp);
if (kind == ICAL_VCALENDAR_COMPONENT) {
icalcompiter iter;
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 7dd9d83cc3..df489ef710 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -593,10 +593,6 @@ e_week_view_realize (GtkWidget *widget)
week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].green = 65535;
week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].blue = 65535;
- week_view->colors[E_WEEK_VIEW_COLOR_TODAY].red = 65535;
- week_view->colors[E_WEEK_VIEW_COLOR_TODAY].green = 0;
- week_view->colors[E_WEEK_VIEW_COLOR_TODAY].blue = 0;
-
nfailed = gdk_colormap_alloc_colors (colormap, week_view->colors,
E_WEEK_VIEW_COLOR_LAST, FALSE,
TRUE, success);
@@ -3192,7 +3188,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
cal_component_set_summary (event->comp, &summary);
if (cal_client_update_object (week_view->client, event->comp)) {
- if (cal_component_has_attendees (event->comp) && send_component_dialog (event->comp, FALSE))
+ if (cal_component_has_attendees (event->comp) && send_component_dialog (event->comp))
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp);
} else {
g_message ("e_week_view_on_editing_stopped(): Could not update the object!");
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 664fac4bc8..bc9e426ef4 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -642,7 +642,13 @@ get_current_time (ECalendarItem *calitem, gpointer data)
cal->priv->zone);
/* Now copy it to the struct tm and return it. */
- tmp_tm = icaltimetype_to_tm (&tt);
+ tmp_tm.tm_year = tt.year - 1900;
+ tmp_tm.tm_mon = tt.month - 1;
+ tmp_tm.tm_mday = tt.day;
+ tmp_tm.tm_hour = tt.hour;
+ tmp_tm.tm_min = tt.minute;
+ tmp_tm.tm_sec = tt.second;
+ tmp_tm.tm_isdst = -1;
return tmp_tm;
}
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 405240e9da..4aecab882a 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -701,7 +701,8 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp)
g_return_if_fail (bonobo_server != NULL);
composer_server = BONOBO_OBJREF (bonobo_server);
- GNOME_Evolution_Composer_setMultipartType (composer_server, GNOME_Evolution_Composer_MIXED, &ev);
+ if (!getenv ("EVOLUTION_SEND_IMIP_AS_ATTACHMENT"))
+ GNOME_Evolution_Composer_setMultipartType (composer_server, GNOME_Evolution_Composer_ALTERNATIVE, &ev);
if (BONOBO_EX (&ev)) {
g_warning ("Unable to set multipart type while sending iTip message");
goto cleanup;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 23:17:54 +0800