--- a/plugins/win32/winprefs/gtkappbar.c Fri Aug 19 02:48:01 2005 -0400
+++ b/plugins/win32/winprefs/gtkappbar.c Fri Aug 19 10:02:09 2005 -0400
@@ -47,13 +47,13 @@
get_rect_from_monitor(HMODULE hmod, HMONITOR monitor, RECT *rect) {
gaim_GetMonitorInfo *the_GetMonitorInfo;
if (!(the_GetMonitorInfo = (gaim_GetMonitorInfo*)
GetProcAddress(hmod, "GetMonitorInfoA"))) {
info.cbSize = sizeof(info);
if (!the_GetMonitorInfo(monitor, &info)) {
@@ -71,18 +71,19 @@
get_rect_at_point_multimonitor(POINT pt, RECT *rect) {
+ gaim_MonitorFromPoint *the_MonitorFromPoint; if (!(hmod = GetModuleHandle("user32"))) {
- gaim_MonitorFromPoint *the_MonitorFromPoint;
if (!(the_MonitorFromPoint = (gaim_MonitorFromPoint*)
GetProcAddress(hmod, "MonitorFromPoint"))) {
the_MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY);
return get_rect_from_monitor(hmod, monitor, rect);
@@ -95,18 +96,19 @@
get_rect_of_window_multimonitor(HWND window, RECT *rect) {
+ gaim_MonitorFromWindow *the_MonitorFromWindow; if (!(hmod = GetModuleHandle("user32"))) {
- gaim_MonitorFromWindow *the_MonitorFromWindow;
if (!(the_MonitorFromWindow = (gaim_MonitorFromWindow*)
GetProcAddress(hmod, "MonitorFromWindow"))) {
the_MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY);
return get_rect_from_monitor(hmod, monitor, rect);
--- a/src/protocols/oscar/ft.c Fri Aug 19 02:48:01 2005 -0400
+++ b/src/protocols/oscar/ft.c Fri Aug 19 10:02:09 2005 -0400
@@ -1148,9 +1148,9 @@
body_buf = malloc(body_len);
aim_bstream_init(&bs_body, body_buf, body_len);
if (aim_bstream_recv(&bs_body, conn->fd, body_len) == body_len) {
aim_bstream_rewind(&bs_body);
proxy_info->port = aimbs_get16(&bs_body);
ip_temp[i] = aimbs_get8(&bs_body);
snprintf(str_ip, sizeof(str_ip), "%hhu.%hhu.%hhu.%hhu",