diff options
| -rw-r--r-- | calendar/ChangeLog | 13 | ||||
| -rw-r--r-- | calendar/gui/e-tasks.c | 14 |
2 files changed, 14 insertions, 13 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 631af9fbfd..472bab359b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2004-01-24 JP Rosevear <jpr@ximian.com> + + * gui/e-tasks.c (e_tasks_add_todo_source): don't unref and ref, + the hash table does this + (e_tasks_remove_todo_source): ditto + + Fixes #53281 + 2004-01-24 Rodrigo Moya <rodrigo@ximian.com> * gui/e-calendar-table.c (e_calendar_table_init): use the colors from @@ -8,11 +16,6 @@ 2004-01-24 JP Rosevear <jpr@ximian.com> - * gui/tasks-component.c (setup_create_ecal): listen for the - correct notification - -2004-01-24 JP Rosevear <jpr@ximian.com> - * gui/tasks-component.c (delete_task_list_cb): sync the source list after the source removal diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index 22460aaa6a..caba394248 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -863,13 +863,12 @@ e_tasks_add_todo_source (ETasks *tasks, ESource *source) str_uri, error ? error->message : ""); g_error_free (error); - g_hash_table_remove (priv->clients, str_uri); priv->clients_list = g_list_prepend (priv->clients_list, client); g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tasks); - g_free (str_uri); - g_object_unref (client); + /* Do this last because it unrefs the client */ + g_hash_table_remove (priv->clients, str_uri); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -895,7 +894,7 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source) ETasksPrivate *priv; ECal *client; ECalModel *model; - char *str_uri, *orig_uri; + char *str_uri; g_return_val_if_fail (tasks != NULL, FALSE); g_return_val_if_fail (E_IS_TASKS (tasks), FALSE); @@ -904,12 +903,12 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source) priv = tasks->priv; str_uri = e_source_get_uri (source); - if (!g_hash_table_lookup_extended (priv->clients, str_uri, &orig_uri, &client)) { + client = g_hash_table_lookup (priv->clients, str_uri); + if (!client) { g_free (str_uri); return TRUE; } - g_hash_table_remove (priv->clients, str_uri); priv->clients_list = g_list_remove (priv->clients_list, client); g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tasks); @@ -917,9 +916,8 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source) model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view)); e_cal_model_remove_client (model, client); + g_hash_table_remove (priv->clients, str_uri); g_free (str_uri); - g_free (orig_uri); - g_object_unref (client); return TRUE; } |