Menu
▾
▴
[Gaim-commits] CVS: gaim/src blist.c,1.169.2.8,1.169.2.9 blist.h,1.64.2.1,1.64.2.2 gtkprivacy.c,1.19.2.1,1.19.2.2 privacy.c,1.14.2.1,1.14.2.2
|
From: Mark D. <the...@us...> - 2005-03-20 01:27:17
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18419/src Modified Files: Tag: oldstatus blist.c blist.h gtkprivacy.c privacy.c Log Message: The previous change meant we would have to bump the version number to 1.3.0. This way we can stay at 1.2.1. The difference is that now the blist will be synced immediately instead of after a short delay. It'll be better in head. Index: blist.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/blist.c,v retrieving revision 1.169.2.8 retrieving revision 1.169.2.9 diff -u -d -p -r1.169.2.8 -r1.169.2.9 --- blist.c 20 Mar 2005 00:37:01 -0000 1.169.2.8 +++ blist.c 20 Mar 2005 01:27:09 -0000 1.169.2.9 @@ -165,6 +165,14 @@ static gboolean blist_save_callback(gpoi return FALSE; } +static void +schedule_blist_save() +{ + if (blist_save_timer != 0) + gaim_timeout_remove(blist_save_timer); + blist_save_timer = gaim_timeout_add(1000, blist_save_callback, NULL); +} + /***************************************************************************** * Public API functions * @@ -398,7 +406,7 @@ void gaim_blist_rename_buddy(GaimBuddy * g_free(buddy->name); buddy->name = g_strdup(name); - gaim_schedule_blist_save(); + schedule_blist_save(); if (ops && ops->update) ops->update(gaimbuddylist, (GaimBlistNode *)buddy); @@ -416,7 +424,7 @@ void gaim_blist_alias_chat(GaimChat *cha else chat->alias = NULL; - gaim_schedule_blist_save(); + schedule_blist_save(); if (ops && ops->update) ops->update(gaimbuddylist, (GaimBlistNode *)chat); @@ -435,7 +443,7 @@ void gaim_blist_alias_buddy(GaimBuddy *b else buddy->alias = NULL; - gaim_schedule_blist_save(); + schedule_blist_save(); if (ops && ops->update) ops->update(gaimbuddylist, (GaimBlistNode *)buddy); @@ -458,7 +466,7 @@ void gaim_blist_server_alias_buddy(GaimB else buddy->server_alias = NULL; - gaim_schedule_blist_save(); + schedule_blist_save(); if (ops && ops->update) ops->update(gaimbuddylist, (GaimBlistNode *)buddy); @@ -541,7 +549,7 @@ void gaim_blist_rename_group(GaimGroup * } /* Save our changes */ - gaim_schedule_blist_save(); + schedule_blist_save(); /* Update the UI */ if (ops && ops->update) @@ -647,7 +655,7 @@ gaim_buddy_set_icon(GaimBuddy *buddy, Ga else gaim_blist_node_remove_setting((GaimBlistNode *)buddy, "buddy_icon"); - gaim_schedule_blist_save(); + schedule_blist_save(); gaim_blist_update_buddy_icon(buddy); } @@ -700,7 +708,7 @@ void gaim_blist_add_chat(GaimChat *chat, ops->remove(gaimbuddylist, cnode); - gaim_schedule_blist_save(); + schedule_blist_save(); } if (node != NULL) { @@ -729,7 +737,7 @@ void gaim_blist_add_chat(GaimChat *chat, } } - gaim_schedule_blist_save(); + schedule_blist_save(); if (ops && ops->update) ops->update(gaimbuddylist, (GaimBlistNode *)cnode); @@ -801,7 +809,7 @@ void gaim_blist_add_buddy(GaimBuddy *bud ops->remove(gaimbuddylist, bnode); - gaim_schedule_blist_save(); + schedule_blist_save(); if (bnode->parent->parent != (GaimBlistNode*)g) { hb = g_new(struct _gaim_hbuddy, 1); @@ -858,7 +866,7 @@ void gaim_blist_add_buddy(GaimBuddy *bud gaim_contact_compute_priority_buddy(gaim_buddy_get_contact(buddy)); - gaim_schedule_blist_save(); + schedule_blist_save(); if (ops && ops->update) ops->update(gaimbuddylist, (GaimBlistNode*)buddy); @@ -895,7 +903,7 @@ void gaim_contact_set_alias(GaimContact else contact->alias = NULL; - gaim_schedule_blist_save(); + schedule_blist_save(); if (ops && ops->update) ops->update(gaimbuddylist, (GaimBlistNode*)contact); @@ -1038,7 +1046,7 @@ void gaim_blist_add_contact(GaimContact ops->remove(gaimbuddylist, cnode); - gaim_schedule_blist_save(); + schedule_blist_save(); } if (node && (GAIM_BLIST_NODE_IS_CONTACT(node) || @@ -1064,7 +1072,7 @@ void gaim_blist_add_contact(GaimContact g->currentsize++; g->totalsize++; - gaim_schedule_blist_save(); + schedule_blist_save(); if (ops && cnode->child) ops->update(gaimbuddylist, cnode); @@ -1155,7 +1163,7 @@ void gaim_blist_add_group(GaimGroup *gro gaimbuddylist->root = gnode; } - gaim_schedule_blist_save(); + schedule_blist_save(); if (ops && ops->update) { ops->update(gaimbuddylist, gnode); @@ -1198,7 +1206,7 @@ void gaim_blist_remove_contact(GaimConta if (node->next) node->next->prev = node->prev; - gaim_schedule_blist_save(); + schedule_blist_save(); /* Update the UI */ if (ops && ops->remove) @@ -1247,7 +1255,7 @@ void gaim_blist_remove_buddy(GaimBuddy * } contact->totalsize--; - gaim_schedule_blist_save(); + schedule_blist_save(); /* Re-sort the contact */ if (contact->priority == buddy) { @@ -1310,7 +1318,7 @@ void gaim_blist_remove_chat(GaimChat *ch } group->totalsize--; - gaim_schedule_blist_save(); + schedule_blist_save(); /* Update the UI */ if (ops && ops->remove) @@ -1364,7 +1372,7 @@ void gaim_blist_remove_group(GaimGroup * if (node->next) node->next->prev = node->prev; - gaim_schedule_blist_save(); + schedule_blist_save(); /* Update the UI */ if (ops && ops->remove) @@ -2431,14 +2439,6 @@ void gaim_blist_sync() g_free(filename_real); } -void -gaim_schedule_blist_save() -{ - if (blist_save_timer != 0) - gaim_timeout_remove(blist_save_timer); - blist_save_timer = gaim_timeout_add(1000, blist_save_callback, NULL); -} - static void gaim_blist_node_setting_free(struct gaim_blist_node_setting *setting) { switch(setting->type) { @@ -2469,7 +2469,7 @@ void gaim_blist_node_remove_setting(Gaim g_hash_table_remove(node->settings, key); - gaim_schedule_blist_save(); + schedule_blist_save(); } @@ -2487,7 +2487,7 @@ void gaim_blist_node_set_bool(GaimBlistN g_hash_table_replace(node->settings, g_strdup(key), setting); - gaim_schedule_blist_save(); + schedule_blist_save(); } gboolean gaim_blist_node_get_bool(GaimBlistNode* node, const char *key) @@ -2522,7 +2522,7 @@ void gaim_blist_node_set_int(GaimBlistNo g_hash_table_replace(node->settings, g_strdup(key), setting); - gaim_schedule_blist_save(); + schedule_blist_save(); } int gaim_blist_node_get_int(GaimBlistNode* node, const char *key) @@ -2558,7 +2558,7 @@ void gaim_blist_node_set_string(GaimBlis g_hash_table_replace(node->settings, g_strdup(key), setting); - gaim_schedule_blist_save(); + schedule_blist_save(); } const char *gaim_blist_node_get_string(GaimBlistNode* node, const char *key) Index: blist.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/blist.h,v retrieving revision 1.64.2.1 retrieving revision 1.64.2.2 diff -u -d -p -r1.64.2.1 -r1.64.2.2 --- blist.h 20 Mar 2005 00:37:01 -0000 1.64.2.1 +++ blist.h 20 Mar 2005 01:27:09 -0000 1.64.2.2 @@ -717,11 +717,6 @@ int gaim_blist_get_group_online_count(Ga void gaim_blist_sync(); /** - * Schedule a save of the buddy list. - */ -void gaim_schedule_blist_save(); - -/** * Loads the buddy list from ~/.gaim/blist.xml. */ void gaim_blist_load(); Index: gtkprivacy.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkprivacy.c,v retrieving revision 1.19.2.1 retrieving revision 1.19.2.2 diff -u -d -p -r1.19.2.1 -r1.19.2.2 --- gtkprivacy.c 20 Mar 2005 00:37:02 -0000 1.19.2.1 +++ gtkprivacy.c 20 Mar 2005 01:27:09 -0000 1.19.2.2 @@ -266,7 +266,7 @@ type_changed_cb(GtkOptionMenu *optmenu, dialog->in_allow_list = FALSE; } - gaim_schedule_blist_save(); + gaim_blist_sync(); } static void Index: privacy.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/privacy.c,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -d -p -r1.14.2.1 -r1.14.2.2 --- privacy.c 20 Mar 2005 00:37:02 -0000 1.14.2.1 +++ privacy.c 20 Mar 2005 01:27:09 -0000 1.14.2.2 @@ -58,7 +58,7 @@ gaim_privacy_permit_add(GaimAccount *acc if (privacy_ops != NULL && privacy_ops->permit_added != NULL) privacy_ops->permit_added(account, who); - gaim_schedule_blist_save(); + gaim_blist_sync(); return TRUE; } @@ -94,7 +94,7 @@ gaim_privacy_permit_remove(GaimAccount * if (privacy_ops != NULL && privacy_ops->permit_removed != NULL) privacy_ops->permit_removed(account, who); - gaim_schedule_blist_save(); + gaim_blist_sync(); return TRUE; } @@ -129,7 +129,7 @@ gaim_privacy_deny_add(GaimAccount *accou if (privacy_ops != NULL && privacy_ops->deny_added != NULL) privacy_ops->deny_added(account, who); - gaim_schedule_blist_save(); + gaim_blist_sync(); return TRUE; } @@ -165,7 +165,7 @@ gaim_privacy_deny_remove(GaimAccount *ac if (privacy_ops != NULL && privacy_ops->deny_removed != NULL) privacy_ops->deny_removed(account, who); - gaim_schedule_blist_save(); + gaim_blist_sync(); return TRUE; } |