From 4bec962f7b5cd2a65bed33de3e8f56f3b2b4bad7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Dec 2008 16:41:24 +0000 Subject: ** Fixes part of bug #348299 2008-12-02 Matthew Barnes ** Fixes part of bug #348299 * addressbook/gui/contact-editor/e-contact-editor.c (e_contact_editor_init): * calendar/gui/dialogs/event-page.c (get_widgets): * calendar/gui/dialogs/memo-page.c (get_widgets): * calendar/gui/dialogs/task-page.c (get_widgets): Use category completion in the Categories field. * calendar/gui/dialogs/event-editor.c: * calendar/gui/dialogs/memo-editor.c: * calendar/gui/dialogs/task-editor.c: Fix some reference count leaks. svn path=/trunk/; revision=36826 --- calendar/gui/dialogs/event-editor.c | 3 --- calendar/gui/dialogs/event-page.c | 6 ++++++ calendar/gui/dialogs/memo-editor.c | 1 - calendar/gui/dialogs/memo-page.c | 6 ++++++ calendar/gui/dialogs/task-editor.c | 2 -- calendar/gui/dialogs/task-page.c | 6 ++++++ 6 files changed, 18 insertions(+), 6 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 5f7f14ca11..815ee76312 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -124,7 +124,6 @@ create_schedule_page (CompEditor *editor) priv->sched_page = schedule_page_new (priv->model, editor); page = COMP_EDITOR_PAGE (priv->sched_page); - g_object_ref_sink (priv->sched_page); gtk_container_add ( GTK_CONTAINER (GTK_DIALOG (priv->sched_window)->vbox), comp_editor_page_get_widget (page)); @@ -290,7 +289,6 @@ event_editor_constructor (GType type, gtk_action_group_set_visible (action_group, is_meeting); priv->event_page = event_page_new (priv->model, editor); - g_object_ref_sink (priv->event_page); comp_editor_append_page ( editor, COMP_EDITOR_PAGE (priv->event_page), _("Appoint_ment"), TRUE); @@ -307,7 +305,6 @@ event_editor_constructor (GType type, priv->recur_page = recurrence_page_new (editor); page = COMP_EDITOR_PAGE (priv->recur_page); - g_object_ref_sink (priv->recur_page); gtk_container_add ( GTK_CONTAINER ((GTK_DIALOG (priv->recur_window)->vbox)), comp_editor_page_get_widget (page)); diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 4a36f8ced3..ca42dd92fb 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include "common/authentication.h" #include "e-util/e-categories-config.h" @@ -2157,6 +2158,7 @@ static gboolean get_widgets (EventPage *epage) { CompEditorPage *page = COMP_EDITOR_PAGE (epage); + GtkEntryCompletion *completion; EventPagePrivate *priv; GSList *accel_groups; GtkWidget *toplevel; @@ -2250,6 +2252,10 @@ get_widgets (EventPage *epage) #undef GW + completion = e_category_completion_new (); + gtk_entry_set_completion (GTK_ENTRY (priv->categories), completion); + g_object_unref (completion); + return (priv->summary && priv->location && priv->start_time diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c index 410aad156e..89016f8c91 100644 --- a/calendar/gui/dialogs/memo-editor.c +++ b/calendar/gui/dialogs/memo-editor.c @@ -134,7 +134,6 @@ memo_editor_init (MemoEditor *me) } me->priv->memo_page = memo_page_new (editor); - g_object_ref_sink (me->priv->memo_page); comp_editor_append_page ( COMP_EDITOR (me), COMP_EDITOR_PAGE (me->priv->memo_page), diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 421fdcf56b..362a8b0e9a 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -746,6 +747,7 @@ static gboolean get_widgets (MemoPage *mpage) { CompEditorPage *page = COMP_EDITOR_PAGE (mpage); + GtkEntryCompletion *completion; MemoPagePrivate *priv; GSList *accel_groups; GtkWidget *toplevel; @@ -795,6 +797,10 @@ get_widgets (MemoPage *mpage) #undef GW + completion = e_category_completion_new (); + gtk_entry_set_completion (GTK_ENTRY (priv->categories), completion); + g_object_unref (completion); + return (priv->memo_content && priv->categories_btn && priv->categories diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 59b9303428..ca6959640b 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -312,7 +312,6 @@ task_editor_init (TaskEditor *te) te->priv->updating = FALSE; te->priv->task_page = task_page_new (te->priv->model, editor); - g_object_ref_sink (te->priv->task_page); comp_editor_append_page ( editor, COMP_EDITOR_PAGE (te->priv->task_page), _("_Task"), TRUE); @@ -328,7 +327,6 @@ task_editor_init (TaskEditor *te) G_CALLBACK(gtk_widget_hide), NULL); te->priv->task_details_page = task_details_page_new (editor); - g_object_ref_sink (te->priv->task_details_page); gtk_container_add ( GTK_CONTAINER (GTK_DIALOG (te->priv->task_details_window)->vbox), comp_editor_page_get_widget ((CompEditorPage *) te->priv->task_details_page)); diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 99dc9bac38..7f2969abd2 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -1377,6 +1378,7 @@ static gboolean get_widgets (TaskPage *tpage) { CompEditorPage *page = COMP_EDITOR_PAGE (tpage); + GtkEntryCompletion *completion; TaskPagePrivate *priv; GSList *accel_groups; GtkWidget *toplevel; @@ -1449,6 +1451,10 @@ get_widgets (TaskPage *tpage) #undef GW + completion = e_category_completion_new (); + gtk_entry_set_completion (GTK_ENTRY (priv->categories), completion); + g_object_unref (completion); + return (priv->summary && priv->summary_label && priv->due_date -- cgit v1.2.3