diff options
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 2 | ||||
| -rw-r--r-- | filter/ChangeLog | 5 | ||||
| -rw-r--r-- | filter/Makefile.am | 2 | ||||
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/folder-browser.h | 2 | ||||
| -rw-r--r-- | mail/subscribe-dialog.c | 1 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | widgets/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | widgets/misc/Makefile.am | 2 |
9 files changed, 18 insertions, 6 deletions
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index bf7bdf7067..fe0ad46e52 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -22,7 +22,7 @@ #include "addressbook/gui/search/e-addressbook-search-dialog.h" #include "addressbook/gui/widgets/e-addressbook-view.h" -#include "filter/e-search-bar.h" +#include <widgets/misc/e-search-bar.h> #include <select-names/e-select-names.h> #include <select-names/e-select-names-manager.h> diff --git a/filter/ChangeLog b/filter/ChangeLog index a77c234aac..abce136c7b 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,8 @@ +2001-01-16 Jason Leach <jasonleach@usa.net> + + * e-search-bar.[ch]: Moved ESearchBar to $(toplevel)/widgets/misc, + a more appropriate home. Bug #1060. + 2001-01-13 Jeffrey Stedfast <fejj@ximian.com> * filter-driver.c (do_copy): Moved p->copied to the inner part of diff --git a/filter/Makefile.am b/filter/Makefile.am index 53827fd793..d859df5bfd 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -23,8 +23,6 @@ noinst_LTLIBRARIES = \ libfilter.la libfilter_la_SOURCES = \ - e-search-bar.c \ - e-search-bar.h \ filter-code.c \ filter-code.h \ filter-colour.c \ diff --git a/mail/ChangeLog b/mail/ChangeLog index 792e4ab766..d9b65aefb5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,9 @@ 2001-01-16 Jason Leach <jasonleach@usa.net> + * subscribe-dialog.c: removed unecessary #inlcude "e-title-bar.h" + +2001-01-16 Jason Leach <jasonleach@usa.net> + * openpgp-utils.c (pgp_get_passphrase): Fix a string causing translation problems. Bug #1147. diff --git a/mail/folder-browser.h b/mail/folder-browser.h index 3c07cbdbe0..d6df42f4e4 100644 --- a/mail/folder-browser.h +++ b/mail/folder-browser.h @@ -9,7 +9,7 @@ #include "camel/camel-stream.h" #include <bonobo/bonobo-property-bag.h> #include <bonobo/bonobo-ui-component.h> -#include "filter/e-search-bar.h" +#include <widgets/misc/e-search-bar.h> #include "filter/filter-rule.h" #include "filter/filter-context.h" /*eek*/ #include "message-list.h" diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c index 1f5b3eebad..a7538d766a 100644 --- a/mail/subscribe-dialog.c +++ b/mail/subscribe-dialog.c @@ -25,7 +25,6 @@ #include <gnome.h> #include "subscribe-dialog.h" #include "e-util/e-html-utils.h" -#include "e-title-bar.h" #include <gtkhtml/gtkhtml.h> #include <gal/util/e-util.h> #include <gal/widgets/e-unicode.h> diff --git a/po/POTFILES.in b/po/POTFILES.in index 795dcdfb12..7d187f4b7f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -100,7 +100,6 @@ composer/e-msg-composer-attachment.glade composer/e-msg-composer-hdrs.c composer/e-msg-composer.c composer/evolution-composer.c -filter/e-search-bar.c filter/filter-datespec.c filter/filter-editor.c filter/filter-filter.c @@ -168,4 +167,5 @@ widgets/misc/e-calendar-item.c widgets/misc/e-calendar.c widgets/misc/e-clipped-label.c widgets/misc/e-dateedit.c +widgets/misc/e-search-bar.c widgets/shortcut-bar/e-group-bar.c diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index afc608faa2..31af072505 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,7 @@ +2001-01-16 Jason Leach <jasonleach@usa.net> + + * e-search-bar.[ch]: Moved here from $(toplevel)/filter. + 2000-12-22 JP Rosevear <jpr@helixcode.com> * e-calendar-item.h: add prototypes diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 3ccf646df9..73ede4c834 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -19,6 +19,8 @@ libemiscwidgets_a_SOURCES = \ e-clipped-label.h \ e-dateedit.c \ e-dateedit.h \ + e-search-bar.c \ + e-search-bar.h \ e-title-bar.c \ e-title-bar.h |