aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/gui/component/addressbook.c5
-rw-r--r--addressbook/printing/e-contact-print-envelope.c6
-rw-r--r--addressbook/printing/e-contact-print-envelope.h1
4 files changed, 18 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 136ff53789..4aede6ab15 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,14 @@
2001-08-14 Christopher James Lahey <clahey@ximian.com>
+ * gui/component/addressbook.c (addressbook_factory_new_control):
+ (addressbook_query_changed): Fixed two const warnings here.
+
+ * printing/e-contact-print-envelope.c,
+ printing/e-contact-print-envelope.h: Fixed some missing includes
+ here.
+
+2001-08-14 Christopher James Lahey <clahey@ximian.com>
+
* backend/ebook/e-book-view.c (add_book_iterator): Call
e_card_set_book here.
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 03744c266e..d523c1fc4a 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -657,7 +657,8 @@ static void
addressbook_query_changed (ESearchBar *esb, AddressbookView *view)
{
ECategoriesMasterList *master_list;
- char *search_word, *search_query, *category_name;
+ char *search_word, *search_query;
+ const char *category_name;
int search_type, subopt;
gtk_object_get(GTK_OBJECT(esb),
@@ -799,7 +800,7 @@ addressbook_factory_new_control (void)
for (i=0; i<N; ++i) {
subitems[i].id = i;
- subitems[i].text = e_categories_master_list_nth (master_list, i);
+ subitems[i].text = (char *) e_categories_master_list_nth (master_list, i);
}
subitems[N].id = -1;
subitems[N].text = NULL;
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
index d2334e2b67..057ae63b9e 100644
--- a/addressbook/printing/e-contact-print-envelope.c
+++ b/addressbook/printing/e-contact-print-envelope.c
@@ -20,6 +20,11 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
+#include "addressbook/printing/e-contact-print-envelope.h"
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
#include <time.h>
#include <libgnome/gnome-paper.h>
#include <libgnomeprint/gnome-print.h>
@@ -28,7 +33,6 @@
#include <libgnomeprint/gnome-print-master-preview.h>
#include "addressbook/backend/ebook/e-card.h"
#include "addressbook/backend/ebook/e-card-simple.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
#define ENVELOPE_HEIGHT (72.0 * 4.0)
#define ENVELOPE_WIDTH (72.0 * 9.5)
diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h
index 84238c2c9c..9197d4452d 100644
--- a/addressbook/printing/e-contact-print-envelope.h
+++ b/addressbook/printing/e-contact-print-envelope.h
@@ -24,6 +24,7 @@
#define E_CONTACT_PRINT_ENVELOPE_H
#include <addressbook/backend/ebook/e-card.h>
+#include <gtk/gtkwidget.h>
#include "e-contact-print-types.h"
GtkWidget *e_contact_print_envelope_dialog_new(ECard *card);