aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-18 13:15:58 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-18 13:15:58 +0800
commitdffd9d69efa547950e32ae3bfb291e0c527bf580 (patch)
tree0a1b4728aed9f889686a8f196f8d469081e44cd4
parent2c260daf732ba0ae86fbd1d9e43f3e7098e68721 (diff)
downloadgsoc2013-evolution-dffd9d69efa547950e32ae3bfb291e0c527bf580.tar.gz
gsoc2013-evolution-dffd9d69efa547950e32ae3bfb291e0c527bf580.tar.zst
gsoc2013-evolution-dffd9d69efa547950e32ae3bfb291e0c527bf580.zip
Fix for bug #437584
svn path=/trunk/; revision=33697
-rw-r--r--plugins/bbdb/ChangeLog5
-rw-r--r--plugins/bbdb/gaimbuddies.c8
-rw-r--r--plugins/exchange-operations/ChangeLog5
-rw-r--r--plugins/exchange-operations/exchange-mail-send-options.c8
-rw-r--r--plugins/ipod-sync/ChangeLog8
-rw-r--r--plugins/ipod-sync/evolution-ipod-sync.c8
-rw-r--r--plugins/ipod-sync/evolution-ipod-sync.h32
-rw-r--r--plugins/ipod-sync/ipod.c4
-rw-r--r--plugins/mail-notification/ChangeLog5
-rw-r--r--plugins/mail-notification/mail-notification.c2
-rw-r--r--plugins/mail-to-meeting/ChangeLog5
-rw-r--r--plugins/mail-to-meeting/mail-to-meeting.c3
-rw-r--r--plugins/publish-calendar/ChangeLog8
-rw-r--r--plugins/publish-calendar/publish-location.c72
-rw-r--r--plugins/save-calendar/ChangeLog6
-rw-r--r--plugins/save-calendar/rdf-format.c44
16 files changed, 124 insertions, 99 deletions
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 65a15319da..ca872a47d6 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * gaimbuddies.c: (get_node_text), (parse_contact): more compilation
+ warnings cleanup, completes bug #437584 fixes
+
2007-05-14 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #414195 from Loïc Minier
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index b00ebc5952..e8c34bd01f 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -365,10 +365,10 @@ static char *
get_node_text (xmlNodePtr node)
{
if (node->children == NULL || node->children->content == NULL ||
- strcmp ((const char *)node->children->name, "text"))
+ strcmp ((char *)node->children->name, "text"))
return NULL;
- return g_strdup (node->children->content);
+ return g_strdup ((char *)node->children->content);
}
static char *
@@ -410,12 +410,12 @@ parse_contact (xmlNodePtr contact, GList **buddies)
gb = g_new0 (GaimBuddy, 1);
- gb->proto = e_xml_get_string_prop_by_name (buddy, "proto");
+ gb->proto = e_xml_get_string_prop_by_name (buddy, (const unsigned char *)"proto");
for (child = buddy->children; child != NULL; child = child->next) {
if (! strcmp ((const char *)child->name, "setting")) {
char *setting_type;
- setting_type = e_xml_get_string_prop_by_name (child, "name");
+ setting_type = e_xml_get_string_prop_by_name (child, (const unsigned char *)"name");
if (! strcmp ((const char *)setting_type, "buddy_icon"))
gb->icon = get_buddy_icon_from_setting (child);
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 975370759a..99f53aad6a 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * exchange-mail-send-options.c: (org_gnome_exchange_send_options):
+ more compilation warnings cleanup, completes bug #437584 fixes
+
2007-06-11 Milan Crha <mcrha@redhat.com>
** Fix for bug #325882
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 65533d8ed2..1a5f7f38f5 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -123,8 +123,8 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
EAccount *account = NULL;
char *temp = NULL;
- account = e_msg_composer_get_preferred_account (composer) ;
- temp = strstr (account->transport->url, "exchange") ;
+ account = e_msg_composer_get_preferred_account (composer);
+ temp = strstr (account->transport->url, "exchange");
if (!temp) {
return;
}
@@ -134,8 +134,8 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
g_print ("New dialog\n\n") ;
dialog = exchange_sendoptions_dialog_new () ;
}
- exchange_sendoptions_dialog_run (dialog, composer) ;
- g_signal_connect (dialog, "sod_response", G_CALLBACK (append_to_header), composer);
+ exchange_sendoptions_dialog_run (dialog, GTK_WIDGET (composer));
+ g_signal_connect (dialog, "sod_response", G_CALLBACK (append_to_header), GTK_WIDGET (composer));
g_signal_connect (GTK_WIDGET (composer), "destroy",
G_CALLBACK (send_options_commit), dialog);
diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog
index 537a3c79dc..143d1a3760 100644
--- a/plugins/ipod-sync/ChangeLog
+++ b/plugins/ipod-sync/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * evolution-ipod-sync.c: (ipod_get_mount):
+ * evolution-ipod-sync.h:
+ * ipod.c: (try_mount), (try_umount): more compilation
+ warnings cleanup, completes bug #437584 fixes. Removes
+ hopefully useless code in headers.
+
2007-05-14 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #375234 from Vitaliy Ischenko
diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index 72619a77db..96ed6ba7d6 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.c
@@ -7,13 +7,15 @@
*
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
#include "evolution-ipod-sync.h"
-#include <gnome.h>
#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
-#include <libhal.h>
char * mount_point = NULL;
LibHalContext *ctx;
@@ -77,7 +79,7 @@ ipod_check_status (gboolean silent)
}
char *
-ipod_get_mount ()
+ipod_get_mount (void)
{
return mount_point;
}
diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h
index 89110ed7f7..5984b8a059 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.h
+++ b/plugins/ipod-sync/evolution-ipod-sync.h
@@ -7,37 +7,19 @@
*
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
#include <libhal.h>
#include <signal.h>
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(String) gettext (String)
-# ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-# else
-# define N_(String) (String)
-# endif
-#else
-# define _(String)
-# define N_(String) (String)
-#endif
-
-#ifdef EIS_DEBUG
-# define dbg(fmt,arg...) fprintf(stderr, "%s/%d: " fmt,__FILE__,__LINE__,##arg)
-#else
-# define dbg(fmt,arg...) do { } while(0)
-#endif
-
-#define warn(fmt,arg...) g_warning("%s/%d: " fmt,__FILE__,__LINE__,##arg)
-
-
-gboolean check_hal ();
+gboolean check_hal (void);
+gboolean ipod_check_status (gboolean silent);
+gboolean try_umount (char *device);
char *find_ipod_mount_point (LibHalContext *ctx);
-gboolean ipod_check_status (gboolean silent);
-char *ipod_get_mount ();
+char *ipod_get_mount (void);
+
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index d5ea660056..292d07681f 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.c
@@ -62,7 +62,7 @@ try_mount (char *device)
if (!g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL, NULL, NULL,
NULL, &exit_status, &err))
{
- warn ("try_mount failed: %s", err->message);
+ g_warning ("try_mount failed: %s", err->message);
return FALSE;
}
@@ -88,7 +88,7 @@ try_umount (char *device)
if (!g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL, NULL, NULL,
NULL, &exit_status, &err))
{
- warn ("try_umount failed: %s", err->message);
+ g_warning ("try_umount failed: %s", err->message);
return FALSE;
}
diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog
index 9f856d8979..8bcb5a9a7a 100644
--- a/plugins/mail-notification/ChangeLog
+++ b/plugins/mail-notification/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * mail-notification.c: (org_gnome_mail_new_notify):
+ fix a printf warning
+
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for version removal from Installed files from Gilles Dartiguelongue
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index d170d7a6df..79b0674efe 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -124,7 +124,7 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
if (gconf_client_get_bool (client, GCONF_KEY_NOTIFICATION, NULL)) {
if (!notify_init ("evolution-mail-notification"))
fprintf(stderr,"notify init error");
- printf("creating %d\n", status_icon);
+ printf("creating %p\n", status_icon);
notify = notify_notification_new (
_("New email"),
diff --git a/plugins/mail-to-meeting/ChangeLog b/plugins/mail-to-meeting/ChangeLog
index 9b481ec99f..3e83096100 100644
--- a/plugins/mail-to-meeting/ChangeLog
+++ b/plugins/mail-to-meeting/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * mail-to-meeting.c: (add_attendee_cb): more compilation
+ warnings cleanup, completes bug #437584 fixes
+
2007-04-02 Sankar P <psankar@novell.com>
* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
diff --git a/plugins/mail-to-meeting/mail-to-meeting.c b/plugins/mail-to-meeting/mail-to-meeting.c
index 4c358fe61a..b97625e2b6 100644
--- a/plugins/mail-to-meeting/mail-to-meeting.c
+++ b/plugins/mail-to-meeting/mail-to-meeting.c
@@ -38,7 +38,7 @@ add_attendee_cb (gpointer key, gpointer value, gpointer user_data)
{
ECalComponentAttendee *ca;
const char *str, *name;
- GList **attendees = user_data;
+ GSList **attendees = user_data;
if (!camel_internet_address_get (value, 0, &name, &str))
return;
@@ -48,6 +48,7 @@ add_attendee_cb (gpointer key, gpointer value, gpointer user_data)
ca->cn = name;
/* FIXME: missing many fields */
+ /* FIXME: user prepend and reverse list order (GList) */
*attendees = g_slist_append (*attendees, ca);
}
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
index 2af4178446..9b98cc2b79 100644
--- a/plugins/publish-calendar/ChangeLog
+++ b/plugins/publish-calendar/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * publish-location.c: (migrateURI), (e_publish_uri_from_xml),
+ (e_publish_uri_to_xml): more compilation warnings cleanup,
+ completes bug #437584 fixes
+
2007-05-12 Matthew Barnes <mbarnes@redhat.com>
* Makefile.am: Add "eplug" file to CLEANFILES.
@@ -5,7 +11,7 @@
2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
* url-editor-dialog.c: (set_from_uri): fixes casts in strcmp,
- fixes par of bug #437584
+ fixes part of bug #437584
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index fef67e7a08..a88fb295aa 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -54,40 +54,40 @@ migrateURI (const gchar *xml, xmlDocPtr doc)
uri = g_new0 (EPublishUri, 1);
root = doc->children;
- location = xmlGetProp (root, "location");
- enabled = xmlGetProp (root, "enabled");
- frequency = xmlGetProp (root, "frequency");
- username = xmlGetProp (root, "username");
+ location = xmlGetProp (root, (const unsigned char *)"location");
+ enabled = xmlGetProp (root, (const unsigned char *)"enabled");
+ frequency = xmlGetProp (root, (const unsigned char *)"frequency");
+ username = xmlGetProp (root, (const unsigned char *)"username");
- vfs_uri = gnome_vfs_uri_new (location);
+ vfs_uri = gnome_vfs_uri_new ((char *)location);
if (!vfs_uri) {
g_warning ("Could not form the uri for %s \n", location);
goto cleanup;
}
- gnome_vfs_uri_set_user_name (vfs_uri, username);
+ gnome_vfs_uri_set_user_name ((GnomeVFSURI *)vfs_uri, (char *)username);
temp = gnome_vfs_uri_to_string (vfs_uri, GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD | GNOME_VFS_URI_HIDE_PASSWORD);
uri->location = g_strdup_printf ("dav://%s", temp);
g_free (temp);
gnome_vfs_uri_unref (vfs_uri);
if (enabled != NULL)
- uri->enabled = atoi (enabled);
+ uri->enabled = atoi ((char *)enabled);
if (frequency != NULL)
- uri->publish_frequency = atoi (frequency);
+ uri->publish_frequency = atoi ((char *)frequency);
uri->publish_format = URI_PUBLISH_AS_FB;
- password = e_passwords_get_password ("Calendar", location);
+ password = e_passwords_get_password ("Calendar", (char *)location);
if (password) {
- e_passwords_forget_password ("Calendar", location);
+ e_passwords_forget_password ("Calendar", (char *)location);
e_passwords_add_password (uri->location, password);
e_passwords_remember_password ("Calendar", uri->location);
}
for (p = root->children; p != NULL; p = p->next) {
- xmlChar *uid = xmlGetProp (p, "uid");
- if (strcmp (p->name, "source") == 0) {
+ xmlChar *uid = xmlGetProp (p, (const unsigned char *)"uid");
+ if (strcmp ((char *)p->name, "source") == 0) {
events = g_slist_append (events, uid);
} else {
g_free (uid);
@@ -121,15 +121,15 @@ e_publish_uri_from_xml (const gchar *xml)
GSList *events = NULL;
EPublishUri *uri;
- doc = xmlParseDoc ((char *) xml);
+ doc = xmlParseDoc ((const unsigned char *)xml);
if (doc == NULL)
return NULL;
root = doc->children;
- if (strcmp (root->name, "uri") != 0)
+ if (strcmp ((char *)root->name, "uri") != 0)
return NULL;
- if ((username = xmlGetProp (root, "username"))) {
+ if ((username = xmlGetProp (root, (const unsigned char *)"username"))) {
xmlFree (username);
return migrateURI (xml, doc);
@@ -137,28 +137,28 @@ e_publish_uri_from_xml (const gchar *xml)
uri = g_new0 (EPublishUri, 1);
- location = xmlGetProp (root, "location");
- enabled = xmlGetProp (root, "enabled");
- frequency = xmlGetProp (root, "frequency");
- format = xmlGetProp (root, "format");
- publish_time = xmlGetProp (root, "publish_time");
+ location = xmlGetProp (root, (const unsigned char *)"location");
+ enabled = xmlGetProp (root, (const unsigned char *)"enabled");
+ frequency = xmlGetProp (root, (const unsigned char *)"frequency");
+ format = xmlGetProp (root, (const unsigned char *)"format");
+ publish_time = xmlGetProp (root, (const unsigned char *)"publish_time");
if (location != NULL)
- uri->location = location;
+ uri->location = (char *)location;
if (enabled != NULL)
- uri->enabled = atoi (enabled);
+ uri->enabled = atoi ((char *)enabled);
if (frequency != NULL)
- uri->publish_frequency = atoi (frequency);
+ uri->publish_frequency = atoi ((char *)frequency);
if (format != NULL)
- uri->publish_format = atoi (format);
+ uri->publish_format = atoi ((char *)format);
if (publish_time != NULL)
- uri->last_pub_time = publish_time;
+ uri->last_pub_time = (char *)publish_time;
uri->password = g_strdup ("");
for (p = root->children; p != NULL; p = p->next) {
- xmlChar *uid = xmlGetProp (p, "uid");
- if (strcmp (p->name, "event") == 0) {
+ xmlChar *uid = xmlGetProp (p, (const unsigned char *)"uid");
+ if (strcmp ((char *)p->name, "event") == 0) {
events = g_slist_append (events, uid);
} else {
g_free (uid);
@@ -188,22 +188,22 @@ e_publish_uri_to_xml (EPublishUri *uri)
g_return_val_if_fail (uri != NULL, NULL);
g_return_val_if_fail (uri->location != NULL, NULL);
- doc = xmlNewDoc ("1.0");
+ doc = xmlNewDoc ((const unsigned char *)"1.0");
- root = xmlNewDocNode (doc, NULL, "uri", NULL);
+ root = xmlNewDocNode (doc, NULL, (const unsigned char *)"uri", NULL);
enabled = g_strdup_printf ("%d", uri->enabled);
frequency = g_strdup_printf ("%d", uri->publish_frequency);
format = g_strdup_printf ("%d", uri->publish_format);
- xmlSetProp (root, "location", uri->location);
- xmlSetProp (root, "enabled", enabled);
- xmlSetProp (root, "frequency", frequency);
- xmlSetProp (root, "format", format);
- xmlSetProp (root, "publish_time", uri->last_pub_time);
+ xmlSetProp (root, (const unsigned char *)"location", (unsigned char *)uri->location);
+ xmlSetProp (root, (const unsigned char *)"enabled", (unsigned char *)enabled);
+ xmlSetProp (root, (const unsigned char *)"frequency", (unsigned char *)frequency);
+ xmlSetProp (root, (const unsigned char *)"format", (unsigned char *)format);
+ xmlSetProp (root, (const unsigned char *)"publish_time", (unsigned char *)uri->last_pub_time);
for (calendars = uri->events; calendars != NULL; calendars = g_slist_next (calendars)) {
xmlNodePtr node;
- node = xmlNewChild (root, NULL, "event", NULL);
- xmlSetProp (node, "uid", calendars->data);
+ node = xmlNewChild (root, NULL, (const unsigned char *)"event", NULL);
+ xmlSetProp (node, (const unsigned char *)"uid", calendars->data);
}
xmlDocSetRootElement (doc, root);
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index 97fb87ac9e..c22b974fc3 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * rdf-format.c: (add_nummeric_to_rdf), (add_time_to_rdf),
+ (add_string_to_rdf), (do_save_calendar_rdf):
+ more compilation warnings cleanup, completes bug #437584 fixes
+
2007-04-02 Sankar P <psankar@novell.com>
* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 72df578fce..9b6892cb11 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -135,8 +135,8 @@ add_nummeric_to_rdf (xmlNodePtr node, const gchar *tag, gint *nummeric)
{
if (nummeric) {
gchar *value = g_strdup_printf ("%d", *nummeric);
- xmlNodePtr cur_node = xmlNewChild (node, NULL, tag, value);
- xmlSetProp (cur_node, "rdf:datatype", "http://www.w3.org/2001/XMLSchema#integer");
+ xmlNodePtr cur_node = xmlNewChild (node, NULL, (unsigned char *)tag, (unsigned char *)value);
+ xmlSetProp (cur_node, (const unsigned char *)"rdf:datatype", (const unsigned char *)"http://www.w3.org/2001/XMLSchema#integer");
g_free (value);
}
}
@@ -157,12 +157,12 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time)
* */
e_utf8_strftime (str, 200, _("%FT%T"), &mytm);
- cur_node = xmlNewChild (node, NULL, tag, str);
+ cur_node = xmlNewChild (node, NULL, (unsigned char *)tag, (unsigned char *)str);
/* Not sure about this property */
timezone = calendar_config_get_timezone ();
tmp = g_strdup_printf ("http://www.w3.org/2002/12/cal/tzd/%s#tz", timezone);
- xmlSetProp (cur_node, "rdf:datatype", tmp);
+ xmlSetProp (cur_node, (const unsigned char *)"rdf:datatype", (unsigned char *)tmp);
g_free (tmp);
g_free (timezone);
g_free (str);
@@ -175,8 +175,8 @@ add_string_to_rdf (xmlNodePtr node, const gchar *tag, const char *value)
{
if (value) {
xmlNodePtr cur_node = NULL;
- cur_node = xmlNewChild (node, NULL, tag, value);
- xmlSetProp (cur_node, "rdf:datatype", "http://www.w3.org/2001/XMLSchema#string");
+ cur_node = xmlNewChild (node, NULL, (unsigned char *)tag, (unsigned char *)value);
+ xmlSetProp (cur_node, (const unsigned char *)"rdf:datatype", (const unsigned char *)"http://www.w3.org/2001/XMLSchema#string");
}
}
@@ -241,34 +241,34 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
xmlDocPtr doc = xmlNewDoc((xmlChar *) "1.0");
xmlNodePtr fnode = doc->children;
- doc->children = xmlNewDocNode (doc, NULL, "rdf:RDF", NULL);
- xmlSetProp (doc->children, "xmlns:rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
- xmlSetProp (doc->children, "xmlns", "http://www.w3.org/2002/12/cal/ical#");
+ doc->children = xmlNewDocNode (doc, NULL, (const unsigned char *)"rdf:RDF", NULL);
+ xmlSetProp (doc->children, (const unsigned char *)"xmlns:rdf", (const unsigned char *)"http://www.w3.org/1999/02/22-rdf-syntax-ns#");
+ xmlSetProp (doc->children, (const unsigned char *)"xmlns", (const unsigned char *)"http://www.w3.org/2002/12/cal/ical#");
- fnode = xmlNewChild (doc->children, NULL, "Vcalendar", NULL);
+ fnode = xmlNewChild (doc->children, NULL, (const unsigned char *)"Vcalendar", NULL);
/* Should Evolution publicise these? */
- xmlSetProp (fnode, "xmlns:x-wr", "http://www.w3.org/2002/12/cal/prod/Apple_Comp_628d9d8459c556fa#");
- xmlSetProp (fnode, "xmlns:x-lic", "http://www.w3.org/2002/12/cal/prod/Apple_Comp_628d9d8459c556fa#");
+ xmlSetProp (fnode, (const unsigned char *)"xmlns:x-wr", (const unsigned char *)"http://www.w3.org/2002/12/cal/prod/Apple_Comp_628d9d8459c556fa#");
+ xmlSetProp (fnode, (const unsigned char *)"xmlns:x-lic", (const unsigned char *)"http://www.w3.org/2002/12/cal/prod/Apple_Comp_628d9d8459c556fa#");
/* Not sure if it's correct like this */
- xmlNewChild (fnode, NULL, "prodid", "-//" PACKAGE_STRING "//iCal 1.0//EN");
+ xmlNewChild (fnode, NULL, (const unsigned char *)"prodid", (const unsigned char *)"-//" PACKAGE_STRING "//iCal 1.0//EN");
/* Assuming GREGORIAN is the only supported calendar scale */
- xmlNewChild (fnode, NULL, "calscale", "GREGORIAN");
+ xmlNewChild (fnode, NULL, (const unsigned char *)"calscale", (const unsigned char *)"GREGORIAN");
temp = calendar_config_get_timezone ();
- xmlNewChild (fnode, NULL, "x-wr:timezone", temp);
+ xmlNewChild (fnode, NULL, (const unsigned char *)"x-wr:timezone", (unsigned char *)temp);
g_free (temp);
- xmlNewChild (fnode, NULL, "method", "PUBLISH");
+ xmlNewChild (fnode, NULL, (const unsigned char *)"method", (const unsigned char *)"PUBLISH");
- xmlNewChild (fnode, NULL, "x-wr:relcalid", e_source_peek_uid (primary_source));
+ xmlNewChild (fnode, NULL, (const unsigned char *)"x-wr:relcalid", (unsigned char *)e_source_peek_uid (primary_source));
- xmlNewChild (fnode, NULL, "x-wr:calname", e_source_peek_name (primary_source));
+ xmlNewChild (fnode, NULL, (const unsigned char *)"x-wr:calname", (unsigned char *)e_source_peek_name (primary_source));
/* Version of this RDF-format */
- xmlNewChild (fnode, NULL, "version", "2.0");
+ xmlNewChild (fnode, NULL, (const unsigned char *)"version", (const unsigned char *)"2.0");
while (objects != NULL) {
ECalComponent *comp = objects->data;
@@ -279,13 +279,13 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
struct icaltimetype *temp_time;
int *temp_int;
ECalComponentText temp_comptext;
- xmlNodePtr c_node = xmlNewChild (fnode, NULL, "component", NULL);
- xmlNodePtr node = xmlNewChild (c_node, NULL, "Vevent", NULL);
+ xmlNodePtr c_node = xmlNewChild (fnode, NULL, (const unsigned char *)"component", NULL);
+ xmlNodePtr node = xmlNewChild (c_node, NULL, (const unsigned char *)"Vevent", NULL);
/* Getting the stuff */
e_cal_component_get_uid (comp, &temp_constchar);
tmp_str = g_strdup_printf ("#%s", temp_constchar);
- xmlSetProp (node, "about", tmp_str);
+ xmlSetProp (node, (const unsigned char *)"about", (unsigned char *)tmp_str);
g_free (tmp_str);
add_string_to_rdf (node, "uid",temp_constchar);