From: Richard L. <rl...@us...> - 2005-07-08 06:47:35
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11761/src Modified Files: gtkrequest.c Log Message: (15:40:40) Sean Egan: By the way, I no longer like my logs populate list of screennames idea :-P I changed this so that screen names from logs only populate the View User Log dialog. That way, you can still easily access all your logs. Index: gtkrequest.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkrequest.c,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -p -r1.101 -r1.102 --- gtkrequest.c 23 Jun 2005 03:04:52 -0000 1.101 +++ gtkrequest.c 8 Jul 2005 06:47:24 -0000 1.102 @@ -684,27 +684,29 @@ get_screenname_completion_data(gboolean } } - log_sets = gaim_log_get_log_sets(); - for (log_set = log_sets ; log_set != NULL ; log_set = log_set->next) { - GaimLogSet *set = log_set->data; + if (all) + { + log_sets = gaim_log_get_log_sets(); + for (log_set = log_sets ; log_set != NULL ; log_set = log_set->next) { + GaimLogSet *set = log_set->data; - /* 1. Don't show buddies because we will have gotten them above. - * 2. If we're not showing all accounts, then only show those with - * non-NULL accounts that are currently connected. - * 3. The boxes that use this autocomplete code handle only IMs. */ - if (!set->buddy && - (all || (set->account != NULL && gaim_account_is_connected(set->account))) && - set->type != GAIM_LOG_CHAT) { + /* 1. Don't show buddies because we will have gotten them above. + * 2. Only show those with non-NULL accounts that are currently connected. + * 3. The boxes that use this autocomplete code handle only IMs. */ + if (!set->buddy && + (set->account != NULL && gaim_account_is_connected(set->account)) && + set->type != GAIM_LOG_CHAT) { #ifdef NEW_STYLE_COMPLETION - names = g_list_append(names, NULL); - names = g_list_append(names, NULL); - names = g_list_append(names, set->account); + names = g_list_append(names, NULL); + names = g_list_append(names, NULL); + names = g_list_append(names, set->account); #endif /* NEW_STYLE_COMPLETION */ - names = g_list_append(names, set->name); - } + names = g_list_append(names, set->name); + } - g_free(set); + g_free(set); + } } return names; |