diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-07-15 06:31:58 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2004-07-15 06:31:58 +0800 |
| commit | a8b3b7f76c96c41e9aa04a09ee5a893462e20d05 (patch) | |
| tree | 2edb02c2537e1262a2015cfaf198bc4513e13803 /addressbook | |
| parent | 4b12fe81180748da7449cbd790fea572f21c50f7 (diff) | |
| download | gsoc2013-evolution-a8b3b7f76c96c41e9aa04a09ee5a893462e20d05.tar gsoc2013-evolution-a8b3b7f76c96c41e9aa04a09ee5a893462e20d05.tar.gz gsoc2013-evolution-a8b3b7f76c96c41e9aa04a09ee5a893462e20d05.tar.bz2 gsoc2013-evolution-a8b3b7f76c96c41e9aa04a09ee5a893462e20d05.tar.lz gsoc2013-evolution-a8b3b7f76c96c41e9aa04a09ee5a893462e20d05.tar.xz gsoc2013-evolution-a8b3b7f76c96c41e9aa04a09ee5a893462e20d05.tar.zst gsoc2013-evolution-a8b3b7f76c96c41e9aa04a09ee5a893462e20d05.zip | |
ignore Evolution-Addressbook-SelectNames.h.
2004-07-14 Chris Toshok <toshok@ximian.com>
* gui/contact-list-editor/.cvsignore: ignore
Evolution-Addressbook-SelectNames.h.
* gui/contact-list-editor/e-contact-list-editor.c: include our
local (in this directory) generated
Evolution-Addressbook-SelectNames.h
* gui/contact-list-editor/Makefile.am: add stuff to generate (and
clean up) the select names header we need to include.
svn path=/trunk/; revision=26657
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/.cvsignore | 1 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 12 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/e-contact-list-editor.c | 2 |
4 files changed, 25 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 4fff5379ae..c96f99dff3 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2004-07-14 Chris Toshok <toshok@ximian.com> + + * gui/contact-list-editor/.cvsignore: ignore + Evolution-Addressbook-SelectNames.h. + + * gui/contact-list-editor/e-contact-list-editor.c: include our + local (in this directory) generated + Evolution-Addressbook-SelectNames.h + + * gui/contact-list-editor/Makefile.am: add stuff to generate (and + clean up) the select names header we need to include. + 2004-07-13 Rodney Dawes <dobey@novell.com> [ fixes #56657 ] diff --git a/addressbook/gui/contact-list-editor/.cvsignore b/addressbook/gui/contact-list-editor/.cvsignore index f151930645..1fe141cc30 100644 --- a/addressbook/gui/contact-list-editor/.cvsignore +++ b/addressbook/gui/contact-list-editor/.cvsignore @@ -1,3 +1,4 @@ +Evolution-Addressbook-SelectNames.h Makefile.in Makefile .deps diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 43abc3ff47..5df78b3eac 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -1,3 +1,13 @@ +IDL = Evolution-Addressbook-SelectNames.idl + +IDL_GENERATED_H = \ + Evolution-Addressbook-SelectNames.h + +selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names + +$(IDL_GENERATED_H): $(selectnamesdir)/$(IDL) + $(ORBIT_IDL) --nostubs --noskels --nocommon $(IDL_INCLUDES) $(selectnamesdir)/$(IDL) + INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/ \ @@ -31,7 +41,7 @@ MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marsha glade_DATA = contact-list-editor.glade etspec_DATA = e-contact-list-editor.etspec -BUILT_SOURCES = $(MARSHAL_GENERATED) +BUILT_SOURCES = $(MARSHAL_GENERATED) $(IDL_GENERATED_H) CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = $(glade_DATA) \ diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 0bd1f2cc44..dd2dd19045 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -43,10 +43,10 @@ #include "widgets/misc/e-image-chooser.h" #include "widgets/misc/e-source-option-menu.h" -#include "addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.h" #include "addressbook/gui/component/addressbook.h" #include "addressbook/gui/widgets/eab-gui-util.h" #include "addressbook/util/eab-book-util.h" +#include "Evolution-Addressbook-SelectNames.h" #include "eab-editor.h" #include "e-contact-editor.h" |