diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-22 21:37:26 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-22 21:37:26 +0800 |
| commit | 6843cf006192fecf2382b1dd87a2fb8531a34b5f (patch) | |
| tree | 385719873f29bdc6c90f536df9a87efc2700a2be /libempathy/empathy-status-presets.c | |
| parent | a6eb75f8fddea5331c938c1ce42d08f962275f97 (diff) | |
| parent | a28c3a40ece7da5304ca084e1f30d26dbf006b56 (diff) | |
| download | gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.gz gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.bz2 gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.lz gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.xz gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.zst gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.zip | |
Merge branch 'trivia'
Diffstat (limited to 'libempathy/empathy-status-presets.c')
| -rw-r--r-- | libempathy/empathy-status-presets.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c index 1fa991b0b..255f7ab21 100644 --- a/libempathy/empathy-status-presets.c +++ b/libempathy/empathy-status-presets.c @@ -127,7 +127,7 @@ status_presets_file_parse (const gchar *filename) } status = (gchar *) xmlNodeGetContent (node); - state_str = (gchar *) xmlGetProp (node, "presence"); + state_str = (gchar *) xmlGetProp (node, (const xmlChar *) "presence"); if (state_str) { state = empathy_presence_from_str (state_str); @@ -208,19 +208,19 @@ status_presets_file_save (void) file = g_build_filename (dir, STATUS_PRESETS_XML_FILENAME, NULL); g_free (dir); - doc = xmlNewDoc ("1.0"); - root = xmlNewNode (NULL, "presets"); + doc = xmlNewDoc ((const xmlChar *) "1.0"); + root = xmlNewNode (NULL, (const xmlChar *) "presets"); xmlDocSetRootElement (doc, root); if (default_preset) { xmlNodePtr subnode; xmlChar *state; - state = (gchar *) empathy_presence_to_str (default_preset->state); + state = (xmlChar *) empathy_presence_to_str (default_preset->state); - subnode = xmlNewTextChild (root, NULL, "default", - default_preset->status); - xmlNewProp (subnode, "presence", state); + subnode = xmlNewTextChild (root, NULL, (const xmlChar *) "default", + (const xmlChar *) default_preset->status); + xmlNewProp (subnode, (const xmlChar *) "presence", state); } for (l = presets; l; l = l->next) { @@ -229,7 +229,7 @@ status_presets_file_save (void) xmlChar *state; sp = l->data; - state = (gchar *) empathy_presence_to_str (sp->state); + state = (xmlChar *) empathy_presence_to_str (sp->state); count[sp->state]++; if (count[sp->state] > STATUS_PRESETS_MAX_EACH) { @@ -237,8 +237,8 @@ status_presets_file_save (void) } subnode = xmlNewTextChild (root, NULL, - "status", sp->status); - xmlNewProp (subnode, "presence", state); + (const xmlChar *) "status", (const xmlChar *) sp->status); + xmlNewProp (subnode, (const xmlChar *) "presence", state); } /* Make sure the XML is indented properly */ |