From ba846b6b545490d957af46038c9b686b440ca25a Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Wed, 20 Nov 2002 21:57:43 +0000
Subject: Use GConf.

* e-summary.c (e_summary_init): Use GConf.

* e-summary-tasks.c: Replaced member config_listener in
ESummaryTasks with a gconf_client.
(setup_gconf_client): Renamed from setup_config_listener().  Set
up the GConf client and invoke gconf_client_add_dir() on the
interesting namespaces.
(gconf_client_value_changed_cb): Renamed from
config_listener_value_changed_cb and changed prototype to match
that of the "value_changed" signal in GConfClient.
(setup_task_folder): Updated to use GConf.

* e-summary-calendar.c: Replaced member config_listener with a
gconf_listener.
(setup_calendar): Use GConf.
(setup_gconf_client): Renamed from setup_config_listener.  Set up
a GConf client and invoke gconf_client_add_dir() on the
interesting namespaces.
(gconf_client_value_changed_cb): Renamed from
config_listener_key_changed_cb() and changed prototype to match
that of the "value_changed" signal in GConfClient.
(locale_uses_24h_time_format): Removed.
(e_summary_calendar_free): g_object_unref() the gconf_client.

* Makefile.am: Add rules to install the schemas.

* apps_evolution_summary.schemas: New.

* e-summary-preferences.c: Did a global GList -> GSList switch.
(e_summary_preferences_restore): Use GConfClient instead of
EConfigListener.
(vector_from_folder_list): Removed since GConf makes this useless.
(folder_list_from_vector): Likewise.
(str_list_from_vector): Likewise.
(vector_from_str_list): Likewise.
(make_initial_weather_list): Likewise.
(make_initial_rdf_list): Likewise.
(make_initial_mail_list): Likewise.
(e_summary_preferences_save): Use GConf.
(e_summary_preferences_init): No need to set up defaults here.

* e-summary.h: Changed members display_folders, rdf_urls, stations
in ESummaryPrefs to be GSLists instead of GLists; updated all the
functions that use them accordingly.

svn path=/trunk/; revision=18863
---
 my-evolution/Makefile.am | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'my-evolution/Makefile.am')

diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index b05e0d3c8a..68b10e53c2 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -103,6 +103,9 @@ endif
 Locationdir = $(datadir)/evolution
 Location_DATA = Locations
 
+
+# .server files
+
 server_in_files = GNOME_Evolution_Summary.server.in.in
 
 serverdir = $(libdir)/bonobo/servers
@@ -110,10 +113,27 @@ server_DATA = $(server_in_files:.server.in.in=.server)
 $(server_in_files:.server.in.in=.server.in): $(server_in_files)
 	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
+@INTLTOOL_SERVER_RULE@
+
+
+# Glade
+
 gladedir = $(datadir)/evolution/glade
 glade_DATA = my-evolution.glade
 
-@INTLTOOL_SERVER_RULE@
+# GConf schemas
+
+schemadir   = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = apps_evolution_summary.schemas
+
+install-data-local:
+	if test -z "$(DESTDIR)" ; then \
+		for p in $(schema_DATA) ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
+		done \
+	fi
+
+# Extra
 
 EXTRA_DIST = 				\
 	$(summary_sources)		\
-- 
cgit v1.2.3