diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:37:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:40:49 +0800 |
| commit | cfb9c32b6657165e4d5e11aa7b47804f679a61f8 (patch) | |
| tree | 1f9c8954df7a357b5dc20a13ac82bf31c1112083 /calendar/gui/dialogs/memo-page.c | |
| parent | fefeb30f58447f2fa7bcbee16dbe68a9333ce89d (diff) | |
| parent | 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 (diff) | |
| download | gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.gz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.bz2 gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.lz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.xz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.zst gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.zip | |
Merge commit 'origin/kill-bonobo'
Diffstat (limited to 'calendar/gui/dialogs/memo-page.c')
| -rw-r--r-- | calendar/gui/dialogs/memo-page.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 8026a467ee..595a0e409e 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -948,9 +948,14 @@ to_button_clicked_cb (GtkButton *button, static gboolean init_widgets (MemoPage *mpage) { + CompEditor *editor; MemoPagePrivate *priv = mpage->priv; GtkTextBuffer *buffer; GtkTextView *view; + GtkAction *action; + gboolean active; + + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (mpage)); /* Generic informative messages */ gtk_widget_hide (priv->info_hbox); @@ -1015,8 +1020,9 @@ init_widgets (MemoPage *mpage) G_CALLBACK (comp_editor_page_changed), mpage); } - memo_page_set_show_categories ( - mpage, calendar_config_get_show_categories()); + action = comp_editor_get_action (editor, "view-categories"); + active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + memo_page_set_show_categories (mpage, active); return TRUE; } @@ -1215,9 +1221,14 @@ GtkWidget *memo_page_create_date_edit (void); GtkWidget * memo_page_create_date_edit (void) { + EShell *shell; + EShellSettings *shell_settings; GtkWidget *widget; - widget = comp_editor_new_date_edit (TRUE, FALSE, TRUE); + shell = e_shell_get_default (); + shell_settings = e_shell_get_shell_settings (shell); + + widget = comp_editor_new_date_edit (shell_settings, TRUE, FALSE, TRUE); e_date_edit_set_allow_no_date_set (E_DATE_EDIT (widget), TRUE); gtk_widget_show (widget); |