From 364c94904e2fdbc9f526c0d9baddbd92b5361902 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Thu, 24 Aug 2006 13:53:21 +0000 Subject: Fix all compiler warnings and correct some other issues. 2006-08-23 Kjartan Maraas * gui/alarm-notify/alarm-notify-dialog.c: (dialog_response_cb): * gui/alarm-notify/alarm-notify.c: (list_changed_cb), (dequeue_client), (alarm_msgport_replied), (alarm_notify_add_calendar), (alarm_notify_remove_calendar): * gui/alarm-notify/alarm-queue.c: (queue_midnight_refresh), (add_client_alarms_cb), (midnight_refresh_async), (remove_queued_alarm), (add_component_alarms), (cal_opened_cb), (remove_alarms), (remove_comp), (query_objects_changed_async), (edit_component), (tray_list_remove_cqa_async), (tray_list_remove_data_async), (notify_dialog_cb), (open_alarm_dialog), (tray_icon_clicked_cb), (tray_list_add_async), (free_client_alarms_cb), (alarm_queue_add_async), (remove_cqa), (remove_client_alarms): * gui/dialogs/alarm-dialog.c: (alarm_to_dalarm_widgets), (populate_widgets_from_alarm), (action_selection_done_cb): * gui/dialogs/alarm-list-dialog.c: (alarm_list_dialog_peek): * gui/dialogs/cal-prefs-dialog.c: (show_alarms_config): * gui/dialogs/memo-editor.c: (memo_editor_finalize): * gui/dialogs/memo-page.c: (sensitize_widgets): * gui/dialogs/task-page.c: (edit_clicked_cb): Fix all compiler warnings and correct some other issues. svn path=/trunk/; revision=32655 --- calendar/ChangeLog | 24 +++++++++++ calendar/gui/alarm-notify/alarm-notify-dialog.c | 6 +-- calendar/gui/alarm-notify/alarm-notify.c | 13 +++--- calendar/gui/alarm-notify/alarm-queue.c | 56 ++++++++++++------------- calendar/gui/dialogs/alarm-dialog.c | 9 ++-- calendar/gui/dialogs/alarm-list-dialog.c | 6 +-- calendar/gui/dialogs/cal-prefs-dialog.c | 2 +- calendar/gui/dialogs/memo-editor.c | 1 - calendar/gui/dialogs/memo-page.c | 2 +- calendar/gui/dialogs/task-page.c | 2 +- 10 files changed, 70 insertions(+), 51 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index da60afbed1..b2e4a44953 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,27 @@ +2006-08-23 Kjartan Maraas + + * gui/alarm-notify/alarm-notify-dialog.c: (dialog_response_cb): + * gui/alarm-notify/alarm-notify.c: (list_changed_cb), + (dequeue_client), (alarm_msgport_replied), + (alarm_notify_add_calendar), (alarm_notify_remove_calendar): + * gui/alarm-notify/alarm-queue.c: (queue_midnight_refresh), + (add_client_alarms_cb), (midnight_refresh_async), + (remove_queued_alarm), (add_component_alarms), (cal_opened_cb), + (remove_alarms), (remove_comp), (query_objects_changed_async), + (edit_component), (tray_list_remove_cqa_async), + (tray_list_remove_data_async), (notify_dialog_cb), + (open_alarm_dialog), (tray_icon_clicked_cb), (tray_list_add_async), + (free_client_alarms_cb), (alarm_queue_add_async), (remove_cqa), + (remove_client_alarms): + * gui/dialogs/alarm-dialog.c: (alarm_to_dalarm_widgets), + (populate_widgets_from_alarm), (action_selection_done_cb): + * gui/dialogs/alarm-list-dialog.c: (alarm_list_dialog_peek): + * gui/dialogs/cal-prefs-dialog.c: (show_alarms_config): + * gui/dialogs/memo-editor.c: (memo_editor_finalize): + * gui/dialogs/memo-page.c: (sensitize_widgets): + * gui/dialogs/task-page.c: (edit_clicked_cb): + Fix all compiler warnings and correct some other issues. + 2006-08-23 Chenthill Palanisamy Fixes #341691 diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 5f3caec00f..0c2ec42d7f 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -147,9 +147,9 @@ dialog_response_cb (GtkDialog *dialog, guint response_id, gpointer user_data) } if (!funcinfo) { - GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (an->treeview)); - gboolean valid = gtk_tree_model_get_iter_first (model, &iter); - gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1); + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (an->treeview)); + gtk_tree_model_get_iter_first (model, &iter); + gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1); } g_return_if_fail (funcinfo); switch (response_id) { diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index a773ab7644..7e69114003 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include "alarm-notify.h" @@ -170,7 +171,7 @@ list_changed_cb (ESourceList *source_list, gpointer data) g_hash_table_foreach (priv->uri_client_hash[source_type], (GHFunc) process_removal_in_hash, &prd); for (l = prd.removals; l; l = l->next) { - d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, l->data)); + d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, (char *)l->data)); alarm_notify_remove_calendar (an, source_type, l->data); } g_list_free (prd.removals); @@ -253,7 +254,7 @@ dequeue_client (gpointer key, gpointer value, gpointer user_data) { ECal *client = value; - d (printf("%s:%d (dequeue_client) - Removing client %d\n ", __FILE__, __LINE__, client)); + d (printf("%s:%d (dequeue_client) - Removing client %p\n ", __FILE__, __LINE__, client)); alarm_queue_remove_client (client); } @@ -328,9 +329,9 @@ static gboolean alarm_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) { EMsgPort *port = (EMsgPort *)d; - AlarmMsg *m; + EMsg *m; - while (( m = (AlarmMsg *)e_msgport_get(port))) { + while (( m = e_msgport_get(port))) { d (printf("%s:%d (alarm_msgport_replied) - %p: Replied to GUI thread\n", __FILE__, __LINE__, m)); alarm_msg_destroy(NULL, m, NULL); } @@ -450,7 +451,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource client = auth_new_cal_from_source (source, source_type); if (client) { - d (printf("%s:%d (alarm_notify_add_calendar) - Calendar Open Async... %d\n", __FILE__, __LINE__, client)); + d (printf("%s:%d (alarm_notify_add_calendar) - Calendar Open Async... %p\n", __FILE__, __LINE__, client)); g_hash_table_insert (priv->uri_client_hash[source_type], g_strdup (str_uri), client); g_signal_connect (G_OBJECT (client), "cal_opened", G_CALLBACK (cal_opened_cb), an); e_cal_open_async (client, FALSE); @@ -470,7 +471,7 @@ alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const client = g_hash_table_lookup (priv->uri_client_hash[source_type], str_uri); if (client) { - d (printf("%s:%d (alarm_notify_remove_calendar) - Removing Client %d\n", __FILE__, __LINE__, client)); + d (printf("%s:%d (alarm_notify_remove_calendar) - Removing Client %p\n", __FILE__, __LINE__, client)); alarm_queue_remove_client (client); g_hash_table_remove (priv->uri_client_hash[source_type], str_uri); } diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index e3c7b514e0..41e2b9fea1 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -219,7 +219,7 @@ queue_midnight_refresh (void) midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL); if (!midnight_refresh_id) { - d(printf("%s:%d (queue_midnight_refresh)) - Could not setup the midnight refresh alarm\n",__FILE__, __LINE__)); + d(printf("%s:%d (queue_midnight_refresh) - Could not setup the midnight refresh alarm\n",__FILE__, __LINE__)); /* FIXME: what to do? */ } } @@ -228,9 +228,9 @@ queue_midnight_refresh (void) static void add_client_alarms_cb (gpointer key, gpointer value, gpointer data) { - ClientAlarms *ca; + ClientAlarms *ca = (ClientAlarms *)data; - d(printf("%s:%d (add_client_alarms_cb) - Adding %d\n",__FILE__, __LINE__, ca)); + d(printf("%s:%d (add_client_alarms_cb) - Adding %p\n",__FILE__, __LINE__, ca)); ca = value; load_alarms_for_today (ca); @@ -253,7 +253,7 @@ midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) /* Re-schedule the midnight update */ if (list->remove && midnight_refresh_id != NULL) { - d(printf("%s:%d (midnight_refresh_async)) - Reschedule the midnight update \n",__FILE__, __LINE__)); + d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); alarm_remove (midnight_refresh_id); midnight_refresh_id = NULL; } @@ -345,7 +345,7 @@ remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id, if (cqa->queued_alarms != NULL) return FALSE; - d(printf("%s:%d (remove_queued_alarm)) - Last Component. Removing CQA- Free=%d\n",__FILE__, __LINE__, free_object)); + d(printf("%s:%d (remove_queued_alarm) - Last Component. Removing CQA- Free=%d\n",__FILE__, __LINE__, free_object)); if (free_object) { cqa->id = NULL; cqa->parent_client = NULL; @@ -444,7 +444,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms) cqa->expecting_update = FALSE; cqa->queued_alarms = NULL; - d(printf("%s:%d (add_component_alarms)) - Creating CQA %d\n",__FILE__, __LINE__, cqa)); + d(printf("%s:%d (add_component_alarms) - Creating CQA %p\n",__FILE__, __LINE__, cqa)); for (l = alarms->alarms; l; l = l->next) { ECalComponentAlarmInstance *instance; @@ -456,7 +456,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms) alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL); if (!alarm_id) { - d(printf("%s:%d (add_component_alarms)) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, ctime(&(instance->trigger)))); + d(printf("%s:%d (add_component_alarms) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, ctime(&(instance->trigger)))); continue; } @@ -467,7 +467,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms) qa->snooze = FALSE; cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa); - d(printf("%s:%d (add_component_alarms)) - Adding alarm %d(%d)at %s (%s)\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), ctime(&tnow))); + d(printf("%s:%d (add_component_alarms) - Adding alarm %p %p at %s %s\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), ctime(&tnow))); } id = e_cal_component_get_id (alarms->comp); @@ -476,7 +476,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms) if (cqa->queued_alarms == NULL) { e_cal_component_alarms_free (cqa->alarms); cqa->alarms = NULL; - d(printf("%s:%d (add_component_alarms)) - Failed to add all : %d\n",__FILE__, __LINE__, cqa)); + d(printf("%s:%d (add_component_alarms) - Failed to add all : %p\n",__FILE__, __LINE__, cqa)); g_message ("Failed to add all\n"); g_free (cqa); return; @@ -484,7 +484,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms) cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms); cqa->id = id; - d(printf("%s:%d (add_component_alarms)) - Alarm added for %s\n",__FILE__, __LINE__, id->uid)); + d(printf("%s:%d (add_component_alarms) - Alarm added for %s\n",__FILE__, __LINE__, id->uid)); g_hash_table_insert (ca->uid_alarms_hash, cqa->id, cqa); } @@ -569,7 +569,7 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data) ca = data; - d(printf("%s:%d (cal_opened_cb)) - Opened Calendar %d (Status %d)\n",__FILE__, __LINE__, client, status==E_CALENDAR_STATUS_OK)); + d(printf("%s:%d (cal_opened_cb) - Opened Calendar %p (Status %d)\n",__FILE__, __LINE__, client, status==E_CALENDAR_STATUS_OK)); if (status != E_CALENDAR_STATUS_OK) return; @@ -588,7 +588,7 @@ remove_alarms (CompQueuedAlarms *cqa, gboolean free_object) { GSList *l; - d(printf("%s:%d (remove_alarms) - Removing for %d\n",__FILE__, __LINE__, cqa)); + d(printf("%s:%d (remove_alarms) - Removing for %p\n",__FILE__, __LINE__, cqa)); for (l = cqa->queued_alarms; l;) { QueuedAlarm *qa; @@ -628,7 +628,7 @@ remove_comp (ClientAlarms *ca, ECalComponentId *id) */ g_assert (cqa->queued_alarms != NULL); - d(printf("%s:%d (remove_comp) - Removing CQA %d\n",__FILE__, __LINE__, cqa)); + d(printf("%s:%d (remove_comp) - Removing CQA %p\n",__FILE__, __LINE__, cqa)); remove_alarms (cqa, TRUE); } @@ -709,7 +709,7 @@ query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) found = e_cal_get_alarms_for_object (ca->client, id, from, day_end, &alarms); if (!found) { - d(printf("%s:%d (query_objects_changed_async) - No Alarm found for client %d\n",__FILE__, __LINE__, ca->client)); + d(printf("%s:%d (query_objects_changed_async) - No Alarm found for client %p\n",__FILE__, __LINE__, ca->client)); tray_list_remove_cqa (lookup_comp_queued_alarms (ca, id)); remove_comp (ca, id); g_hash_table_remove (ca->uid_alarms_hash, id); @@ -765,7 +765,7 @@ query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) qa->snooze = FALSE; qa->orig_trigger = instance->trigger; cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa); - d(printf("%s:%d (query_objects_changed_async) - Adding %d to queue \n",__FILE__, __LINE__, qa)); + d(printf("%s:%d (query_objects_changed_async) - Adding %p to queue \n",__FILE__, __LINE__, qa)); } cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms); @@ -888,7 +888,7 @@ edit_component (ECal *client, ECalComponent *comp) GNOME_Evolution_Calendar_CompEditorFactory factory; GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type; - d(printf("%s:%d (edit_component) - Client %d\n",__FILE__, __LINE__, client)); + d(printf("%s:%d (edit_component) - Client %p\n",__FILE__, __LINE__, client)); e_cal_component_get_uid (comp, &uid); @@ -1053,12 +1053,11 @@ tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) CompQueuedAlarms *cqa = tmsg->cqa; GList *list = tray_icons_list; - d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %d from tray list\n",__FILE__, __LINE__, cqa)); + d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); while (list) { TrayIconData *tray_data = list->data; GList *tmp = list; - GtkTreeIter iter; GtkTreeModel *model; list = list->next; @@ -1083,7 +1082,7 @@ tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) } else { GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (alarm_notifications_dialog->treeview)); - gboolean valid = gtk_tree_model_get_iter_first (model, &iter); + gtk_tree_model_get_iter_first (model, &iter); GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (alarm_notifications_dialog->treeview)); gtk_tree_selection_select_iter (sel, &iter); } @@ -1166,7 +1165,7 @@ tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) struct _tray_msg *tmsg = msg->data; TrayIconData *tray_data = tmsg->data; - d(printf("%s:%d (tray_list_remove_data_async) - Removing %d from tray list\n",__FILE__, __LINE__, tray_data)); + d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); free_tray_icon_data (tray_data); @@ -1239,7 +1238,6 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data) case ALARM_NOTIFY_CLOSE: d(printf("%s:%d (notify_dialog_cb) - Dialog close\n",__FILE__, __LINE__)); if (alarm_notifications_dialog) { - GList *list; GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model ( @@ -1282,7 +1280,7 @@ open_alarm_dialog (TrayIconData *tray_data) g_source_remove (tray_blink_id); tray_blink_id = -1; - gtk_widget_destroy (tray_icon); + gtk_widget_destroy (GTK_WIDGET (tray_icon)); tray_icon = NULL; #ifndef USE_GTK_STATUS_ICON tray_image = NULL; @@ -1320,8 +1318,6 @@ open_alarm_dialog (TrayIconData *tray_data) static gint tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { - TrayIconData *tray_data = user_data; - if (event->type == GDK_BUTTON_PRESS) { d(printf("%s:%d (tray_icon_clicked_cb) - left click and %d alarms\n",__FILE__, __LINE__, g_list_length (tray_icons_list))); if (event->button == 1 && g_list_length (tray_icons_list) > 0) { @@ -1337,7 +1333,7 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da g_source_remove (tray_blink_id); tray_blink_id = -1; - gtk_widget_destroy (tray_icon); + gtk_widget_destroy (GTK_WIDGET (tray_icon)); tray_icon = NULL; #ifndef USE_GTK_STATUS_ICON tray_image = NULL; @@ -1394,7 +1390,7 @@ static void tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) { struct _tray_msg *list = msg->data; - d(printf("%s:%d (tray_list_add_async) - Add %d\n",__FILE__, __LINE__, list->data)); + d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); tray_icons_list = g_list_prepend (tray_icons_list, list->data); } @@ -1892,7 +1888,7 @@ free_client_alarms_cb (gpointer key, gpointer value, gpointer user_data) { ClientAlarms *ca = value; - d(printf("%s:%d (free_client_alarms_cb) - %d \n",__FILE__, __LINE__, ca)); + d(printf("%s:%d (free_client_alarms_cb) - %p\n",__FILE__, __LINE__, ca)); if (ca) { remove_client_alarms (ca); @@ -1998,7 +1994,7 @@ static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) return; } - d(printf("%s:%d (alarm_queue_add_async) - %d\n",__FILE__, __LINE__, client)); + d(printf("%s:%d (alarm_queue_add_async) - %p\n",__FILE__, __LINE__, client)); ca = g_new (ClientAlarms, 1); @@ -2061,7 +2057,7 @@ remove_cqa (ClientAlarms *ca, ECalComponentId *id, CompQueuedAlarms *cqa) */ g_assert (cqa->queued_alarms != NULL); - d(printf("%s:%d (remove_cqa) - removing %d alarms\n",__FILE__, __LINE__, g_list_length(cqa->queued_alarms))); + d(printf("%s:%d (remove_cqa) - removing %d alarms\n",__FILE__, __LINE__, g_slist_length(cqa->queued_alarms))); remove_alarms (cqa, TRUE); } @@ -2087,7 +2083,7 @@ remove_client_alarms (ClientAlarms *ca) { d(printf("%s:%d (remove_client_alarms) - size %d \n",__FILE__, __LINE__, g_hash_table_size (ca->uid_alarms_hash))); - g_hash_table_foreach_remove (ca->uid_alarms_hash, (GHFunc)remove_comp_by_id, ca); + g_hash_table_foreach_remove (ca->uid_alarms_hash, (GHRFunc)remove_comp_by_id, ca); /* The hash table should be empty now */ g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0); diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index ad53c71668..90f3e72e2b 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -29,6 +29,7 @@ #endif #include +#include #include #include #include @@ -40,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -365,7 +366,7 @@ alarm_to_dalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm ) if (description.value) { e_dialog_toggle_set (dialog->dalarm_message, TRUE); - text_buffer = gtk_text_view_get_buffer (dialog->dalarm_description); + text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description)); gtk_text_buffer_set_text (text_buffer, description.value, -1); } } @@ -654,7 +655,7 @@ populate_widgets_from_alarm (Dialog *dialog) /* Alarm options */ e_dialog_option_menu_set (dialog->action, *action, action_map); - action_selection_done_cb (dialog->action, dialog); + action_selection_done_cb (GTK_MENU_SHELL (dialog->action), dialog); switch (*action) { case E_CAL_COMPONENT_ALARM_AUDIO: @@ -1078,7 +1079,7 @@ action_selection_done_cb (GtkMenuShell *menu_shell, gpointer data) case E_CAL_COMPONENT_ALARM_AUDIO: dir = calendar_config_get_dir_path (); if ( dir && *dir ) - gnome_file_entry_set_default_path (dialog->aalarm_file_entry, dir); + gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (dialog->aalarm_file_entry), dir); check_custom_sound (dialog); break; diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index ccdca7573e..15831d8ed9 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -308,8 +308,6 @@ GtkWidget * alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store) { Dialog *dialog; - int response_id; - GList *icon_list; char *gladefile; dialog = (Dialog *)g_new (Dialog, 1); @@ -339,8 +337,8 @@ alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store) g_object_unref (dialog->xml); /* Free the other stuff when the parent really gets destroyed. */ - g_object_set_data_full (dialog->box, "toplevel", dialog->toplevel, gtk_widget_destroy); - g_object_set_data_full (dialog->box, "dialog", dialog, g_free); + g_object_set_data_full (G_OBJECT (dialog->box), "toplevel", dialog->toplevel, (GDestroyNotify) gtk_widget_destroy); + g_object_set_data_full (G_OBJECT (dialog->box), "dialog", dialog, g_free); return dialog->box; } diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 6e1aa165d3..bd22a5f21e 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -486,7 +486,7 @@ show_alarms_config (CalendarPrefsDialog *prefs) atk_object_set_name (gtk_widget_get_accessible (prefs->alarm_list_widget), _("Selected Calendars for Alarms")); gtk_container_add (GTK_CONTAINER (prefs->scrolled_window), prefs->alarm_list_widget); gtk_widget_show (prefs->alarm_list_widget); - initialize_selection (prefs->alarm_list_widget, prefs->alarms_list); + initialize_selection (E_SOURCE_SELECTOR (prefs->alarm_list_widget), prefs->alarms_list); } /* Shows the current config settings in the dialog. */ diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c index 56ad644801..b6f70fbc5b 100644 --- a/calendar/gui/dialogs/memo-editor.c +++ b/calendar/gui/dialogs/memo-editor.c @@ -266,7 +266,6 @@ memo_editor_finalize (GObject *object) { MemoEditor *me; MemoEditorPrivate *priv; - ECalComponent *comp; g_return_if_fail (object != NULL); g_return_if_fail (IS_MEMO_EDITOR (object)); diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 1bd47883d5..38df8901d0 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -283,7 +283,7 @@ memo_page_set_classification (MemoPage *page, ECalComponentClassification class) static void sensitize_widgets (MemoPage *mpage) { - gboolean read_only, sens, sensitize; + gboolean read_only, sens = FALSE, sensitize; MemoPagePrivate *priv; priv = mpage->priv; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 581714dc00..130a113cd7 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -979,7 +979,7 @@ add_clicked_cb (GtkButton *btn, TaskPage *page) e_meeting_list_view_edit (page->priv->list_view, attendee); } -void edit_clicked_cb (GtkButton *btn, TaskPage *tpage) +static void edit_clicked_cb (GtkButton *btn, TaskPage *tpage) { TaskPagePrivate *priv; GtkTreePath *path = NULL; -- cgit v1.2.3