From 0597b877c5bf4d21ac4048742ddf6b11e24877ba Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 18 Jul 2008 16:23:26 +0000
Subject: ** Fixes bug #542125

2008-07-18  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #542125

	** This set of changes migrates CompEditor, CompEditorPage and the
	   various subclasses from using BonoboUI to GtkUIManager for menus
	   and toolbars.  It also substantially cleans up the code and
	   streamlines the CompEditorPage API, making more effective use
	   of GObject properties.

	Core changes:
	* gui/dialogs/comp-editor-page.c:
	* gui/dialogs/comp-editor-page.h:
	* gui/dialogs/comp-editor.c:
	* gui/dialogs/comp-editor.h:
	* gui/dialogs/event-editor.c:
	* gui/dialogs/event-editor.h:
	* gui/dialogs/event-page.c:
	* gui/dialogs/event-page.h:
	* gui/dialogs/memo-editor.c:
	* gui/dialogs/memo-editor.h:
	* gui/dialogs/memo-page.c:
	* gui/dialogs/memo-page.h:
	* gui/dialogs/recurrence-page.c:
	* gui/dialogs/recurrence-page.h:
	* gui/dialogs/schedule-page.c:
	* gui/dialogs/schedule-page.h:
	* gui/dialogs/task-details-page.c:
	* gui/dialogs/task-details-page.h:
	* gui/dialogs/task-editor.c:
	* gui/dialogs/task-editor.h:
	* gui/dialogs/task-page.c:
	* gui/dialogs/task-page.h:

	Supporting changes:
	* gui/calendar-component.c:
	* gui/comp-editor-factory.c:
	* gui/e-cal-popup.c:
	* gui/e-calendar-table.c:
	* gui/e-calendar-view.c:
	* gui/e-comp-editor-registry.c:
	* gui/e-memo-table.c:
	* gui/e-tasks.c:
	* gui/gnome-cal.c:
	* gui/memos-component.c:
	* gui/tasks-component.c:
	* gui/dialogs/alarm-dialog.c:
	* gui/dialogs/comp-editor-util.c:

	* art/Makefile.am:
	Move query-free-busy.png to data/icons.


svn path=/trunk/; revision=35753
---
 calendar/gui/e-memo-table.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'calendar/gui/e-memo-table.c')

diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 64df40e40c..9ce7993101 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -763,7 +763,7 @@ open_memo (EMemoTable *memo_table, ECalModelComponent *comp_data)
 		if (itip_organizer_is_user (comp, comp_data->client))
 			flags |= COMP_EDITOR_USER_ORG;
 
-		medit = COMP_EDITOR (memo_editor_new (comp_data->client, flags));
+		medit = memo_editor_new (comp_data->client, flags);
 
 		comp_editor_edit_comp (medit, comp);
 		g_object_unref (comp);
@@ -771,7 +771,7 @@ open_memo (EMemoTable *memo_table, ECalModelComponent *comp_data)
 		e_comp_editor_registry_add (comp_editor_registry, medit, FALSE);
 	}
 
-	comp_editor_focus (medit);
+	gtk_window_present (GTK_WINDOW (medit));
 }
 
 /* Opens the task in the specified row */
-- 
cgit