individual_view_drag_end: remove the auto scroll

[empathy.git] / libempathy-gtk / empathy-plist.c

diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index d7e18448cd6c6f0b9f0b7c8649d0a9019a13e6c6..73d31466ac932481a7394139257a004cfcce01ee 100644 (file)
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this code; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "config.h"
@@ -68,7 +68,7 @@ empathy_plist_parse_real (xmlNode *a_node)
 {
        char *str_val;
        char *end_ptr;
-       gfloat double_val;
+       gdouble double_val;
 
        str_val = (char *) xmlNodeGetContent (a_node);
        double_val = g_ascii_strtod (str_val, &end_ptr);
@@ -78,7 +78,8 @@ empathy_plist_parse_real (xmlNode *a_node)
        }
        xmlFree (str_val);
 
-       return tp_g_value_slice_new_double (double_val);}
+       return tp_g_value_slice_new_double (double_val);
+}
 
 static GValue *
 empathy_plist_parse_boolean (xmlNode *a_node)
@@ -93,7 +94,7 @@ empathy_plist_parse_boolean (xmlNode *a_node)
                return NULL;
        }
 
-       return tp_g_value_slice_new_int (bool_val);
+       return tp_g_value_slice_new_boolean (bool_val);
 }
 
 static GValue *
@@ -123,7 +124,7 @@ empathy_plist_parse_one_dict_entry (xmlNode *a_node, GHashTable *dict)
        GValue *value;
 
        while (cur_node &&
-              (xmlStrcmp(cur_node->name, (xmlChar *) "key") != 0)) {
+              (xmlStrcmp (cur_node->name, (xmlChar *) "key") != 0)) {
                cur_node = cur_node->next;
        }
        if (!cur_node) {
@@ -292,8 +293,7 @@ empathy_plist_parse_from_file (const char *filename)
 
        parsed_doc = empathy_plist_parse (root_element);
 
-       xmlFreeDoc(doc);
-       xmlCleanupParser();
+       xmlFreeDoc (doc);
 
        return parsed_doc;
 }
@@ -327,8 +327,7 @@ empathy_plist_parse_from_memory (const char *data, gsize len)
 
        parsed_doc = empathy_plist_parse (root_element);
 
-       xmlFreeDoc(doc);
-       xmlCleanupParser();
+       xmlFreeDoc (doc);
 
        return parsed_doc;
 }