Remove cruft, rename ICONSDIR to IMAGESDIR. (serverdir, gladedir): Remove

	* gui/component/Makefile.am (INCLUDES): Remove cruft, rename
	ICONSDIR to IMAGESDIR.
	(serverdir, gladedir): Remove defintions.

	* gui/component/addressbook-component.c (IS_CONTACT_TYPE): use
	g_ascii_strcasecmp
	(add_creatable_item): s/ICONSDIR/IMAGESDIR/

	* gui/component/component-factory.c: #include <string.h>

	* gui/component/e-address-widget.c: Likewise.
	(e_address_widget_destroy): s/gtk_idle_remove/g_source_remove/
	(e_address_widget_schedule_query): s/gtk_idle_add/g_idle_add/

svn path=/trunk/; revision=19786

4 files changed, 29 insertions, 35 deletions

diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index f831c19c6e..d53fb4c7ac 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,35 +1,29 @@
 SUBDIRS	= select-names
 
 INCLUDES =									\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"				\
-	-DPREFIX=\"$(prefix)\"							\
-	-DSYSCONFDIR=\"$(sysconfdir)\"						\
-	-DDATADIR=\"$(datadir)\"						\
-	-DLIBDIR=\"$(libdir)\"							\
-	-I$(top_srcdir)								\
-	-I$(top_builddir)							\
-	-I$(top_srcdir)/shell							\
-	-I$(top_builddir)/shell							\
-	-I$(top_srcdir)/widgets/misc						\
-	-I$(top_srcdir)/addressbook/gui/contact-editor				\
-	-I$(top_srcdir)/addressbook/gui/contact-list-editor			\
-	-I$(top_srcdir)/addressbook/gui/minicard				\
-	-I$(top_srcdir)/addressbook/gui/widgets					\
-	-I$(top_srcdir)/addressbook/backend					\
-	-I$(top_builddir)/addressbook/backend					\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"					\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"					\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"				\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"					\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"				\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"				\
-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/images\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"				\
-	$(LDAP_CFLAGS)								\
-	-DG_DISABLE_DEPRECATED							\
-	-DGTK_DISABLE_DEPRECATED						\
-	-DLIBGNOME_DISABLE_DEPRECATED						\
-	-DLIBGNOMEUI_DISABLE_DEPRECATED						\
+	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)/shell					\
+	-I$(top_builddir)/shell					\
+	-I$(top_srcdir)/widgets/misc				\
+	-I$(top_srcdir)/addressbook/gui/contact-editor		\
+	-I$(top_srcdir)/addressbook/gui/contact-list-editor	\
+	-I$(top_srcdir)/addressbook/gui/minicard		\
+	-I$(top_srcdir)/addressbook/gui/widgets			\
+	-I$(top_srcdir)/addressbook/backend			\
+	-I$(top_builddir)/addressbook/backend			\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
+	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
+	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
+	$(LDAP_CFLAGS)						\
+	-DG_DISABLE_DEPRECATED					\
+	-DGTK_DISABLE_DEPRECATED				\
+	-DLIBGNOME_DISABLE_DEPRECATED				\
+	-DLIBGNOMEUI_DISABLE_DEPRECATED				\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 component_LTLIBRARIES = libevolution-addressbook.la
@@ -88,14 +82,12 @@ install-data-local:
 
 server_in_files = GNOME_Evolution_Addressbook.server.in.in
 
-serverdir = $(libdir)/bonobo/servers
 server_DATA = $(server_in_files:.server.in.in=.server)
 $(server_in_files:.server.in.in=.server.in): $(server_in_files)
 	sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
 
-gladedir   = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA = ldap-config.glade
 
 EXTRA_DIST =			\
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 244afb0cc6..8d8de1fb41 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -82,7 +82,7 @@ static const EvolutionShellComponentFolderType folder_types[] = {
 	{ NULL }
 };
 
-#define IS_CONTACT_TYPE(x)  (g_strcasecmp((x), "contacts") == 0 || g_strcasecmp ((x), "contacts/ldap") == 0 || g_strcasecmp((x), "contacts/public") == 0)
+#define IS_CONTACT_TYPE(x)  (g_ascii_strcasecmp((x), "contacts") == 0 || g_ascii_strcasecmp ((x), "contacts/ldap") == 0 || g_ascii_strcasecmp((x), "contacts/public") == 0)
 
 /* EvolutionShellComponent methods and signals.  */
 
@@ -527,7 +527,7 @@ add_creatable_item (EvolutionShellComponent *shell_component,
 		icon_path = NULL;
 		icon = NULL;
 	} else {
-		icon_path = g_build_filename (EVOLUTION_ICONSDIR, icon_name, NULL);
+		icon_path = g_build_filename (EVOLUTION_IMAGESDIR, icon_name, NULL);
 		icon = gdk_pixbuf_new_from_file (icon_path, NULL);
 	}
 
diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c
index b1b911566e..9d5e946dc0 100644
--- a/addressbook/gui/component/component-factory.c
+++ b/addressbook/gui/component/component-factory.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include <string.h>
 #include "addressbook.h"
 #include "addressbook-component.h"
 #include "addressbook-config.h"
diff --git a/addressbook/gui/component/e-address-widget.c b/addressbook/gui/component/e-address-widget.c
index c601278807..e9698d5b1d 100644
--- a/addressbook/gui/component/e-address-widget.c
+++ b/addressbook/gui/component/e-address-widget.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include <ctype.h>
+#include <string.h>
 #include <gtk/gtklabel.h>
 #include <libgnomeui/gnome-popup-menu.h>
 #include <bonobo/bonobo-control.h>
@@ -79,7 +80,7 @@ e_address_widget_destroy (GtkObject *obj)
 		e_book_simple_query_cancel (common_book, addr->query_tag);
 
 	if (addr->query_idle_tag)
-		gtk_idle_remove (addr->query_idle_tag);
+		g_source_remove (addr->query_idle_tag);
 }
 
 static gint
@@ -314,7 +315,7 @@ e_address_widget_schedule_query (EAddressWidget *addr)
 {
 	if (addr->query_idle_tag || !doing_queries)
 		return;
-	addr->query_idle_tag = gtk_idle_add (query_idle_fn, addr);
+	addr->query_idle_tag = g_idle_add (query_idle_fn, addr);
 }
 
 /*