From 8b4423c10c7e8168e4512c8a2522ffdb392453f3 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Wed, 5 Feb 2003 23:47:44 +0000
Subject: Remove cruft, s/ICONSDIR/IMAGESDIR/ (gladedir, etspecdir): Remove

	* gui/contact-list-editor/Makefile.am (INCLUDES): Remove cruft,
	s/ICONSDIR/IMAGESDIR/
	(gladedir, etspecdir): Remove definitions.

	* gui/contact-list-editor/e-contact-list-editor.c: #include
	<string.h>
	(e_contact_list_editor_init): s/ICONSDIR/IMAGESDIR/
	(e_contact_list_editor_new): s/gtk_object_ref/g_object_ref/

	* gui/contact-list-editor/e-contact-list-model.c: #include <string.h>

svn path=/trunk/; revision=19782
---
 addressbook/gui/contact-list-editor/Makefile.am             | 13 +++----------
 addressbook/gui/contact-list-editor/e-contact-list-editor.c |  5 +++--
 addressbook/gui/contact-list-editor/e-contact-list-model.c  |  1 +
 3 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'addressbook/gui')

diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 00805b0c09..6a3a21728a 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -8,11 +8,9 @@ INCLUDES =						\
 	-I$(top_builddir)/shell				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DDATADIR=\""$(datadir)"\"			\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"		\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
+	-DEVOLUTION_UIDIR=\""$(evolution_uidir)\""	\
 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
 	-DG_DISABLE_DEPRECATED				\
 	-DGTK_DISABLE_DEPRECATED			\
@@ -45,12 +43,7 @@ e-contact-list-editor-marshal.c: e-contact-list-editor-marshal.h
 MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h
 
 
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
-
-glade_DATA = 					\
-	contact-list-editor.glade
-
-etspecdir   = $(datadir)/evolution-$(BASE_VERSION)/etspec
+glade_DATA  = contact-list-editor.glade
 etspec_DATA = e-contact-list-editor.etspec
 
 BUILT_SOURCES = $(MARSHAL_GENERATED)
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 2459d5a157..e378ecfcd5 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -22,6 +22,7 @@
 
 #include "e-contact-list-editor.h"
 
+#include <string.h>
 #include <glib.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-window-icon.h>
@@ -302,7 +303,7 @@ e_contact_list_editor_init (EContactListEditor *editor)
 			  G_CALLBACK (app_delete_event_cb), editor);
 
 	/* set the icon */
-	icon_path = g_build_filename (EVOLUTION_ICONSDIR, "contact-list-16.png");
+	icon_path = g_build_filename (EVOLUTION_IMAGESDIR, "contact-list-16.png");
 	gnome_window_icon_set_from_file (GTK_WINDOW (editor->app), icon_path);
 	g_free (icon_path);
 }
@@ -585,7 +586,7 @@ e_contact_list_editor_new (EBook *book,
 	all_contact_list_editors = g_slist_prepend (all_contact_list_editors, ce);
 	g_object_weak_ref (G_OBJECT (ce), contact_list_editor_destroy_notify, ce);
 
-	gtk_object_ref (GTK_OBJECT (ce));
+	g_object_ref (ce);
 	gtk_object_sink (GTK_OBJECT (ce));
 
 	g_object_set (ce,
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index 3e4264fa85..971b1a58e2 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 
 #include <config.h>
+#include <string.h>
 #include "e-contact-list-model.h"
 
 #define PARENT_TYPE e_table_model_get_type()
-- 
cgit