From 0311da7a876b49869ed89579db9813c6199d9f00 Mon Sep 17 00:00:00 2001
From: Simon Zheng <simon.zheng@sun.com>
Date: Tue, 10 Jan 2006 08:08:21 +0000
Subject: Use e_util_mkdir_hier() instead of e_mkdir_hier().

2006-01-10  Simon Zheng  <simon.zheng@sun.com>

        * gui/calendar-component.c: (calendar_component_peek):
        * gui/calendar-config.c:
        * gui/e-cal-model-tasks.c:
        * gui/e-cal-popup.c:
        * gui/e-cell-date-edit-text.c:
        * gui/e-meeting-store.c:
        * gui/memos-component.c: (memos_component_peek):
        * gui/print.c:
        * gui/tasks-component.c: (tasks_component_peek):
        Use e_util_mkdir_hier() instead of e_mkdir_hier().

        Use e_util_strstrcase() instead of e_strstrcasea().

        use e_strftime() in evolution-data-server/
        libedataserver/e-data-server-util.c instead of the copy in
        evolution/e-util/e-util.c.

        use e_filename_make_safe() in evolution-data-server/
        libedataserver/e-data-server-util.c instead of the copy in
        evolution/e-util/e-util.c.

        use e_utf8_strftime() in evolution-data-server/
        libedataserver/e-data-server-util.c instead of the copy in
        evolution/e-util/e-util.c.

svn path=/trunk/; revision=31116
---
 calendar/ChangeLog                   | 27 +++++++++++++++++++++++++++
 calendar/gui/calendar-component.c    |  3 ++-
 calendar/gui/calendar-config.c       |  1 +
 calendar/gui/e-cal-model-tasks.c     |  2 +-
 calendar/gui/e-cal-popup.c           |  1 +
 calendar/gui/e-cell-date-edit-text.c |  1 +
 calendar/gui/e-meeting-store.c       |  2 +-
 calendar/gui/memos-component.c       |  3 ++-
 calendar/gui/print.c                 |  1 +
 calendar/gui/tasks-component.c       |  3 ++-
 10 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 35b5d03dda..cba30a1d84 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,30 @@
+2006-01-10  Simon Zheng  <simon.zheng@sun.com>
+
+	* gui/calendar-component.c: (calendar_component_peek):
+	* gui/calendar-config.c:
+	* gui/e-cal-model-tasks.c:
+	* gui/e-cal-popup.c:
+	* gui/e-cell-date-edit-text.c:
+	* gui/e-meeting-store.c:
+	* gui/memos-component.c: (memos_component_peek):
+	* gui/print.c:
+	* gui/tasks-component.c: (tasks_component_peek):
+	Use e_util_mkdir_hier() instead of e_mkdir_hier().
+
+        Use e_util_strstrcase() instead of e_strstrcasea().
+    
+        use e_strftime() in evolution-data-server/
+        libedataserver/e-data-server-util.c instead of the copy in 
+        evolution/e-util/e-util.c.
+ 
+ 	use e_filename_make_safe() in evolution-data-server/
+        libedataserver/e-data-server-util.c instead of the copy in 
+        evolution/e-util/e-util.c.
+        
+        use e_utf8_strftime() in evolution-data-server/
+        libedataserver/e-data-server-util.c instead of the copy in 
+        evolution/e-util/e-util.c.
+
 2006-01-08  Tor Lillqvist  <tml@novell.com>
 
 	* gui/migration.c: Bypass most of this file on Win32, as there are
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 1ed8641123..93684da111 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -31,6 +31,7 @@
 #include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-exception.h>
 #include <libical/icalvcal.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-url.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserverui/e-source-selector.h>
@@ -1627,7 +1628,7 @@ calendar_component_peek (void)
 	if (component == NULL) {
 		component = g_object_new (calendar_component_get_type (), NULL);
 
-		if (e_mkdir_hier (calendar_component_peek_config_directory (component), 0777) != 0) {
+		if (e_util_mkdir_hier (calendar_component_peek_config_directory (component), 0777) != 0) {
 			g_warning (G_STRLOC ": Cannot create directory %s: %s",
 				   calendar_component_peek_config_directory (component),
 				   g_strerror (errno));
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index e4a952a3ea..6128931476 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <time.h>
 #include <libgnomeui/gnome-dialog.h>
+#include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
 #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 1ea87b2d71..5bdcd113ca 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 #include "calendar-config.h"
 #include "e-cal-model-tasks.h"
 #include "e-cell-date-edit-text.h"
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 2f80f7d34a..fd91bed407 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -33,6 +33,7 @@
 #include <libgnomevfs/gnome-vfs-mime.h>
 
 #include "e-cal-popup.h"
+#include <libedataserver/e-data-server-util.h>
 #include <libedataserverui/e-source-selector.h>
 
 #include <camel/camel-mime-part.h>
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index a0273fc634..aa05b5eef3 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -38,6 +38,7 @@
 #include <libgnomeui/gnome-stock-icons.h> 
 #include <libgnome/gnome-i18n.h>
 #include <libedataserver/e-time-utils.h>
+#include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
 #include <libecal/e-cal-time-util.h>
 
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 6b5f101c70..9a86a16b28 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -33,7 +33,7 @@
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 #include "calendar-config.h"
 #include "itip-utils.h"
 #include "e-meeting-utils.h"
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 259ec736b0..81f5fd1f47 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -32,6 +32,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <gconf/gconf-client.h>
 #include <libecal/e-cal.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libedataserverui/e-source-selector.h>
 #include <shell/e-user-creatable-items-handler.h>
 #include <shell/e-component-view.h>
@@ -1297,7 +1298,7 @@ memos_component_peek (void)
 	if (component == NULL) {
 		component = g_object_new (memos_component_get_type (), NULL);
 
-		if (e_mkdir_hier (component->priv->config_directory, 0777) != 0) {
+		if (e_util_mkdir_hier (component->priv->config_directory, 0777) != 0) {
 			g_warning (G_STRLOC ": Cannot create directory %s: %s",
 				   component->priv->config_directory, g_strerror (errno));
 			g_object_unref (component);
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index e1b17901f1..624503aaa2 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -45,6 +45,7 @@
 #include <libgnomeprintui/gnome-print-preview.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libedataserver/e-time-utils.h>
+#include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-print.h>
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 7f332b80f1..83398734d2 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -31,6 +31,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <gconf/gconf-client.h>
 #include <libecal/e-cal.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libedataserverui/e-source-selector.h>
 #include <shell/e-user-creatable-items-handler.h>
 #include <shell/e-component-view.h>
@@ -1321,7 +1322,7 @@ tasks_component_peek (void)
 	if (component == NULL) {
 		component = g_object_new (tasks_component_get_type (), NULL);
 
-		if (e_mkdir_hier (component->priv->config_directory, 0777) != 0) {
+		if (e_util_mkdir_hier (component->priv->config_directory, 0777) != 0) {
 			g_warning (G_STRLOC ": Cannot create directory %s: %s",
 				   component->priv->config_directory, g_strerror (errno));
 			g_object_unref (component);
-- 
cgit v1.2.3