aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2005-05-16 14:18:58 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-05-16 14:18:58 +0800
commitd7bec6f882964fd5c7da68213060ca301b383072 (patch)
treeff06319e70ac860a9a156b0eb088ff3dcc614304 /plugins
parent9c2dc6188551f97d7e0cf56d7cf43e5d94bac7a0 (diff)
downloadgsoc2013-evolution-d7bec6f882964fd5c7da68213060ca301b383072.tar.gz
gsoc2013-evolution-d7bec6f882964fd5c7da68213060ca301b383072.tar.zst
gsoc2013-evolution-d7bec6f882964fd5c7da68213060ca301b383072.zip
moved e-error to e-util
2005-05-16 Not Zed <NotZed@Ximian.com> * share-folder-common.c: moved e-error to e-util * Makefile.am: error filename changes. svn path=/trunk/; revision=29369
Diffstat (limited to 'plugins')
-rw-r--r--plugins/shared-folder/ChangeLog6
-rw-r--r--plugins/shared-folder/Makefile.am12
-rw-r--r--plugins/shared-folder/org-gnome-shared-folder-errors.xml15
-rw-r--r--plugins/shared-folder/org-gnome-shared-folder-errors.xml.h8
-rw-r--r--plugins/shared-folder/org-gnome-shared-folder.error.xml15
-rw-r--r--plugins/shared-folder/share-folder-common.c4
-rw-r--r--plugins/shared-folder/share-folder.c2
7 files changed, 28 insertions, 34 deletions
diff --git a/plugins/shared-folder/ChangeLog b/plugins/shared-folder/ChangeLog
index 99e3e2a86b..168c2b4aa7 100644
--- a/plugins/shared-folder/ChangeLog
+++ b/plugins/shared-folder/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-16 Not Zed <NotZed@Ximian.com>
+
+ * share-folder-common.c: moved e-error to e-util
+
+ * Makefile.am: error filename changes.
+
2005-05-06 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #273063
diff --git a/plugins/shared-folder/Makefile.am b/plugins/shared-folder/Makefile.am
index 08d1f0b29a..40a4d3c7f0 100644
--- a/plugins/shared-folder/Makefile.am
+++ b/plugins/shared-folder/Makefile.am
@@ -18,15 +18,11 @@ liborg_gnome_shared_folder_la_LDFLAGS = -module -avoid-version
glade_DATA =properties.glade
-error_DATA = org-gnome-shared-folder-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
+error_DATA = org-gnome-shared-folder.error
errordir = $(privdatadir)/errors
-%.xml.h: %.xml
- $(top_builddir)/e-util/e-error-tool $^
-BUILT_SOURCES = $(error_i18n)
+BUILT_SOURCES = $(error_DATA)
EXTRA_DIST = \
- $(error_DATA) \
- $(error_i18n) \
- $(glade_DATA) \
+ org-gnome-shared-folder.error.xml \
+ $(glade_DATA) \
org-gnome-shared-folder.eplug.in
diff --git a/plugins/shared-folder/org-gnome-shared-folder-errors.xml b/plugins/shared-folder/org-gnome-shared-folder-errors.xml
deleted file mode 100644
index 5c82840c6a..0000000000
--- a/plugins/shared-folder/org-gnome-shared-folder-errors.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="org.gnome.evolution.mail_shared_folder">
-<error id="invalid-user" type="error">
-<primary>Invalid user</primary>
-<secondary>You cannot share folder with specified user &quot;{0}&quot;</secondary>
-</error>
-
-<error id="no-user" type="error">
-<primary>Specify User</primary>
-<secondary>You have to specify a user name whom you want to add to the list</secondary>
-</error>
-
-
-</error-list>
-
diff --git a/plugins/shared-folder/org-gnome-shared-folder-errors.xml.h b/plugins/shared-folder/org-gnome-shared-folder-errors.xml.h
deleted file mode 100644
index bce204dca8..0000000000
--- a/plugins/shared-folder/org-gnome-shared-folder-errors.xml.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* org.gnome.evolution.mail_shared_folder:invalid-user primary */
-char *s = N_("Invalid user");
-/* org.gnome.evolution.mail_shared_folder:invalid-user secondary */
-char *s = N_("You cannot share folder with specified user \"{0}\"");
-/* org.gnome.evolution.mail_shared_folder:no-user primary */
-char *s = N_("Specify User");
-/* org.gnome.evolution.mail_shared_folder:no-user secondary */
-char *s = N_("You have to specify a user name whom you want to add to the list");
diff --git a/plugins/shared-folder/org-gnome-shared-folder.error.xml b/plugins/shared-folder/org-gnome-shared-folder.error.xml
new file mode 100644
index 0000000000..645c17d943
--- /dev/null
+++ b/plugins/shared-folder/org-gnome-shared-folder.error.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<error-list domain="org.gnome.evolution.mail_shared_folder">
+<error id="invalid-user" type="error">
+<_primary>Invalid user</_primary>
+<_secondary>You cannot share folder with specified user &quot;{0}&quot;</_secondary>
+</error>
+
+<error id="no-user" type="error">
+<_primary>Specify User</_primary>
+<_secondary>You have to specify a user name whom you want to add to the list</_secondary>
+</error>
+
+
+</error-list>
+
diff --git a/plugins/shared-folder/share-folder-common.c b/plugins/shared-folder/share-folder-common.c
index 6dd8c70a53..58c58e4b6d 100644
--- a/plugins/shared-folder/share-folder-common.c
+++ b/plugins/shared-folder/share-folder-common.c
@@ -47,9 +47,9 @@
#include <e-gw-container.h>
#include <e-gw-connection.h>
#include <glade/glade.h>
-#include <widgets/misc/e-error.h>
+#include "e-util/e-error.h"
#include <libgnomeui/libgnomeui.h>
-#include <widgets/misc/e-error.h>
+#include "e-util/e-error.h"
#include "share-folder.h"
#define d(x)
diff --git a/plugins/shared-folder/share-folder.c b/plugins/shared-folder/share-folder.c
index affcdb50c7..f6618a0745 100644
--- a/plugins/shared-folder/share-folder.c
+++ b/plugins/shared-folder/share-folder.c
@@ -38,7 +38,7 @@
#include <libedataserverui/e-contact-store.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnome/gnome-init.h>
-#include <widgets/misc/e-error.h>
+#include <e-util/e-error.h>
#include <e-gw-container.h>
#include <e-gw-connection.h>
#define ROOTNODE "vboxSharing"