# HG changeset patch # User Luke Schierer # Date 1077044565 0 # Node ID 35f69749b226ad06728812c20749b25d7fc0da66 # Parent ab35a0bec13a1e08fa8f0f92bb6cfab0c10f4960 [gaim-migrate @ 9007] "#1 fixes the browser enhancement committed yesterday so it allows wingaim to +compile #2 fixes 2 compile warnings" --daniel_atallah committer: Tailor Script diff -r ab35a0bec13a -r 35f69749b226 src/gaimrc.c --- a/src/gaimrc.c Tue Feb 17 18:45:25 2004 +0000 +++ b/src/gaimrc.c Tue Feb 17 19:02:45 2004 +0000 @@ -883,9 +883,11 @@ general_options & OPT_GEN_SEND_LINKS); gaim_prefs_set_bool("/gaim/gtk/debug/enabled", general_options & OPT_GEN_DEBUG); +#ifndef _WIN32 gaim_prefs_set_int("/gaim/gtk/browsers/place", (general_options & OPT_GEN_BROWSER_POPUP) ? GAIM_BROWSER_NEW_WINDOW : GAIM_BROWSER_DEFAULT ); +#endif gaim_prefs_set_bool("/gaim/gtk/conversations/spellecheck", general_options & OPT_GEN_CHECK_SPELLING); gaim_prefs_set_bool("/gaim/gtk/conversations/chat/raise_on_events", diff -r ab35a0bec13a -r 35f69749b226 src/gtkprefs.c --- a/src/gtkprefs.c Tue Feb 17 18:45:25 2004 +0000 +++ b/src/gtkprefs.c Tue Feb 17 19:02:45 2004 +0000 @@ -2928,11 +2928,13 @@ gaim_prefs_add_none("/gaim/gtk/away"); gaim_prefs_add_bool("/gaim/gtk/away/queue_messages", FALSE); +#ifndef _WIN32 /* Browsers */ gaim_prefs_add_none("/gaim/gtk/browsers"); gaim_prefs_add_int("/gaim/gtk/browsers/place", GAIM_BROWSER_DEFAULT); gaim_prefs_add_string("/gaim/gtk/browsers/command", ""); gaim_prefs_add_string("/gaim/gtk/browsers/browser", "mozilla"); +#endif /* Idle */ gaim_prefs_add_none("/gaim/gtk/idle"); diff -r ab35a0bec13a -r 35f69749b226 src/protocols/oscar/chat.c --- a/src/protocols/oscar/chat.c Tue Feb 17 18:45:25 2004 +0000 +++ b/src/protocols/oscar/chat.c Tue Feb 17 19:02:45 2004 +0000 @@ -443,7 +443,7 @@ fu16_t channel; aim_tlvlist_t *otl; char *msg = NULL; - int len; + int len = 0; char *encoding = NULL, *language = NULL; aim_msgcookie_t *ck; diff -r ab35a0bec13a -r 35f69749b226 src/xmlnode.c --- a/src/xmlnode.c Tue Feb 17 18:45:25 2004 +0000 +++ b/src/xmlnode.c Tue Feb 17 19:02:45 2004 +0000 @@ -433,7 +433,7 @@ g_return_val_if_fail(node->type == XMLNODE_TYPE_TAG, NULL); for(sibling = node->next; sibling; sibling = sibling->next) { - const char *xmlns; + const char *xmlns = NULL; if(ns) xmlns = xmlnode_get_attrib(sibling, "xmlns");