diff options
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/contact-editor/e-contact-editor-categories.c | 9 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-categories.c | 9 |
3 files changed, 16 insertions, 9 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c45077111a..76a1e59f14 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,8 +1,13 @@ 2000-05-16 Christopher James Lahey <clahey@helixcode.com> + * contact-editor/e-contact-editor-categories.c: Fixed a compile + error. + +2000-05-16 Christopher James Lahey <clahey@helixcode.com> + * contact-editor/e-contact-editor-categories.c: Got rid of a memory leak. Rearranged a couple functions. - + * gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h: Added some code to stop watching the EBook when the canvas is destroyed (apparently the canvas is destroyed before our widget is diff --git a/addressbook/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c index 5568b7bc71..05c86ac1b4 100644 --- a/addressbook/contact-editor/e-contact-editor-categories.c +++ b/addressbook/contact-editor/e-contact-editor-categories.c @@ -301,12 +301,13 @@ e_contact_editor_categories_init (EContactEditorCategories *categories) void e_contact_editor_categories_destroy (GtkObject *object) { - EContactEditorCategories *e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES(object); + EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(object); + int i; - if (e_contact_editor_categories->gui) - gtk_object_unref(GTK_OBJECT(e_contact_editor_categories->gui)); + if (categories->gui) + gtk_object_unref(GTK_OBJECT(categories->gui)); - g_free(e_contact_editor_categories->categories); + g_free(categories->categories); for (i = 0; i < categories->list_length; i++) g_free(categories->category_list[i]); g_free(categories->category_list); diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c index 5568b7bc71..05c86ac1b4 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-categories.c +++ b/addressbook/gui/contact-editor/e-contact-editor-categories.c @@ -301,12 +301,13 @@ e_contact_editor_categories_init (EContactEditorCategories *categories) void e_contact_editor_categories_destroy (GtkObject *object) { - EContactEditorCategories *e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES(object); + EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(object); + int i; - if (e_contact_editor_categories->gui) - gtk_object_unref(GTK_OBJECT(e_contact_editor_categories->gui)); + if (categories->gui) + gtk_object_unref(GTK_OBJECT(categories->gui)); - g_free(e_contact_editor_categories->categories); + g_free(categories->categories); for (i = 0; i < categories->list_length; i++) g_free(categories->category_list[i]); g_free(categories->category_list); |