Changeset 644

Timestamp:

07/26/05 22:00:46 (3 years ago)

Author:

jajcus

Message:

- user file format version marker
- workaround for buggy user files (wrong subscription) created by jggtrans 2.2.0
- fixed handling od pretty-formated XML files

Files:

• trunk/src/users.c (modified) (7 diffs)
• trunk/src/users.h (modified) (1 diff)

trunk/src/users.c

@@ -23 +23 @@
-#include <time.h>
-#include <locale.h>
+#include <stdlib.h>
-#include "ggtrans.h"
-#include "jabber.h"
@@ -155 +156 @@
-        }
-        xml=xmlnode_new_tag("user");
+        tag=xmlnode_insert_tag(xml,"version");
+        str=g_strdup_printf("%08x",USER_FILE_FORMAT_VERSION);
+        xmlnode_put_attrib(tag,"file_format",str);
+        g_free(str);
-        tag=xmlnode_insert_tag(xml,"jid");
-        xmlnode_insert_cdata(tag,u->jid,-1);
@@ -253 +258 @@
-char *status,*offline_status,*invisible_status;
-int last_sys_msg=0,invisible=0,friends_only=0,ignore_unknown=0;
+unsigned int file_format_version=0;
-User *u;
-GList *contacts;
@@ -273 +279 @@
-        }
-        g_free(fn);
+        tag=xmlnode_get_tag(xml,"jid");
+        if (tag!=NULL) {
+                p=xmlnode_get_data(tag);
+                if (p!=NULL) file_format_version=(unsigned int)strtol(p,NULL,16);
+        }
-        tag=xmlnode_get_tag(xml,"jid");
-        if (tag!=NULL) ujid=xmlnode_get_data(tag);
@@ -333 +344 @@
-
-                for(t=xmlnode_get_firstchild(tag);t;t=xmlnode_get_nextsibling(t)){
-
+
+
+
+
-                                char *d;
-                                int uin;
@@ -348 +362 @@
-                                continue;
-                        }
-xmlnode_get_name(t)
+node_name
-                                char *d;
-                                int uin;
@@ -375 +389 @@
-                                                        break;
-                                                case 't':
-
+
+
+
+
+
+
+
+
+
-                                                        break;
-                                                case 'b':

trunk/src/users.h

@@ -22 +22 @@
-
-#include <libgadu.h>
+
+#define USER_FILE_FORMAT_VERSION 0x02020001U   /* first change after 2.2.0 */
-
-typedef enum subscription_type_e {