/pidgin/main: 694ec370d84a: Fix what looks like a buggered merge...

Changeset: 694ec370d84ab1269eb2a6915590b39448fcc2ad
Author:	 Daniel Atallah <[email protected]>
Date:	 2016-06-17 22:31 -0400
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/694ec370d84a

Description:

Fix what looks like a buggered merge that got introduced in fa3c41b69e47.

Refs #16830

diffstat:

 pidgin/win32/gtkwin32dep.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (49 lines):

diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -465,9 +465,6 @@ get_WorkingAreaRectForWindow(HWND hwnd, 
 	return TRUE;
 }
 
-void winpidgin_ensure_onscreen(GtkWidget *win) {
-	RECT winR, wAR, intR;
-	HWND hwnd = GDK_WINDOW_HWND(win->window);
 typedef HRESULT (WINAPI* DwmIsCompositionEnabledFunction)(BOOL*);
 typedef HRESULT (WINAPI* DwmGetWindowAttributeFunction)(HWND, DWORD, PVOID, DWORD);
 static HMODULE dwmapi_module = NULL;
@@ -481,9 +478,9 @@ static RECT
 get_actualWindowRect(HWND hwnd)
 {
 	RECT winR;
-	
+
 	GetWindowRect(hwnd, &winR);
-	
+
 	if (dwmapi_module == NULL) {
 		dwmapi_module = GetModuleHandleW(L"dwmapi.dll");
 		if (dwmapi_module != NULL) {
@@ -491,7 +488,7 @@ get_actualWindowRect(HWND hwnd)
 			DwmGetWindowAttribute = (DwmGetWindowAttributeFunction) GetProcAddress(dwmapi_module, "DwmGetWindowAttribute");
 		}
 	}
-	
+
 	if (DwmIsCompositionEnabled != NULL && DwmGetWindowAttribute != NULL) {
 		BOOL pfEnabled;
 		if (SUCCEEDED(DwmIsCompositionEnabled(&pfEnabled))) {
@@ -501,10 +498,13 @@ get_actualWindowRect(HWND hwnd)
 			}
 		}
 	}
-	
+
 	return winR;
 }
 
+void winpidgin_ensure_onscreen(GtkWidget *win) {
+	RECT winR, wAR, intR;
+	HWND hwnd = GDK_WINDOW_HWND(win->window);
 
 	g_return_if_fail(hwnd != NULL);
 	winR = get_actualWindowRect(hwnd);

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits