Mercurial > pidgin.yaz
changeset 10443:b6ca0e1b19d0
[gaim-migrate @ 11703]
Shuffle some things around in prefs.c and use xmlnode/the util function
for saving prefs. Now all our xml files are written to disk at once,
with gobs of error detection. If anyone complains about losing their
config file with 2.x, send them to me. Muwha ha ha ha ha. Ha. Heh. Sigh.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 28 Dec 2004 19:11:15 +0000 |
| parents | 937697da5233 |
| children | 6bf9b17c03a5 |
| files | src/account.c src/gtkconv.c src/notify.h src/prefs.c src/prefs.h src/protocols/silc/silc.c |
| diffstat | 6 files changed, 866 insertions(+), 772 deletions(-) [+] |
line wrap: on
line diff
--- a/src/account.c Tue Dec 28 17:38:03 2004 +0000 +++ b/src/account.c Tue Dec 28 19:11:15 2004 +0000 @@ -257,8 +257,9 @@ if (!accounts_loaded) { - gaim_debug_error("accounts", "Attempted to save accounts before they " - "were read!\n"); + gaim_debug_error("accounts", "Attempted to save accounts before " + "they were read!\n"); + return; } node = accounts_to_xmlnode();
--- a/src/gtkconv.c Tue Dec 28 17:38:03 2004 +0000 +++ b/src/gtkconv.c Tue Dec 28 19:11:15 2004 +0000 @@ -5891,5 +5891,6 @@ void gaim_gtk_conversations_uninit(void) { + gaim_prefs_disconnect_by_handle(gaim_gtk_conversations_get_handle()); gaim_signals_unregister_by_instance(gaim_gtk_conversations_get_handle()); }
--- a/src/notify.h Tue Dec 28 17:38:03 2004 +0000 +++ b/src/notify.h Tue Dec 28 19:11:15 2004 +0000 @@ -190,7 +190,7 @@ * will be "Search Results." * @param primary The main point of the message. * @param secondary The secondary information. - * @param results An array of null-terminated buddy names. + * @param results An null-terminated array of null-terminated buddy names. * @param cb The callback to call when the user closes * the notification. * @param user_data The data to pass to the callback.
--- a/src/prefs.c Tue Dec 28 17:38:03 2004 +0000 +++ b/src/prefs.c Tue Dec 28 19:11:15 2004 +0000 @@ -47,6 +47,7 @@ void *handle; }; +/* TODO: This should use GaimValues? */ struct gaim_pref { GaimPrefType type; char *name; @@ -63,798 +64,161 @@ struct gaim_pref *first_child; }; -static GHashTable *prefs_hash = NULL; -static struct gaim_pref prefs = { GAIM_PREF_NONE, NULL, {NULL}, NULL, - NULL, NULL, NULL }; +static struct gaim_pref prefs = { + GAIM_PREF_NONE, + NULL, + { NULL }, + NULL, + NULL, + NULL, + NULL +}; -static guint prefs_save_timer = 0; -static gboolean prefs_is_loaded = FALSE; +static GHashTable *prefs_hash = NULL; +static guint save_timer = 0; +static gboolean prefs_loaded = FALSE; -static gboolean prefs_save_callback(gpointer who_cares) { - gaim_prefs_sync(); - prefs_save_timer = 0; - return FALSE; -} - -static void schedule_prefs_save() { - if(!prefs_save_timer) - prefs_save_timer = gaim_timeout_add(5000, prefs_save_callback, NULL); -} - -static void prefs_save_cb(const char *name, GaimPrefType type, gpointer val, - gpointer user_data) { - - if(!prefs_is_loaded) - return; - - gaim_debug(GAIM_DEBUG_MISC, "prefs", "%s changed, scheduling save.\n", name); - - schedule_prefs_save(); -} - -void gaim_prefs_init() { - prefs_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); - - gaim_prefs_connect_callback(NULL, "/", prefs_save_cb, NULL); - - gaim_prefs_add_none("/core"); - gaim_prefs_add_none("/plugins"); - gaim_prefs_add_none("/plugins/core"); - gaim_prefs_add_none("/plugins/lopl"); - gaim_prefs_add_none("/plugins/prpl"); - - /* Away */ - gaim_prefs_add_none("/core/away"); - gaim_prefs_add_bool("/core/away/away_when_idle", TRUE); - gaim_prefs_add_int("/core/away/mins_before_away", 5); - /* XXX: internationalized string in prefs...evil */ - gaim_prefs_add_string("/core/away/default_message", - _("Slightly less boring default")); - - /* Away -> Auto-Reply */ - if (!gaim_prefs_exists("/core/away/auto_response/enabled") || - !gaim_prefs_exists("/core/away/auto_response/idle_only")) { - gaim_prefs_add_string("/core/away/auto_reply", "awayidle"); - } else { - if (!gaim_prefs_get_bool("/core/away/auto_response/enabled")) { - gaim_prefs_add_string("/core/away/auto_reply", "never"); - } else { - if (gaim_prefs_get_bool("/core/away/auto_response/idle_only")) { - gaim_prefs_add_string("/core/away/auto_reply", "awayidle"); - } else { - gaim_prefs_add_string("/core/away/auto_reply", "away"); - } - } - } - - /* Buddies */ - gaim_prefs_add_none("/core/buddies"); - - /* Contact Priority Settings */ - gaim_prefs_add_none("/core/contact"); - gaim_prefs_add_bool("/core/contact/last_match", FALSE); - gaim_prefs_add_int("/core/contact/offline_score", 4); - gaim_prefs_add_int("/core/contact/away_score", 2); - gaim_prefs_add_int("/core/contact/idle_score", 1); -} - -void -gaim_prefs_uninit() -{ - if (prefs_save_timer != 0) { - gaim_timeout_remove(prefs_save_timer); - prefs_save_timer = 0; - gaim_prefs_sync(); - } -} +/********************************************************************* + * Private utility functions * + *********************************************************************/ -static char * -get_path_dirname(const char *name) -{ - char *c, *str; - - str = g_strdup(name); - - if ((c = strrchr(str, '/')) != NULL) { - *c = '\0'; - - if (*str == '\0') { - g_free(str); - - str = g_strdup("/"); - } - } - else { - g_free(str); - - str = g_strdup("."); - } - - return str; -} - -static char * -get_path_basename(const char *name) +static struct +gaim_pref *find_pref(const char *name) { - const char *c; - - if ((c = strrchr(name, '/')) != NULL) - return g_strdup(c + 1); - - return g_strdup(name); -} - -static char *pref_full_name(struct gaim_pref *pref) { - GString *name; - struct gaim_pref *parent; - char *ret; - - if(!pref) + if (!name || name[0] != '/') return NULL; - - if(pref == &prefs) - return g_strdup("/"); - - name = g_string_new(pref->name); - parent = pref->parent; - - for(parent = pref->parent; parent && parent->name; parent = parent->parent) { - name = g_string_prepend_c(name, '/'); - name = g_string_prepend(name, parent->name); - } - ret = name->str; - g_string_free(name, FALSE); - return ret; -} - -static struct gaim_pref *find_pref(const char *name) -{ - if(!name || name[0] != '/') { - return NULL; - } else if(name[1] == '\0') { + else if (name[1] == '\0') return &prefs; - } else { + else return g_hash_table_lookup(prefs_hash, name); - } -} - -static struct gaim_pref *find_pref_parent(const char *name) -{ - char *parent_name = get_path_dirname(name); - struct gaim_pref *ret = &prefs; - - if(strcmp(parent_name, "/")) { - ret = find_pref(parent_name); - } - - g_free(parent_name); - return ret; } -static void free_pref_value(struct gaim_pref *pref) { - switch(pref->type) { - case GAIM_PREF_BOOLEAN: - pref->value.boolean = FALSE; - break; - case GAIM_PREF_INT: - pref->value.integer = 0; - break; - case GAIM_PREF_STRING: - g_free(pref->value.string); - pref->value.string = NULL; - break; - case GAIM_PREF_STRING_LIST: - { - GList *tmp; - for(tmp = pref->value.stringlist; tmp; tmp = tmp->next) - g_free(tmp->data); + +/********************************************************************* + * Writing to disk * + *********************************************************************/ + +/* + * This function recursively creates the xmlnode tree from the prefs + * tree structure. Yay recursion! + */ +void +pref_to_xmlnode(xmlnode *parent, struct gaim_pref *pref) +{ + xmlnode *node, *childnode; + struct gaim_pref *child; + char buf[20]; + GList *cur; - g_list_free(pref->value.stringlist); - } break; - case GAIM_PREF_NONE: - break; - } -} + /* Create a new node */ + node = xmlnode_new_child(parent, "pref"); + xmlnode_set_attrib(node, "name", pref->name); -static struct gaim_pref *add_pref(GaimPrefType type, const char *name) { - struct gaim_pref *parent; - struct gaim_pref *me; - struct gaim_pref *sibling; - char *my_name; - - parent = find_pref_parent(name); - - if(!parent) - return NULL; - - my_name = get_path_basename(name); - - for(sibling = parent->first_child; sibling; sibling = sibling->sibling) { - if(!strcmp(sibling->name, my_name)) { - g_free(my_name); - return NULL; + /* Set the type of this node (if type == GAIM_PREF_NONE then do nothing) */ + if (pref->type == GAIM_PREF_INT) { + xmlnode_set_attrib(node, "type", "int"); + snprintf(buf, sizeof(buf), "%d", pref->value.integer); + xmlnode_set_attrib(node, "value", buf); + } + else if (pref->type == GAIM_PREF_STRING) { + xmlnode_set_attrib(node, "type", "string"); + xmlnode_set_attrib(node, "value", pref->value.string); + } + else if (pref->type == GAIM_PREF_STRING_LIST) { + xmlnode_set_attrib(node, "type", "stringlist"); + for (cur = pref->value.stringlist; cur != NULL; cur = cur->next) + { + childnode = xmlnode_new_child(node, "item"); + xmlnode_set_attrib(childnode, "value", cur->data); } } - - me = g_new0(struct gaim_pref, 1); - me->type = type; - me->name = my_name; - - me->parent = parent; - if(parent->first_child) { - /* blatant abuse of a for loop */ - for(sibling = parent->first_child; sibling->sibling; - sibling = sibling->sibling); - sibling->sibling = me; - } else { - parent->first_child = me; + else if (pref->type == GAIM_PREF_BOOLEAN) { + xmlnode_set_attrib(node, "type", "bool"); + snprintf(buf, sizeof(buf), "%d", pref->value.boolean); + xmlnode_set_attrib(node, "value", buf); } - g_hash_table_insert(prefs_hash, g_strdup(name), (gpointer)me); - - return me; -} - -void gaim_prefs_add_none(const char *name) { - add_pref(GAIM_PREF_NONE, name); -} - -void gaim_prefs_add_bool(const char *name, gboolean value) { - struct gaim_pref *pref = add_pref(GAIM_PREF_BOOLEAN, name); - - if(!pref) - return; - - pref->value.boolean = value; -} - -void gaim_prefs_add_int(const char *name, int value) { - struct gaim_pref *pref = add_pref(GAIM_PREF_INT, name); - - if(!pref) - return; - - pref->value.integer = value; + /* All My Children */ + for (child = pref->first_child; child != NULL; child = child->sibling) + pref_to_xmlnode(node, child); } -void gaim_prefs_add_string(const char *name, const char *value) { - struct gaim_pref *pref = add_pref(GAIM_PREF_STRING, name); +static xmlnode * +prefs_to_xmlnode(void) +{ + xmlnode *node; + struct gaim_pref *pref, *child; - if(!pref) - return; - - pref->value.string = g_strdup(value); -} + pref = &prefs; -void gaim_prefs_add_string_list(const char *name, GList *value) { - struct gaim_pref *pref = add_pref(GAIM_PREF_STRING_LIST, name); - GList *tmp; + /* Create the root preference node */ + node = xmlnode_new("pref"); + xmlnode_set_attrib(node, "version", "1"); + xmlnode_set_attrib(node, "name", "/"); - if(!pref) - return; + /* All My Children */ + for (child = pref->first_child; child != NULL; child = child->sibling) + pref_to_xmlnode(node, child); - for(tmp = value; tmp; tmp = tmp->next) - pref->value.stringlist = g_list_append(pref->value.stringlist, - g_strdup(tmp->data)); + return node; } -void remove_pref(struct gaim_pref *pref) { - char *name; - - if(!pref || pref == &prefs) - return; - - while(pref->first_child) - remove_pref(pref->first_child); - - if(pref->parent->first_child == pref) { - pref->parent->first_child = pref->sibling; - } else { - struct gaim_pref *sib = pref->parent->first_child; - while(sib->sibling != pref) - sib = sib->sibling; - sib->sibling = pref->sibling; - } - - name = pref_full_name(pref); - - gaim_debug(GAIM_DEBUG_INFO, "prefs", "removing pref /%s\n", name); - - g_hash_table_remove(prefs_hash, name); - g_free(name); - - free_pref_value(pref); - - g_slist_free(pref->callbacks); - g_free(pref->name); - g_free(pref); -} - -void gaim_prefs_remove(const char *name) { - struct gaim_pref *pref = find_pref(name); +static void +sync_prefs(void) +{ + xmlnode *node; + char *data; - if(!pref) - return; - - remove_pref(pref); -} - -void gaim_prefs_destroy() { - gaim_prefs_remove("/"); -} - -static void do_callbacks(const char* name, struct gaim_pref *pref) { - GSList *cbs; - struct gaim_pref *cb_pref; - for(cb_pref = pref; cb_pref; cb_pref = cb_pref->parent) { - for(cbs = cb_pref->callbacks; cbs; cbs = cbs->next) { - struct pref_cb *cb = cbs->data; - cb->func(name, pref->type, pref->value.generic, cb->data); - } - } -} - -void gaim_prefs_trigger_callback(const char *name) { - struct gaim_pref *pref = find_pref(name); - - if(!pref) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_trigger_callback: Unknown pref %s\n", name); - return; - } - - do_callbacks(name, pref); -} - -void gaim_prefs_set_generic(const char *name, gpointer value) { - struct gaim_pref *pref = find_pref(name); - - if(!pref) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_set_generic: Unknown pref %s\n", name); + if (!prefs_loaded) + { + /* + * TODO: Call schedule_prefs_save()? Ideally we wouldn't need to. + * (prefs.xml should be loaded when gaim_prefs_init is called) + */ + gaim_debug_error("prefs", "Attempted to save prefs before " + "they were read!\n"); return; } - pref->value.generic = value; - do_callbacks(name, pref); -} - -void gaim_prefs_set_bool(const char *name, gboolean value) { - struct gaim_pref *pref = find_pref(name); - - if(pref) { - if(pref->type != GAIM_PREF_BOOLEAN) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_set_bool: %s not a boolean pref\n", name); - return; - } - - if(pref->value.boolean != value) { - pref->value.boolean = value; - do_callbacks(name, pref); - } - } else { - gaim_prefs_add_bool(name, value); - } -} - -void gaim_prefs_set_int(const char *name, int value) { - struct gaim_pref *pref = find_pref(name); - - if(pref) { - if(pref->type != GAIM_PREF_INT) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_set_int: %s not an integer pref\n", name); - return; - } - - if(pref->value.integer != value) { - pref->value.integer = value; - do_callbacks(name, pref); - } - } else { - gaim_prefs_add_int(name, value); - } + node = prefs_to_xmlnode(); + data = xmlnode_to_formatted_str(node, NULL); + gaim_util_write_data_to_file("prefs.xml", data, -1); + g_free(data); + xmlnode_free(node); } -void gaim_prefs_set_string(const char *name, const char *value) { - struct gaim_pref *pref = find_pref(name); - - if(pref) { - if(pref->type != GAIM_PREF_STRING) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_set_string: %s not a string pref\n", name); - return; - } - - if((value && !pref->value.string) || - (!value && pref->value.string) || - strcmp(pref->value.string, value)) { - g_free(pref->value.string); - pref->value.string = g_strdup(value); - do_callbacks(name, pref); - } - } else { - gaim_prefs_add_string(name, value); - } -} - -void gaim_prefs_set_string_list(const char *name, GList *value) { - struct gaim_pref *pref = find_pref(name); - if(pref) { - GList *tmp; - - if(pref->type != GAIM_PREF_STRING_LIST) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_set_string_list: %s not a string list pref\n", - name); - return; - } - - for(tmp = pref->value.stringlist; tmp; tmp = tmp->next) - g_free(tmp->data); - - g_list_free(pref->value.stringlist); - pref->value.stringlist = NULL; - - for(tmp = value; tmp; tmp = tmp->next) - pref->value.stringlist = g_list_append(pref->value.stringlist, - g_strdup(tmp->data)); - - do_callbacks(name, pref); - - } else { - gaim_prefs_add_string_list(name, value); - } -} - -gboolean gaim_prefs_exists(const char *name) { - struct gaim_pref *pref = find_pref(name); - - if (pref != NULL) - return TRUE; - +static gboolean +save_cb(gpointer data) +{ + sync_prefs(); + save_timer = 0; return FALSE; } -GaimPrefType gaim_prefs_get_type(const char *name) { - struct gaim_pref *pref = find_pref(name); - - if (pref == NULL) - return GAIM_PREF_NONE; - - return (pref->type); -} - -gboolean gaim_prefs_get_bool(const char *name) { - struct gaim_pref *pref = find_pref(name); - - if(!pref) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_get_bool: Unknown pref %s\n", name); - return FALSE; - } else if(pref->type != GAIM_PREF_BOOLEAN) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_get_bool: %s not a boolean pref\n", name); - return FALSE; - } - - return pref->value.boolean; -} - -int gaim_prefs_get_int(const char *name) { - struct gaim_pref *pref = find_pref(name); - - if(!pref) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_get_int: Unknown pref %s\n", name); - return 0; - } else if(pref->type != GAIM_PREF_INT) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_get_int: %s not an integer pref\n", name); - return 0; - } - - return pref->value.integer; -} - -const char *gaim_prefs_get_string(const char *name) { - struct gaim_pref *pref = find_pref(name); - - if(!pref) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_get_string: Unknown pref %s\n", name); - return NULL; - } else if(pref->type != GAIM_PREF_STRING) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_get_string: %s not a string pref\n", name); - return NULL; - } - - return pref->value.string; -} - -GList *gaim_prefs_get_string_list(const char *name) { - struct gaim_pref *pref = find_pref(name); - GList *ret = NULL, *tmp; - - if(!pref) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_get_string_list: Unknown pref %s\n", name); - return NULL; - } else if(pref->type != GAIM_PREF_STRING_LIST) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", - "gaim_prefs_get_string_list: %s not a string list pref\n", name); - return NULL; - } - - for(tmp = pref->value.stringlist; tmp; tmp = tmp->next) - ret = g_list_append(ret, g_strdup(tmp->data)); - - return ret; -} - -void gaim_prefs_rename(const char *oldname, const char *newname) { - struct gaim_pref *oldpref, *newpref; - - oldpref = find_pref(oldname); - newpref = find_pref(newname); - - /* it's already been renamed, call off the dogs */ - if(!oldpref) - return; - - gaim_debug_info("prefs", "Renaming %s to %s\n", oldname, newname); - - g_return_if_fail(newpref != NULL); /* the new one needs to be created first */ - g_return_if_fail(oldpref->type == newpref->type); - g_return_if_fail(oldpref->first_child == NULL); /* can't rename parents */ - - switch(oldpref->type) { - case GAIM_PREF_NONE: - break; - case GAIM_PREF_BOOLEAN: - gaim_prefs_set_bool(newname, oldpref->value.boolean); - break; - case GAIM_PREF_INT: - gaim_prefs_set_int(newname, oldpref->value.integer); - break; - case GAIM_PREF_STRING: - gaim_prefs_set_string(newname, oldpref->value.string); - break; - case GAIM_PREF_STRING_LIST: - gaim_prefs_set_string_list(newname, oldpref->value.stringlist); - break; - } - - remove_pref(oldpref); -} - -void gaim_prefs_rename_boolean_toggle(const char *oldname, const char *newname) { - struct gaim_pref *oldpref, *newpref; - - gaim_debug_info("prefs", "Attempting to rename and toggle %s to %s\n", oldname, newname); - - oldpref = find_pref(oldname); - newpref = find_pref(newname); - - /* it's already been renamed, call off the cats */ - if(!oldpref) - return; - - g_return_if_fail(newpref != NULL); /* the new one needs to be created */ - g_return_if_fail(oldpref->type == newpref->type); - g_return_if_fail(oldpref->type == GAIM_PREF_BOOLEAN); - g_return_if_fail(oldpref->first_child == NULL); /* can't rename parents */ - - gaim_prefs_set_bool(newname, !(oldpref->value.boolean)); - - remove_pref(oldpref); - -} - -guint gaim_prefs_connect_callback(void *handle, const char *name, GaimPrefCallback func, gpointer data) +static void +schedule_prefs_save(void) { - struct gaim_pref *pref; - struct pref_cb *cb; - static guint cb_id = 0; - - pref = find_pref(name); - if (pref == NULL) - return 0; - - cb = g_new0(struct pref_cb, 1); - - cb->func = func; - cb->data = data; - cb->id = ++cb_id; - cb->handle = handle; - - pref->callbacks = g_slist_append(pref->callbacks, cb); - - return cb->id; + if (save_timer == 0) + save_timer = gaim_timeout_add(5000, save_cb, NULL); } -static gboolean disco_callback_helper(struct gaim_pref *pref, guint callback_id) { - GSList *cbs; - struct gaim_pref *child; - if(!pref) - return FALSE; - - for(cbs = pref->callbacks; cbs; cbs = cbs->next) { - struct pref_cb *cb = cbs->data; - if(cb->id == callback_id) { - pref->callbacks = g_slist_remove(pref->callbacks, cb); - g_free(cb); - return TRUE; - } - } - - for(child = pref->first_child; child; child = child->sibling) { - if(disco_callback_helper(child, callback_id)) - return TRUE; - } - - return FALSE; -} - -void gaim_prefs_disconnect_callback(guint callback_id) { - disco_callback_helper(&prefs, callback_id); -} - -static void disco_callback_helper_handle(struct gaim_pref *pref, void *handle) { - GSList *cbs; - struct gaim_pref *child; - - if(!pref) - return; - - cbs = pref->callbacks; - while (cbs != NULL) { - struct pref_cb *cb = cbs->data; - if(cb->handle == handle) { - pref->callbacks = g_slist_remove(pref->callbacks, cb); - g_free(cb); - cbs = pref->callbacks; - } else - cbs = cbs->next; - } - - for(child = pref->first_child; child; child = child->sibling) - disco_callback_helper_handle(child, handle); -} - -void gaim_prefs_disconnect_by_handle(void *handle) { - g_return_if_fail(handle != NULL); - disco_callback_helper_handle(&prefs, handle); -} - -static void gaim_prefs_write(FILE *f, struct gaim_pref *pref, int depth) { - struct gaim_pref *tmp; - char *esc; - int i; - - if(!pref) { - pref = &prefs; - - fprintf(f, "<?xml version='1.0' encoding='UTF-8' ?>\n\n"); - fprintf(f, "<pref version='1.0' name='/'"); - } else { - for(i=0; i<depth; i++) - fprintf(f, "\t"); - esc = g_markup_escape_text(pref->name, -1); - fprintf(f, "<pref name='%s'", esc); - g_free(esc); - } - - switch(pref->type) { - case GAIM_PREF_NONE: - break; - case GAIM_PREF_BOOLEAN: - fprintf(f, " type='bool' value='%d'", pref->value.boolean); - break; - case GAIM_PREF_INT: - fprintf(f, " type='int' value='%d'", pref->value.integer); - break; - case GAIM_PREF_STRING: - esc = g_markup_escape_text(pref->value.string, -1); - fprintf(f, " type='string' value='%s'", esc); - g_free(esc); - break; - case GAIM_PREF_STRING_LIST: - fprintf(f, " type='stringlist'"); - break; - } - - if(pref->first_child || pref->type == GAIM_PREF_STRING_LIST) { - fprintf(f, ">\n"); - - for(tmp = pref->first_child; tmp; tmp = tmp->sibling) - gaim_prefs_write(f, tmp, depth+1); - - if(pref->type == GAIM_PREF_STRING_LIST) { - GList *tmp2; - for(tmp2 = pref->value.stringlist; tmp2; tmp2 = tmp2->next) { - for(i=0; i<depth+1; i++) - fprintf(f, "\t"); - esc = g_markup_escape_text(tmp2->data, -1); - fprintf(f, "<item value='%s' />\n", esc); - g_free(esc); - } - } - - for(i=0; i<depth; i++) - fprintf(f, "\t"); - fprintf(f, "</pref>\n"); - } else { - fprintf(f, " />\n"); - } -} - -void gaim_prefs_sync() { - FILE *file; - struct stat st; - const char *user_dir = gaim_user_dir(); - char *filename; - char *filename_real; - - if(!prefs_is_loaded) { - gaim_debug(GAIM_DEBUG_WARNING, "prefs", "prefs saved before loading! scheduling save.\n"); - schedule_prefs_save(); /* schedule a save for after we read in */ - return; - } - - if(!user_dir) - return; - - gaim_debug(GAIM_DEBUG_INFO, "prefs", "writing prefs out to disk.\n"); - - file = fopen(user_dir, "r"); - if(!file) - mkdir(user_dir, S_IRUSR | S_IWUSR | S_IXUSR); - else - fclose(file); - - filename = g_build_filename(user_dir, "prefs.xml.save", NULL); - - if((file = fopen(filename, "w"))) { - gaim_prefs_write(file, NULL, 0); - fclose(file); - chmod(filename, S_IRUSR | S_IWUSR); - } else { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", "Unable to write %s\n", - filename); - g_free(filename); - return; - } - - if (stat(filename, &st) || (st.st_size == 0)) { - gaim_debug_error("prefs", "Failed to save prefs\n"); - unlink(filename); - g_free(filename); - return; - } - - filename_real = g_build_filename(user_dir, "prefs.xml", NULL); - if(rename(filename, filename_real) < 0) - gaim_debug(GAIM_DEBUG_ERROR, "prefs", "Error renaming %s to %s\n", - filename, filename_real); - - g_free(filename); - g_free(filename_real); -} +/********************************************************************* + * Reading from disk * + *********************************************************************/ static GList *prefs_stack = NULL; -static void prefs_start_element_handler (GMarkupParseContext *context, +static void +prefs_start_element_handler (GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer user_data, - GError **error) { + GError **error) +{ GaimPrefType pref_type = GAIM_PREF_NONE; int i; const char *pref_name = NULL, *pref_value = NULL; @@ -934,8 +298,11 @@ } } -static void prefs_end_element_handler(GMarkupParseContext *context, - const gchar *element_name, gpointer user_data, GError **error) { +static void +prefs_end_element_handler(GMarkupParseContext *context, + const gchar *element_name, + gpointer user_data, GError **error) +{ if(prefs_stack && !strcmp(element_name, "pref")) { g_free(prefs_stack->data); prefs_stack = g_list_delete_link(prefs_stack, prefs_stack); @@ -950,7 +317,9 @@ NULL }; -gboolean gaim_prefs_load() { +gboolean +gaim_prefs_load() +{ gchar *filename = g_build_filename(gaim_user_dir(), "prefs.xml", NULL); gchar *contents = NULL; gsize length; @@ -958,11 +327,11 @@ GError *error = NULL; if (!filename) { - prefs_is_loaded = TRUE; + prefs_loaded = TRUE; return FALSE; } - gaim_debug(GAIM_DEBUG_INFO, "prefs", "Reading %s\n", filename); + gaim_debug_info("prefs", "Reading %s\n", filename); if(!g_file_get_contents(filename, &contents, &length, &error)) { #ifndef _WIN32 @@ -973,23 +342,23 @@ filename = g_build_filename(SYSCONFDIR, "gaim", "prefs.xml", NULL); - gaim_debug(GAIM_DEBUG_INFO, "prefs", "Reading %s\n", filename); + gaim_debug_info("prefs", "Reading %s\n", filename); if (!g_file_get_contents(filename, &contents, &length, &error)) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", "Error reading prefs: %s\n", + gaim_debug_error("prefs", "Error reading prefs: %s\n", error->message); g_error_free(error); g_free(filename); - prefs_is_loaded = TRUE; + prefs_loaded = TRUE; return FALSE; } #else /* _WIN32 */ - gaim_debug(GAIM_DEBUG_ERROR, "prefs", "Error reading prefs: %s\n", + gaim_debug_error("prefs", "Error reading prefs: %s\n", error->message); g_error_free(error); g_free(filename); - prefs_is_loaded = TRUE; + prefs_loaded = TRUE; return FALSE; #endif /* _WIN32 */ @@ -1001,31 +370,682 @@ g_markup_parse_context_free(context); g_free(contents); g_free(filename); - prefs_is_loaded = TRUE; + prefs_loaded = TRUE; return FALSE; } if(!g_markup_parse_context_end_parse(context, NULL)) { - gaim_debug(GAIM_DEBUG_ERROR, "prefs", "Error parsing %s\n", filename); + gaim_debug_error("prefs", "Error parsing %s\n", filename); g_markup_parse_context_free(context); g_free(contents); g_free(filename); - prefs_is_loaded = TRUE; + prefs_loaded = TRUE; return FALSE; } - gaim_debug(GAIM_DEBUG_INFO, "prefs", "Finished reading %s\n", filename); + gaim_debug_info("prefs", "Finished reading %s\n", filename); g_markup_parse_context_free(context); g_free(contents); g_free(filename); - prefs_is_loaded = TRUE; + prefs_loaded = TRUE; return TRUE; } -void gaim_prefs_update_old() { + + +static void +prefs_save_cb(const char *name, GaimPrefType type, gpointer val, + gpointer user_data) +{ + + if(!prefs_loaded) + return; + + gaim_debug_misc("prefs", "%s changed, scheduling save.\n", name); + + schedule_prefs_save(); +} + +static char * +get_path_dirname(const char *name) +{ + char *c, *str; + + str = g_strdup(name); + + if ((c = strrchr(str, '/')) != NULL) { + *c = '\0'; + + if (*str == '\0') { + g_free(str); + + str = g_strdup("/"); + } + } + else { + g_free(str); + + str = g_strdup("."); + } + + return str; +} + +static char * +get_path_basename(const char *name) +{ + const char *c; + + if ((c = strrchr(name, '/')) != NULL) + return g_strdup(c + 1); + + return g_strdup(name); +} + +static char * +pref_full_name(struct gaim_pref *pref) +{ + GString *name; + struct gaim_pref *parent; + char *ret; + + if(!pref) + return NULL; + + if(pref == &prefs) + return g_strdup("/"); + + name = g_string_new(pref->name); + parent = pref->parent; + + for(parent = pref->parent; parent && parent->name; parent = parent->parent) { + name = g_string_prepend_c(name, '/'); + name = g_string_prepend(name, parent->name); + } + ret = name->str; + g_string_free(name, FALSE); + return ret; +} + +static struct gaim_pref * +find_pref_parent(const char *name) +{ + char *parent_name = get_path_dirname(name); + struct gaim_pref *ret = &prefs; + + if(strcmp(parent_name, "/")) { + ret = find_pref(parent_name); + } + + g_free(parent_name); + return ret; +} + +static void +free_pref_value(struct gaim_pref *pref) +{ + switch(pref->type) { + case GAIM_PREF_BOOLEAN: + pref->value.boolean = FALSE; + break; + case GAIM_PREF_INT: + pref->value.integer = 0; + break; + case GAIM_PREF_STRING: + g_free(pref->value.string); + pref->value.string = NULL; + break; + case GAIM_PREF_STRING_LIST: + { + GList *tmp; + for(tmp = pref->value.stringlist; tmp; tmp = tmp->next) + g_free(tmp->data); + + g_list_free(pref->value.stringlist); + } break; + case GAIM_PREF_NONE: + break; + } +} + +static struct gaim_pref * +add_pref(GaimPrefType type, const char *name) +{ + struct gaim_pref *parent; + struct gaim_pref *me; + struct gaim_pref *sibling; + char *my_name; + + parent = find_pref_parent(name); + + if(!parent) + return NULL; + + my_name = get_path_basename(name); + + for(sibling = parent->first_child; sibling; sibling = sibling->sibling) { + if(!strcmp(sibling->name, my_name)) { + g_free(my_name); + return NULL; + } + } + + me = g_new0(struct gaim_pref, 1); + me->type = type; + me->name = my_name; + + me->parent = parent; + if(parent->first_child) { + /* blatant abuse of a for loop */ + for(sibling = parent->first_child; sibling->sibling; + sibling = sibling->sibling); + sibling->sibling = me; + } else { + parent->first_child = me; + } + + g_hash_table_insert(prefs_hash, g_strdup(name), (gpointer)me); + + return me; +} + +void +gaim_prefs_add_none(const char *name) +{ + add_pref(GAIM_PREF_NONE, name); +} + +void +gaim_prefs_add_bool(const char *name, gboolean value) +{ + struct gaim_pref *pref = add_pref(GAIM_PREF_BOOLEAN, name); + + if(!pref) + return; + + pref->value.boolean = value; +} + +void +gaim_prefs_add_int(const char *name, int value) +{ + struct gaim_pref *pref = add_pref(GAIM_PREF_INT, name); + + if(!pref) + return; + + pref->value.integer = value; +} + +void +gaim_prefs_add_string(const char *name, const char *value) +{ + struct gaim_pref *pref = add_pref(GAIM_PREF_STRING, name); + + if(!pref) + return; + + pref->value.string = g_strdup(value); +} + +void +gaim_prefs_add_string_list(const char *name, GList *value) +{ + struct gaim_pref *pref = add_pref(GAIM_PREF_STRING_LIST, name); + GList *tmp; + + if(!pref) + return; + + for(tmp = value; tmp; tmp = tmp->next) + pref->value.stringlist = g_list_append(pref->value.stringlist, + g_strdup(tmp->data)); +} + +void +remove_pref(struct gaim_pref *pref) +{ + char *name; + + if(!pref || pref == &prefs) + return; + + while(pref->first_child) + remove_pref(pref->first_child); + + if(pref->parent->first_child == pref) { + pref->parent->first_child = pref->sibling; + } else { + struct gaim_pref *sib = pref->parent->first_child; + while(sib->sibling != pref) + sib = sib->sibling; + sib->sibling = pref->sibling; + } + + name = pref_full_name(pref); + + gaim_debug_info("prefs", "removing pref /%s\n", name); + + g_hash_table_remove(prefs_hash, name); + g_free(name); + + free_pref_value(pref); + + g_slist_free(pref->callbacks); + g_free(pref->name); + g_free(pref); +} + +void +gaim_prefs_remove(const char *name) +{ + struct gaim_pref *pref = find_pref(name); + + if(!pref) + return; + + remove_pref(pref); +} + +void +gaim_prefs_destroy() +{ + gaim_prefs_remove("/"); +} + +static void +do_callbacks(const char* name, struct gaim_pref *pref) +{ + GSList *cbs; + struct gaim_pref *cb_pref; + for(cb_pref = pref; cb_pref; cb_pref = cb_pref->parent) { + for(cbs = cb_pref->callbacks; cbs; cbs = cbs->next) { + struct pref_cb *cb = cbs->data; + cb->func(name, pref->type, pref->value.generic, cb->data); + } + } +} + +void +gaim_prefs_trigger_callback(const char *name) +{ + struct gaim_pref *pref = find_pref(name); + + if(!pref) { + gaim_debug_error("prefs", + "gaim_prefs_trigger_callback: Unknown pref %s\n", name); + return; + } + + do_callbacks(name, pref); +} + +void +gaim_prefs_set_generic(const char *name, gpointer value) +{ + struct gaim_pref *pref = find_pref(name); + + if(!pref) { + gaim_debug_error("prefs", + "gaim_prefs_set_generic: Unknown pref %s\n", name); + return; + } + + pref->value.generic = value; + do_callbacks(name, pref); +} + +void +gaim_prefs_set_bool(const char *name, gboolean value) +{ + struct gaim_pref *pref = find_pref(name); + + if(pref) { + if(pref->type != GAIM_PREF_BOOLEAN) { + gaim_debug_error("prefs", + "gaim_prefs_set_bool: %s not a boolean pref\n", name); + return; + } + + if(pref->value.boolean != value) { + pref->value.boolean = value; + do_callbacks(name, pref); + } + } else { + gaim_prefs_add_bool(name, value); + } +} + +void +gaim_prefs_set_int(const char *name, int value) +{ + struct gaim_pref *pref = find_pref(name); + + if(pref) { + if(pref->type != GAIM_PREF_INT) { + gaim_debug_error("prefs", + "gaim_prefs_set_int: %s not an integer pref\n", name); + return; + } + + if(pref->value.integer != value) { + pref->value.integer = value; + do_callbacks(name, pref); + } + } else { + gaim_prefs_add_int(name, value); + } +} + +void +gaim_prefs_set_string(const char *name, const char *value) +{ + struct gaim_pref *pref = find_pref(name); + + if(pref) { + if(pref->type != GAIM_PREF_STRING) { + gaim_debug_error("prefs", + "gaim_prefs_set_string: %s not a string pref\n", name); + return; + } + + if((value && !pref->value.string) || + (!value && pref->value.string) || + strcmp(pref->value.string, value)) { + g_free(pref->value.string); + pref->value.string = g_strdup(value); + do_callbacks(name, pref); + } + } else { + gaim_prefs_add_string(name, value); + } +} + +void +gaim_prefs_set_string_list(const char *name, GList *value) +{ + struct gaim_pref *pref = find_pref(name); + if(pref) { + GList *tmp; + + if(pref->type != GAIM_PREF_STRING_LIST) { + gaim_debug_error("prefs", + "gaim_prefs_set_string_list: %s not a string list pref\n", + name); + return; + } + + for(tmp = pref->value.stringlist; tmp; tmp = tmp->next) + g_free(tmp->data); + + g_list_free(pref->value.stringlist); + pref->value.stringlist = NULL; + + for(tmp = value; tmp; tmp = tmp->next) + pref->value.stringlist = g_list_append(pref->value.stringlist, + g_strdup(tmp->data)); + + do_callbacks(name, pref); + + } else { + gaim_prefs_add_string_list(name, value); + } +} + +gboolean +gaim_prefs_exists(const char *name) +{ + struct gaim_pref *pref = find_pref(name); + + if (pref != NULL) + return TRUE; + + return FALSE; +} + +GaimPrefType +gaim_prefs_get_type(const char *name) +{ + struct gaim_pref *pref = find_pref(name); + + if (pref == NULL) + return GAIM_PREF_NONE; + + return (pref->type); +} + +gboolean +gaim_prefs_get_bool(const char *name) +{ + struct gaim_pref *pref = find_pref(name); + + if(!pref) { + gaim_debug_error("prefs", + "gaim_prefs_get_bool: Unknown pref %s\n", name); + return FALSE; + } else if(pref->type != GAIM_PREF_BOOLEAN) { + gaim_debug_error("prefs", + "gaim_prefs_get_bool: %s not a boolean pref\n", name); + return FALSE; + } + + return pref->value.boolean; +} + +int +gaim_prefs_get_int(const char *name) +{ + struct gaim_pref *pref = find_pref(name); + + if(!pref) { + gaim_debug_error("prefs", + "gaim_prefs_get_int: Unknown pref %s\n", name); + return 0; + } else if(pref->type != GAIM_PREF_INT) { + gaim_debug_error("prefs", + "gaim_prefs_get_int: %s not an integer pref\n", name); + return 0; + } + + return pref->value.integer; +} + +const char * +gaim_prefs_get_string(const char *name) +{ + struct gaim_pref *pref = find_pref(name); + + if(!pref) { + gaim_debug_error("prefs", + "gaim_prefs_get_string: Unknown pref %s\n", name); + return NULL; + } else if(pref->type != GAIM_PREF_STRING) { + gaim_debug_error("prefs", + "gaim_prefs_get_string: %s not a string pref\n", name); + return NULL; + } + + return pref->value.string; +} + +GList * +gaim_prefs_get_string_list(const char *name) +{ + struct gaim_pref *pref = find_pref(name); + GList *ret = NULL, *tmp; + + if(!pref) { + gaim_debug_error("prefs", + "gaim_prefs_get_string_list: Unknown pref %s\n", name); + return NULL; + } else if(pref->type != GAIM_PREF_STRING_LIST) { + gaim_debug_error("prefs", + "gaim_prefs_get_string_list: %s not a string list pref\n", name); + return NULL; + } + + for(tmp = pref->value.stringlist; tmp; tmp = tmp->next) + ret = g_list_append(ret, g_strdup(tmp->data)); + + return ret; +} + +void +gaim_prefs_rename(const char *oldname, const char *newname) +{ + struct gaim_pref *oldpref, *newpref; + + oldpref = find_pref(oldname); + newpref = find_pref(newname); + + /* it's already been renamed, call off the dogs */ + if(!oldpref) + return; + + gaim_debug_info("prefs", "Renaming %s to %s\n", oldname, newname); + + g_return_if_fail(newpref != NULL); /* the new one needs to be created first */ + g_return_if_fail(oldpref->type == newpref->type); + g_return_if_fail(oldpref->first_child == NULL); /* can't rename parents */ + + switch(oldpref->type) { + case GAIM_PREF_NONE: + break; + case GAIM_PREF_BOOLEAN: + gaim_prefs_set_bool(newname, oldpref->value.boolean); + break; + case GAIM_PREF_INT: + gaim_prefs_set_int(newname, oldpref->value.integer); + break; + case GAIM_PREF_STRING: + gaim_prefs_set_string(newname, oldpref->value.string); + break; + case GAIM_PREF_STRING_LIST: + gaim_prefs_set_string_list(newname, oldpref->value.stringlist); + break; + } + + remove_pref(oldpref); +} + +void +gaim_prefs_rename_boolean_toggle(const char *oldname, const char *newname) +{ + struct gaim_pref *oldpref, *newpref; + + gaim_debug_info("prefs", "Attempting to rename and toggle %s to %s\n", oldname, newname); + + oldpref = find_pref(oldname); + newpref = find_pref(newname); + + /* it's already been renamed, call off the cats */ + if(!oldpref) + return; + + g_return_if_fail(newpref != NULL); /* the new one needs to be created */ + g_return_if_fail(oldpref->type == newpref->type); + g_return_if_fail(oldpref->type == GAIM_PREF_BOOLEAN); + g_return_if_fail(oldpref->first_child == NULL); /* can't rename parents */ + + gaim_prefs_set_bool(newname, !(oldpref->value.boolean)); + + remove_pref(oldpref); + +} + +guint +gaim_prefs_connect_callback(void *handle, const char *name, GaimPrefCallback func, gpointer data) +{ + struct gaim_pref *pref; + struct pref_cb *cb; + static guint cb_id = 0; + + pref = find_pref(name); + if (pref == NULL) + return 0; + + cb = g_new0(struct pref_cb, 1); + + cb->func = func; + cb->data = data; + cb->id = ++cb_id; + cb->handle = handle; + + pref->callbacks = g_slist_append(pref->callbacks, cb); + + return cb->id; +} + +static gboolean +disco_callback_helper(struct gaim_pref *pref, guint callback_id) +{ + GSList *cbs; + struct gaim_pref *child; + + if(!pref) + return FALSE; + + for(cbs = pref->callbacks; cbs; cbs = cbs->next) { + struct pref_cb *cb = cbs->data; + if(cb->id == callback_id) { + pref->callbacks = g_slist_remove(pref->callbacks, cb); + g_free(cb); + return TRUE; + } + } + + for(child = pref->first_child; child; child = child->sibling) { + if(disco_callback_helper(child, callback_id)) + return TRUE; + } + + return FALSE; +} + +void +gaim_prefs_disconnect_callback(guint callback_id) +{ + disco_callback_helper(&prefs, callback_id); +} + +static void +disco_callback_helper_handle(struct gaim_pref *pref, void *handle) +{ + GSList *cbs; + struct gaim_pref *child; + + if(!pref) + return; + + cbs = pref->callbacks; + while (cbs != NULL) { + struct pref_cb *cb = cbs->data; + if(cb->handle == handle) { + pref->callbacks = g_slist_remove(pref->callbacks, cb); + g_free(cb); + cbs = pref->callbacks; + } else + cbs = cbs->next; + } + + for(child = pref->first_child; child; child = child->sibling) + disco_callback_helper_handle(child, handle); +} + +void +gaim_prefs_disconnect_by_handle(void *handle) +{ + g_return_if_fail(handle != NULL); + + disco_callback_helper_handle(&prefs, handle); +} + +void +gaim_prefs_update_old() +{ /* Remove some no-longer-used prefs */ gaim_prefs_remove("/core/away/auto_response/enabled"); gaim_prefs_remove("/core/away/auto_response/idle_only"); @@ -1041,3 +1061,74 @@ gaim_prefs_remove("/core/conversations/combine_chat_im"); gaim_prefs_remove("/core/conversations/use_alias_for_title"); } + +void * +gaim_prefs_get_handle(void) +{ + static int handle; + + return &handle; +} + +void +gaim_prefs_init(void) +{ + void *handle = gaim_prefs_get_handle(); + + prefs_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); + + gaim_prefs_connect_callback(handle, "/", prefs_save_cb, NULL); + + gaim_prefs_add_none("/core"); + gaim_prefs_add_none("/plugins"); + gaim_prefs_add_none("/plugins/core"); + gaim_prefs_add_none("/plugins/lopl"); + gaim_prefs_add_none("/plugins/prpl"); + + /* Away */ + gaim_prefs_add_none("/core/away"); + gaim_prefs_add_bool("/core/away/away_when_idle", TRUE); + gaim_prefs_add_int("/core/away/mins_before_away", 5); + /* XXX: internationalized string in prefs...evil */ + gaim_prefs_add_string("/core/away/default_message", + _("Slightly less boring default")); + + /* Away -> Auto-Reply */ + if (!gaim_prefs_exists("/core/away/auto_response/enabled") || + !gaim_prefs_exists("/core/away/auto_response/idle_only")) { + gaim_prefs_add_string("/core/away/auto_reply", "awayidle"); + } else { + if (!gaim_prefs_get_bool("/core/away/auto_response/enabled")) { + gaim_prefs_add_string("/core/away/auto_reply", "never"); + } else { + if (gaim_prefs_get_bool("/core/away/auto_response/idle_only")) { + gaim_prefs_add_string("/core/away/auto_reply", "awayidle"); + } else { + gaim_prefs_add_string("/core/away/auto_reply", "away"); + } + } + } + + /* Buddies */ + gaim_prefs_add_none("/core/buddies"); + + /* Contact Priority Settings */ + gaim_prefs_add_none("/core/contact"); + gaim_prefs_add_bool("/core/contact/last_match", FALSE); + gaim_prefs_add_int("/core/contact/offline_score", 4); + gaim_prefs_add_int("/core/contact/away_score", 2); + gaim_prefs_add_int("/core/contact/idle_score", 1); +} + +void +gaim_prefs_uninit() +{ + if (save_timer != 0) + { + gaim_timeout_remove(save_timer); + save_timer = 0; + sync_prefs(); + } + + gaim_prefs_disconnect_by_handle(gaim_prefs_get_handle()); +}
--- a/src/prefs.h Tue Dec 28 17:38:03 2004 +0000 +++ b/src/prefs.h Tue Dec 28 19:11:15 2004 +0000 @@ -58,6 +58,13 @@ /*@{*/ /** + * Returns the prefs subsystem handle. + * + * @return The prefs subsystem handle. + */ +void *gaim_prefs_get_handle(void); + +/** * Initialize core prefs */ void gaim_prefs_init(); @@ -249,11 +256,6 @@ gboolean gaim_prefs_load(); /** - * Force an immediate write of preferences - */ -void gaim_prefs_sync(); - -/** * Rename legacy prefs and delete some that no longer exist. */ void gaim_prefs_update_old();
--- a/src/protocols/silc/silc.c Tue Dec 28 17:38:03 2004 +0000 +++ b/src/protocols/silc/silc.c Tue Dec 28 19:11:15 2004 +0000 @@ -512,7 +512,6 @@ val = gaim_request_field_string_get_value(f); if (val && *val) { gaim_prefs_set_string("/plugins/prpl/silc/vcard", val); - gaim_prefs_sync(); tmp = silc_file_readfile(val, &tmp_len); if (tmp) { tmp[tmp_len] = 0;