From 4763f25379dd0a254b2dba9d9a2ed328c90f1f99 Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Wed, 11 Jul 2001 04:31:43 +0000 Subject: [Fix bug #4388: ETableSpecification still in .c file] 2001-07-10 Jason Leach [Fix bug #4388: ETableSpecification still in .c file] * gui/dialogs/meeting-page.etspec: New file containing the spec that was previously in meeting-page.c as a string. * gui/dialogs/meeting-page.c: One line change to get it to use this spec file instead of a string. * gui/dialogs/Makefile.am: Necessary changes to get the new meeting-page.etspec installed. svn path=/trunk/; revision=10985 --- calendar/ChangeLog | 13 +++++++++ calendar/gui/dialogs/Makefile.am | 4 +++ calendar/gui/dialogs/meeting-page.c | 50 +++----------------------------- calendar/gui/dialogs/meeting-page.etspec | 19 ++++++++++++ 4 files changed, 40 insertions(+), 46 deletions(-) create mode 100644 calendar/gui/dialogs/meeting-page.etspec (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2b6bf179e0..456986e800 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,16 @@ +2001-07-10 Jason Leach + + [Fix bug #4388: ETableSpecification still in .c file] + + * gui/dialogs/meeting-page.etspec: New file containing the spec + that was previously in meeting-page.c as a string. + + * gui/dialogs/meeting-page.c: One line change to get it to use + this spec file instead of a string. + + * gui/dialogs/Makefile.am: Necessary changes to get the new + meeting-page.etspec installed. + 2001-07-10 Damon Chaplin * gui/calendar-model.c: diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 7d8e37497f..cee0600243 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -14,6 +14,7 @@ INCLUDES = \ $(EXTRA_GNOME_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ $(BONOBO_VFS_GNOME_CFLAGS) \ -DGNOMELOCALEDIR=\""$(localedir)"\" @@ -70,5 +71,8 @@ glade_DATA = \ task-details-page.glade \ task-page.glade +etspecdir = $(datadir)/evolution/etspec/ +etspec_DATA = meeting-page.etspec + EXTRA_DIST = \ $(glade_DATA) diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c index d208feb019..1504c48968 100644 --- a/calendar/gui/dialogs/meeting-page.c +++ b/calendar/gui/dialogs/meeting-page.c @@ -55,50 +55,6 @@ #define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames" -#define MEETING_PAGE_TABLE_SPEC \ - "" \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - "" - enum columns { MEETING_ATTENDEE_COL, MEETING_MEMBER_COL, @@ -1183,8 +1139,10 @@ build_etable (MeetingPage *mpage) "append_row", append_row, NULL); - priv->etable = e_table_scrolled_new (priv->model, extras, - MEETING_PAGE_TABLE_SPEC, NULL); + priv->etable = e_table_scrolled_new_from_spec_file (priv->model, + extras, + EVOLUTION_ETSPECDIR "/meeting-page.etspec", + NULL); filename = g_strdup_printf ("%s/config/et-header-meeting-page", evolution_dir); real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (priv->etable)); diff --git a/calendar/gui/dialogs/meeting-page.etspec b/calendar/gui/dialogs/meeting-page.etspec new file mode 100644 index 0000000000..7ab7d8995c --- /dev/null +++ b/calendar/gui/dialogs/meeting-page.etspec @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit