diff options
| -rw-r--r-- | addressbook/ChangeLog | 11 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names.c | 12 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names.h | 5 |
3 files changed, 11 insertions, 17 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 1b3b3f1d4f..0500c987ba 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,14 @@ +2002-08-01 Chris Toshok <toshok@ximian.com> + + * gui/component/select-names/e-select-names.h (struct + _ESelectNames): remove folders and folders_by_uri, and the 2 + listeners. + + * gui/component/select-names/e-select-names.c + (e_select_names_destroy): remove the hash_table_destroys of + folders and folders_by_uri, since they no longer exist. same for + other_contacts_listener and local_listener. + 2002-08-01 Ettore Perazzoli <ettore@ximian.com> * gui/component/addressbook-component.c (create_component): Use diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index f22c189dcc..a990a7b977 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -580,21 +580,9 @@ e_select_names_destroy (GtkObject *object) { ESelectNames *e_select_names = E_SELECT_NAMES(object); - if (e_select_names->local_listener) { - gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->local_listener), e_select_names); - gtk_object_unref(GTK_OBJECT(e_select_names->local_listener)); - } - - if (e_select_names->other_contacts_listener) { - gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->other_contacts_listener), e_select_names); - gtk_object_unref(GTK_OBJECT(e_select_names->other_contacts_listener)); - } - gtk_object_unref(GTK_OBJECT(e_select_names->gui)); g_hash_table_foreach(e_select_names->children, (GHFunc) e_select_names_child_free, e_select_names); g_hash_table_destroy(e_select_names->children); - g_hash_table_destroy(e_select_names->folders); - g_hash_table_destroy(e_select_names->folders_by_uri); g_free(e_select_names->def); } diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h index 443784ee9e..a351955ebe 100644 --- a/addressbook/gui/component/select-names/e-select-names.h +++ b/addressbook/gui/component/select-names/e-select-names.h @@ -33,7 +33,6 @@ #include "e-select-names-model.h" #include "e-util/e-list.h" -#include "shell/evolution-storage-listener.h" #ifdef __cplusplus extern "C" { @@ -75,10 +74,6 @@ struct _ESelectNames GtkWidget *search_entry; GtkWidget *select_entry; GtkWidget *status_message; - EvolutionStorageListener *local_listener; - EvolutionStorageListener *other_contacts_listener; - GHashTable *folders; - GHashTable *folders_by_uri; char *def; ESelectNamesFolder *current_folder; }; |