diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-03 12:43:40 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-03 12:43:40 +0800 |
commit | 086a96050b16f6dabd99a391b5a4faf0411963a1 (patch) | |
tree | 73a4c2efb11f255ff1685114a051d731a6a12e13 /calendar/modules/e-memo-shell-content.c | |
parent | 791c982c456fca453978358d2e919082419b7808 (diff) | |
download | gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.tar gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.tar.gz gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.tar.bz2 gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.tar.lz gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.tar.xz gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.tar.zst gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.zip |
Tasks progress. Merge EMemoPreview back into ECalComponentPreview.
svn path=/branches/kill-bonobo/; revision=36538
Diffstat (limited to 'calendar/modules/e-memo-shell-content.c')
-rw-r--r-- | calendar/modules/e-memo-shell-content.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/calendar/modules/e-memo-shell-content.c b/calendar/modules/e-memo-shell-content.c index d893e47b43..ba3650d141 100644 --- a/calendar/modules/e-memo-shell-content.c +++ b/calendar/modules/e-memo-shell-content.c @@ -131,18 +131,19 @@ memo_shell_content_cursor_change_cb (EMemoShellContent *memo_shell_content, gint row, ETable *table) { - EMemoPreview *memo_preview; + ECalComponentPreview *memo_preview; EMemoTable *memo_table; ECalModel *model; ECalModelComponent *comp_data; ECalComponent *comp; const gchar *uid; - memo_preview = E_MEMO_PREVIEW (memo_shell_content->priv->memo_preview); + memo_preview = E_CAL_COMPONENT_PREVIEW ( + memo_shell_content->priv->memo_preview); memo_table = E_MEMO_TABLE (memo_shell_content->priv->memo_table); if (e_table_selected_count (table) != 1) { - e_memo_preview_clear (memo_preview); + e_cal_component_preview_clear (memo_preview); return; } @@ -153,7 +154,8 @@ memo_shell_content_cursor_change_cb (EMemoShellContent *memo_shell_content, comp = e_cal_component_new (); e_cal_component_set_icalcomponent ( comp, icalcomponent_new_clone (comp_data->icalcomp)); - e_memo_preview_display (memo_preview, comp_data->client, comp); + e_cal_component_preview_display ( + memo_preview, comp_data->client, comp); e_cal_component_get_uid (comp, &uid); g_free (memo_shell_content->priv->current_uid); @@ -166,14 +168,15 @@ static void memo_shell_content_selection_change_cb (EMemoShellContent *memo_shell_content, ETable *table) { - EMemoPreview *memo_preview; + ECalComponentPreview *memo_preview; - memo_preview = E_MEMO_PREVIEW (memo_shell_content->priv->memo_preview); + memo_preview = E_CAL_COMPONENT_PREVIEW ( + memo_shell_content->priv->memo_preview); /* XXX Old code emits a "selection-changed" signal here. */ if (e_table_selected_count (table) != 1) - e_memo_preview_clear (memo_preview); + e_cal_component_preview_clear (memo_preview); } static void @@ -341,9 +344,9 @@ memo_shell_content_constructed (GObject *object) container = widget; - widget = e_memo_preview_new (); - e_memo_preview_set_default_timezone ( - E_MEMO_PREVIEW (widget), + widget = e_cal_component_preview_new (); + e_cal_component_preview_set_default_timezone ( + E_CAL_COMPONENT_PREVIEW (widget), calendar_config_get_icaltimezone ()); gtk_container_add (GTK_CONTAINER (container), widget); priv->memo_preview = g_object_ref (widget); @@ -485,13 +488,14 @@ e_memo_shell_content_new (EShellView *shell_view) "shell-view", shell_view, NULL); } -EMemoPreview * +ECalComponentPreview * e_memo_shell_content_get_memo_preview (EMemoShellContent *memo_shell_content) { g_return_val_if_fail ( E_IS_MEMO_SHELL_CONTENT (memo_shell_content), NULL); - return E_MEMO_PREVIEW (memo_shell_content->priv->memo_preview); + return E_CAL_COMPONENT_PREVIEW ( + memo_shell_content->priv->memo_preview); } EMemoTable * |