aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/dialogs/calendar-setup.c8
-rw-r--r--calendar/gui/dialogs/comp-editor.c10
-rw-r--r--calendar/gui/dialogs/e-delegate-dialog.c1
-rw-r--r--calendar/gui/dialogs/e-send-options-utils.c3
-rw-r--r--calendar/gui/dialogs/meeting-page.c4
-rw-r--r--calendar/gui/e-cal-config.h2
-rw-r--r--calendar/gui/e-cal-model.c3
-rw-r--r--calendar/gui/e-cal-popup.c1
-rw-r--r--calendar/gui/e-calendar-table.c2
-rw-r--r--calendar/gui/e-calendar-view.c7
-rw-r--r--calendar/gui/e-day-view.c9
-rw-r--r--calendar/gui/e-itip-control.c4
-rw-r--r--calendar/gui/e-meeting-store.c9
-rw-r--r--calendar/gui/e-meeting-time-sel.c4
-rw-r--r--calendar/gui/e-select-names-editable.c1
-rw-r--r--calendar/gui/e-tasks.c3
-rw-r--r--calendar/gui/e-week-view.c2
-rw-r--r--calendar/gui/gnome-cal.c8
-rw-r--r--calendar/gui/itip-utils.c2
-rw-r--r--calendar/gui/tasks-component.c2
20 files changed, 39 insertions, 46 deletions
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index e54a3a3838..3b6b578786 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -55,7 +55,7 @@ struct _CalendarSourceDialog {
/* Source group we're creating/editing a source in */
ESourceGroup *source_group;
- ECalSourceType *source_type;
+ ECalSourceType source_type;
};
static gboolean
@@ -284,10 +284,10 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
row = ((GtkTable*)parent)->nrows;
if (sdialog->source_type == E_CAL_SOURCE_TYPE_EVENT)
- offline_setting = gtk_check_button_new_with_label (N_("Copy calendar contents locally for offline operation"));
+ offline_setting = gtk_check_button_new_with_label (_("Copy calendar contents locally for offline operation"));
else if (sdialog->source_type == E_CAL_SOURCE_TYPE_TODO)
- offline_setting = gtk_check_button_new_with_label (N_("Copy task list contents locally for offline operation"));
+ offline_setting = gtk_check_button_new_with_label (_("Copy task list contents locally for offline operation"));
gtk_widget_show (offline_setting);
g_signal_connect (offline_setting, "toggled", G_CALLBACK (offline_status_changed_cb), sdialog);
@@ -315,8 +315,6 @@ eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent
static GtkWidget *label, *picker;
int row;
ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
- ESource *source = t->source;
-
static guint32 assigned_colors[] = {
0xBECEDD, /* 190 206 221 Blue */
0xE2F0EF, /* 226 240 239 Light Blue */
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 6e8f8ce6e8..67d3c10411 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -897,9 +897,11 @@ response_cb (GtkWidget *widget, int response, gpointer data)
case GTK_RESPONSE_OK:
/* Check whether the downloads are completed */
if (e_attachment_bar_get_download_count (E_ATTACHMENT_BAR (editor->priv->attachment_bar)) ){
+ gboolean response = 1;
+#warning "FIXME: Cannot use mail functions from calendar!!!!"
+#if 0
ECalComponentVType vtype = e_cal_component_get_vtype(editor->priv->comp);
- gboolean response;
-
+
if (vtype == E_CAL_COMPONENT_EVENT)
response = em_utils_prompt_user((GtkWindow *)widget,
NULL,
@@ -910,6 +912,7 @@ response_cb (GtkWidget *widget, int response, gpointer data)
NULL,
"calendar:ask-send-task-pending-download",
NULL);
+#endif
if (!response)
return;
}
@@ -1097,7 +1100,7 @@ cab_popup_position(GtkMenu *menu, int *x, int *y, gboolean *push_in, gpointer us
if (selection == NULL)
return;
- image = gnome_icon_list_get_icon_pixbuf_item (icon_list, (gint)selection->data);
+ image = gnome_icon_list_get_icon_pixbuf_item (icon_list, GPOINTER_TO_INT(selection->data));
if (image == NULL)
return;
@@ -2009,7 +2012,6 @@ set_attachment_list (CompEditor *editor, GSList *attach_list)
{
GSList *p = NULL;
const char *comp_uid= NULL;
- const char *local_store = e_cal_get_local_attachment_store (editor->priv->client);
e_cal_component_get_uid (editor->priv->comp, &comp_uid);
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 565d87ad52..f1fcf790d9 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -123,7 +123,6 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char
EDestination *dest;
ENameSelectorModel *name_selector_model;
ENameSelectorDialog *name_selector_dialog;
- char *str;
g_return_val_if_fail (edd != NULL, NULL);
g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index ff70a2ccd7..0999605e07 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -21,8 +21,7 @@
#include "e-send-options-utils.h"
#include "../calendar-config.h"
#include <glib.h>
-
-ESendOptionsDialog *sod = NULL;
+#include <string.h>
void
e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char * type)
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 4ca971c3f3..a272a20db5 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -300,7 +300,7 @@ clear_widgets (MeetingPage *mpage)
priv = mpage->priv;
if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_PAGE_DELEGATE) {
- gtk_label_set_markup_with_mnemonic (priv->att_label, _("<b>Dele_gatees</b>"));
+ gtk_label_set_markup_with_mnemonic ((GtkLabel *)priv->att_label, _("<b>Dele_gatees</b>"));
}
if (e_cal_get_static_capability (COMP_EDITOR_PAGE (mpage)->client, CAL_STATIC_CAPABILITY_NO_ORGANIZER)) {
@@ -487,7 +487,7 @@ meeting_page_fill_component (CompEditorPage *page, ECalComponent *comp)
if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_PAGE_DELEGATE ) {
GSList *attendee_list, *l;
int i;
- GPtrArray *attendees = e_meeting_store_get_attendees (priv->model);
+ const GPtrArray *attendees = e_meeting_store_get_attendees (priv->model);
e_cal_component_get_attendee_list (priv->comp, &attendee_list);
diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h
index fa3a26e75f..1a6f41635e 100644
--- a/calendar/gui/e-cal-config.h
+++ b/calendar/gui/e-cal-config.h
@@ -53,7 +53,7 @@ struct _ECalConfigTargetSource {
EConfigTarget target;
struct _ESource *source;
- ECalSourceType *source_type;
+ ECalSourceType source_type;
};
typedef struct _EConfigItem ECalConfigItem;
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index f53320ec93..0c6f3bb89a 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -32,6 +32,7 @@
#include "itip-utils.h"
#include "misc.h"
#include "e-calendar-marshal.h"
+#include "calendar-config.h"
typedef struct {
ECal *client;
@@ -1314,7 +1315,7 @@ add_instance_cb (ECalComponent *comp, time_t instance_start, time_t instance_end
static void
set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone)
{
- struct icaltimetype recur_time, start_time, end_time, itt;
+ struct icaltimetype recur_time, start_time, end_time;
recur_time = icalcomponent_get_recurrenceid (comp_data->icalcomp);
start_time = icalcomponent_get_dtstart (comp_data->icalcomp);
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 1aafb58cad..8cebaaf8c3 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -169,7 +169,6 @@ needs_to_accept (icalcomponent *icalcomp, char *user_email)
icalproperty *prop;
icalparameter *param;
icalparameter_partstat status;
- const char *delto = NULL;
prop = get_attendee_prop (icalcomp, user_email);
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 04cc9265e2..71eaec8193 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -509,7 +509,7 @@ e_calendar_table_init (ECalendarTable *cal_table)
g_signal_connect (e_table, "key_press", G_CALLBACK (e_calendar_table_on_key_press), cal_table);
g_signal_connect (e_table, "popup_menu", G_CALLBACK (e_calendar_table_on_popup_menu), cal_table);
- a11y = gtk_widget_get_accessible (e_table);
+ a11y = gtk_widget_get_accessible ((GtkWidget *)e_table);
if (a11y)
atk_object_set_name (a11y, _("Task Table"));
}
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index efb6d99122..87b2aa7f08 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1049,7 +1049,7 @@ on_edit_appointment (EPopup *ep, EPopupItem *pitem, void *data)
if (event)
e_calendar_view_edit_appointment (cal_view, event->comp_data->client,
event->comp_data->icalcomp,
- icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY));
+ icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY) != NULL);
g_list_free (selected);
}
@@ -1213,7 +1213,7 @@ transfer_selected_items (ECalendarView *cal_view, gboolean remove_item)
return;
/* prompt the user for destination source */
- destination_source = select_source_dialog ((GtkWindow *) gtk_widget_get_toplevel (cal_view), E_CAL_SOURCE_TYPE_EVENT);
+ destination_source = select_source_dialog ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *)cal_view), E_CAL_SOURCE_TYPE_EVENT);
if (!destination_source)
return;
@@ -1403,7 +1403,6 @@ on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, void *data)
GList *selected;
ECal *client;
char *new_uid;
- icalproperty *prop;
selected = e_calendar_view_get_selected_events (cal_view);
if (!selected)
@@ -1625,7 +1624,7 @@ e_calendar_view_open_event (ECalendarView *cal_view)
ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
if (event)
e_calendar_view_edit_appointment (cal_view, event->comp_data->client,
- event->comp_data->icalcomp, icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY));
+ event->comp_data->icalcomp, icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY) != NULL);
g_list_free (selected);
}
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 5a2b806119..a7092f8f91 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -505,8 +505,6 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo
static void
process_component (EDayView *day_view, ECalModelComponent *comp_data)
{
- EDayViewEvent *event;
- gint day, event_num;
const char *uid, *rid;
ECalComponent *comp;
AddEventData add_event_data;
@@ -1078,8 +1076,6 @@ e_day_view_realize (GtkWidget *widget)
{
EDayView *day_view;
GdkColormap *colormap;
- gboolean success[E_DAY_VIEW_COLOR_LAST];
- gint nfailed;
if (GTK_WIDGET_CLASS (e_day_view_parent_class)->realize)
(*GTK_WIDGET_CLASS (e_day_view_parent_class)->realize)(widget);
@@ -3308,7 +3304,7 @@ e_day_view_on_event_double_click (EDayView *day_view,
attendee_prop = icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
- e_calendar_view_edit_appointment (day_view,
+ e_calendar_view_edit_appointment ((ECalendarView *)day_view,
event->comp_data->client,
event->comp_data->icalcomp, attendee_prop ? TRUE:FALSE);
}
@@ -3492,8 +3488,9 @@ void
e_day_view_update_calendar_selection_time (EDayView *day_view)
{
time_t start, end;
+#if 0
GnomeCalendar *calendar;
-
+#endif
e_day_view_get_selected_time_range ((ECalendarView *) day_view, &start, &end);
#if 0
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 3d3d08143c..f2415aaf33 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -361,8 +361,10 @@ find_server (EItipControl *itip, ECalComponent *comp, gboolean show_selector)
}
static void
-cleanup_ecal (ECal *ecal)
+cleanup_ecal (void *data)
{
+ ECal *ecal = data;
+
/* Clean up any signals */
g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, cal_opened_cb, NULL);
g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, find_cal_opened_cb, NULL);
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 6eaf3da250..0e60a3813e 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -989,8 +989,9 @@ typedef struct {
/* Process the callbacks in the main thread. Avoids widget redrawing issues. */
static gboolean
-process_callbacks_main_thread (EMeetingStore *store)
+process_callbacks_main_thread (void *data)
{
+ EMeetingStore *store = data;
EMeetingStorePrivate *priv;
QueueCbData *aqueue_data;
gboolean threads_done = FALSE;
@@ -1230,9 +1231,9 @@ freebusy_async (gpointer data)
if (fbd->client) {
/* FIXME this a work around for getting all th free busy information for the users
we should be able to get free busy asynchronously */
- g_mutex_lock (&mutex);
+ g_static_mutex_lock (&mutex);
e_cal_get_free_busy (fbd->client, fbd->users, fbd->startt, fbd->endt, &(fbd->fb_data), NULL);
- g_mutex_unlock (&mutex);
+ g_static_mutex_unlock (&mutex);
g_list_foreach (fbd->users, (GFunc)g_free, NULL);
g_list_free (fbd->users);
@@ -1439,7 +1440,7 @@ refresh_queue_add (EMeetingStore *store, int row,
g_ptr_array_add (qdata->call_backs, call_back);
g_ptr_array_add (qdata->data, data);
- g_hash_table_insert (priv->refresh_data, itip_strip_mailto (e_meeting_attendee_get_address (attendee)), qdata);
+ g_hash_table_insert (priv->refresh_data, (void *)itip_strip_mailto (e_meeting_attendee_get_address (attendee)), qdata);
} else {
if (e_meeting_time_compare_times (start, &qdata->start) == -1)
qdata->start = *start;
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 1038999406..3a2682535e 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -895,13 +895,11 @@ e_meeting_time_selector_style_set (GtkWidget *widget,
EMeetingTimeSelector *mts;
EMeetingTime saved_time;
int hour, max_hour_width;
- int maxheight;
+ /*int maxheight; */
PangoFontDescription *font_desc;
PangoContext *pango_context;
PangoFontMetrics *font_metrics;
PangoLayout *layout;
- GtkTreePath *path;
- GdkRectangle cell_area;
if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)
(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)(widget, previous_style);
diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c
index 67d1c7dab5..bc4a754a8c 100644
--- a/calendar/gui/e-select-names-editable.c
+++ b/calendar/gui/e-select-names-editable.c
@@ -132,7 +132,6 @@ e_select_names_editable_get_emails (ESelectNamesEditable *esne)
GList *destinations;
EDestination *destination;
GList *result = NULL;
- gboolean contact_list = FALSE;
g_return_val_if_fail (E_SELECT_NAMES_EDITABLE (esne), NULL);
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index ec633b6cc4..98b86d929f 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -39,6 +39,7 @@
#include "e-util/e-time-utils.h"
#include "shell/e-user-creatable-items-handler.h"
#include <libedataserver/e-url.h>
+#include <libedataserver/e-categories.h>
#include <libecal/e-cal-time-util.h>
#include "widgets/menus/gal-view-menus.h"
#include "dialogs/delete-error.h"
@@ -640,7 +641,7 @@ config_categories_changed_cb (EConfigListener *config_listener, const char *key,
cat_list = g_list_remove (cat_list, cat_list->data);
}
- cal_search_bar_set_categories (priv->search_bar, cat_array);
+ cal_search_bar_set_categories ((CalSearchBar *)priv->search_bar, cat_array);
g_ptr_array_free (cat_array, TRUE);
}
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index d15e722e6a..7da1a891a2 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -678,8 +678,6 @@ e_week_view_realize (GtkWidget *widget)
{
EWeekView *week_view;
GdkColormap *colormap;
- gboolean success[E_WEEK_VIEW_COLOR_LAST];
- gint nfailed;
if (GTK_WIDGET_CLASS (e_week_view_parent_class)->realize)
(*GTK_WIDGET_CLASS (e_week_view_parent_class)->realize)(widget);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index b32d140da7..e72b96bf53 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1288,7 +1288,7 @@ config_categories_changed_cb (EConfigListener *config_listener, const char *key,
cat_list = g_list_remove (cat_list, cat_list->data);
}
- cal_search_bar_set_categories (priv->search_bar, cat_array);
+ cal_search_bar_set_categories ((CalSearchBar *)priv->search_bar, cat_array);
g_ptr_array_free (cat_array, TRUE);
}
@@ -1404,9 +1404,9 @@ setup_widgets (GnomeCalendar *gcal)
g_signal_connect (etable, "selection_change",
G_CALLBACK (table_selection_change_cb), gcal);
- g_signal_connect (e_calendar_table_get_model (priv->todo), "cal_view_progress",
+ g_signal_connect (e_calendar_table_get_model ((ECalendarTable *)priv->todo), "cal_view_progress",
G_CALLBACK (view_progress_cb), gcal);
- g_signal_connect (e_calendar_table_get_model (priv->todo), "cal_view_done",
+ g_signal_connect (e_calendar_table_get_model ((ECalendarTable *)priv->todo), "cal_view_done",
G_CALLBACK (view_done_cb), gcal);
/* Timeout check to hide completed items */
@@ -1445,7 +1445,7 @@ setup_widgets (GnomeCalendar *gcal)
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (week_view_adjustment_changed_cb),
gcal);
- w_model = e_calendar_view_get_model (priv->week_view);
+ w_model = e_calendar_view_get_model ((ECalendarView *)priv->week_view);
g_signal_connect (w_model, "cal_view_progress",
G_CALLBACK (view_progress_cb), gcal);
g_signal_connect (w_model, "cal_view_done",
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 2a3857e3ad..9f093ad329 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -744,7 +744,7 @@ static void
comp_sentby (ECalComponent *comp, ECal *client)
{
ECalComponentOrganizer organizer;
- GList * attendees, *l;
+ GSList * attendees, *l;
char *user = NULL;
e_cal_component_get_organizer (comp, &organizer);
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 778c55f6c3..4cd9994a32 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -745,7 +745,7 @@ selector_tree_drag_data_received (GtkWidget *widget,
icalcomp = icalparser_parse_string (data->data);
if (icalcomp) {
- char * uid;
+ const char * uid;
/* FIXME deal with GDK_ACTION_ASK */
if (context->action == GDK_ACTION_COPY) {