# HG changeset patch # User Luke Schierer # Date 1094607518 0 # Node ID cc2e6dd4361373b5c806c716b713359ccc0ae3b2 # Parent 67468d443cd1a91d6c423bd44b14d45a0fe5580b [gaim-migrate @ 10879] (21:35:19) nosnilmot: LSchiere: gaim_blist_add_group() should not really be #if 0'd out... does that need a patch? (21:35:38) LSchiere: why is it #if 0'ed? (21:35:50) nosnilmot: merging error afaict (21:35:52) interalia: datallah: talking to yourself is OK. it's when you answer that it becomes a problem... (21:35:54) LSchiere: i'm assuming it was done for a reason, temporary as that reason might be (21:36:04) nosnilmot: it's not #if 0'd in chip's svn tree (21:36:08) LSchiere: oddness (21:36:16) interalia: cvs annotate to the rescue! (21:36:23) LSchiere: was that part of datallah's patch failure handle patch? (21:36:49) datallah: yeah... i'm confused as to how it happened, but the first part happened during the plain merge and the #endif i added during the .rej cleanup iirc (21:37:31) nosnilmot: yup, datallah's right :) I suspect the #if 0 came in because "patch" was trying to "help" (21:37:47) LSchiere: okay, let's see what happens without that (21:38:11) nosnilmot: "it works a lot better and doesn't eat as many buddy lists for breakfast" (21:38:12) datallah: it definitely needs to not be commented out it compiles uncommented, so we'll go with their opinion committer: Tailor Script diff -r 67468d443cd1 -r cc2e6dd43613 src/blist.c --- a/src/blist.c Wed Sep 08 01:28:03 2004 +0000 +++ b/src/blist.c Wed Sep 08 01:38:38 2004 +0000 @@ -1116,7 +1116,6 @@ void gaim_blist_add_group(GaimGroup *group, GaimBlistNode *node) { -#if 0 GaimBlistUiOps *ops; GaimBlistNode *gnode = (GaimBlistNode*)group; @@ -1168,7 +1167,6 @@ for (node = gnode->child; node; node = node->next) ops->update(gaimbuddylist, node); } -#endif } void gaim_blist_remove_contact(GaimContact *contact)