Mercurial > pidgin
changeset 296:a88b889b692b
[gaim-migrate @ 306]
0.9.17, here we come
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Thu, 01 Jun 2000 00:24:34 +0000 |
| parents | 0505f8c8e48b |
| children | ac267327998d |
| files | NEWS src/aim.c src/dialogs.c src/gaim.h src/prefs.c src/toc.c |
| diffstat | 6 files changed, 12 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Thu Jun 01 00:16:33 2000 +0000 +++ b/NEWS Thu Jun 01 00:24:34 2000 +0000 @@ -7,7 +7,9 @@ I am stupid. - + Eric: Heh heh. 2 releases in one day. I'm impressed. Maybe one of these +times we'll actually get some of it right ;) Anyway, yeah. Just bug fixes in +this one. 0.9.16; Rob: Blah Blah Blah.
--- a/src/aim.c Thu Jun 01 00:16:33 2000 +0000 +++ b/src/aim.c Thu Jun 01 00:24:34 2000 +0000 @@ -488,11 +488,6 @@ set_defaults(); load_prefs(); - if (general_options & OPT_GEN_CHECK_VERSIONS) - { - check_gaim_versions(); - } - if (general_options & OPT_GEN_DEBUG) show_debug(NULL);
--- a/src/dialogs.c Thu Jun 01 00:16:33 2000 +0000 +++ b/src/dialogs.c Thu Jun 01 00:24:34 2000 +0000 @@ -2211,7 +2211,7 @@ grp = grp2; } - parse_toc_buddy_list(buf); + parse_toc_buddy_list(buf, 1); serv_save_config();
--- a/src/gaim.h Thu Jun 01 00:16:33 2000 +0000 +++ b/src/gaim.h Thu Jun 01 00:24:34 2000 +0000 @@ -339,7 +339,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 263 $" +#define REVISION "gaim:$Revision: 306 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc" @@ -571,7 +571,7 @@ extern int toc_wait_signon(void); extern char *toc_wait_config(void); extern int sflap_send(char *, int , int ); -extern void parse_toc_buddy_list(char *); +extern void parse_toc_buddy_list(char *, int); /* Functions in buddy.c */
--- a/src/prefs.c Thu Jun 01 00:16:33 2000 +0000 +++ b/src/prefs.c Thu Jun 01 00:24:34 2000 +0000 @@ -404,7 +404,7 @@ gaim_button("Show Lag-O-Meter", &general_options, OPT_GEN_SHOW_LAGMETER, genbox); gaim_button("Save some window size/positions", &general_options, OPT_GEN_SAVED_WINDOWS, genbox); gaim_button("Ignore new conversations when away", &general_options, OPT_GEN_DISCARD_WHEN_AWAY, genbox); - gaim_button("Automagically check for new releases", &general_options, OPT_GEN_CHECK_VERSIONS, genbox); +/* gaim_button("Automagically check for new releases", &general_options, OPT_GEN_CHECK_VERSIONS, genbox); */ gaim_button("Automagically highlight misspelled words", &general_options, OPT_GEN_CHECK_SPELLING, genbox); if (!dw && (general_options & OPT_GEN_DEBUG)) general_options = general_options ^ OPT_GEN_DEBUG;
--- a/src/toc.c Thu Jun 01 00:16:33 2000 +0000 +++ b/src/toc.c Thu Jun 01 00:24:34 2000 +0000 @@ -150,12 +150,12 @@ make_buddy(); if (general_options & OPT_GEN_APP_BUDDY_SHOW) { gnome_buddy_show(); - parse_toc_buddy_list(config); + parse_toc_buddy_list(config, 0); createOnlinePopup(); set_applet_draw_open(); } else { gnome_buddy_hide(); - parse_toc_buddy_list(config); + parse_toc_buddy_list(config, 0); set_applet_draw_closed(); } @@ -165,7 +165,7 @@ #else gtk_widget_hide(mainwindow); show_buddy_list(); - parse_toc_buddy_list(config); + parse_toc_buddy_list(config, 0); refresh_buddy_window(); #endif @@ -848,7 +848,7 @@ } } -void parse_toc_buddy_list(char *config) +void parse_toc_buddy_list(char *config, int from_do_import) { char *c; char current[256]; @@ -903,7 +903,7 @@ /* perhaps the server dropped the buddy list, try importing from cache */ - if ( how_many == 0 ) { + if ( how_many == 0 && !from_do_import ) { do_import( (GtkWidget *) NULL, 0 ); } else if ( bud_list_cache_exists() == FALSE ) { do_export( (GtkWidget *) NULL, 0 );