diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-11 02:11:48 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-11 02:11:48 +0800 |
| commit | 31fd01398cc76d3c00abbc05d419dfe873bc04c6 (patch) | |
| tree | 35c238cdb2a8a68936fa659e5269e75ee0042b49 /calendar/gui/dialogs/cal-prefs-dialog.h | |
| parent | f9049cded460a9e316fa83ff1941970abfe0fd09 (diff) | |
| parent | 10fef4ac0f4ef7dc907e8bfae9844d4e8be3d80d (diff) | |
| download | gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.gz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.bz2 gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.lz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.xz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.zst gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/util/addressbook.h
calendar/gui/e-week-view-main-item.c
configure.ac
e-util/Makefile.am
mail/em-account-editor.c
mail/em-folder-selection-button.c
shell/e-shell.c
Diffstat (limited to 'calendar/gui/dialogs/cal-prefs-dialog.h')
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h index 397cb35cfa..0889a395bf 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.h +++ b/calendar/gui/dialogs/cal-prefs-dialog.h @@ -93,6 +93,7 @@ struct _CalendarPrefsDialog { GtkWidget *tasks_hide_completed_units; /* Alarms tab */ + GtkWidget *notify_with_tray; GtkWidget *scrolled_window; ESourceList *alarms_list; GtkWidget *alarm_list_widget; |