- own win32 resource-file for gkrellm (client)

- demand admin-rights on startup (done via manifest file)

src/Makefile

@@ -162,7 +162,7 @@ windows: libgkrellm.a
 	$(MAKE) \
 	CFLAGS="${CFLAGS} -DWIN32_CLIENT -D_WIN32_WINNT=0x0500 -DWINVER=0x0500" \
 	LINK_FLAGS="${LINK_FLAGS} -mwindows" \
-	EXTRAOBJS="${EXTRAOBJS} winops-win32.o sysdeps/win32.o win32-plugin.o resource.o" \
+	EXTRAOBJS="${EXTRAOBJS} winops-win32.o sysdeps/win32.o win32-plugin.o win32-resource.o" \
 	SYS_LIBS=" -llargeint -lws2_32 -lpdh -lnetapi32 -liphlpapi -lntdll -lintl" \
 	SMC_LIBS="" \
 	UNIXOBJS="" \
@@ -314,7 +314,7 @@ sysdeps/win32.o: sysdeps/win32.c $(GKRELLM_H_SYS)
 winops-win32.o:  winops-win32.c $(GKRELLM_H)
 win32-plugin.o: win32-plugin.c win32-plugin.h
 win32-libgkrellm.o: win32-libgkrellm.c win32-plugin.h
-resource.o: ../resource.rc
+win32-resource.o: win32-resource.rc win32-resource.h
-	windres -I.. -o resource.o ../resource.rc
+	windres -I.. -o win32-resource.o win32-resource.rc
 libgkrellm.a: win32-libgkrellm.o
 	ar -cr libgkrellm.a win32-libgkrellm.o

src/win32-manifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="gkrellm.exe" type="win32"/> 
+	<description>GKrellM</description> 
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+</assembly>

src/win32-resource.h

@@ -0,0 +1,5 @@
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+
+#define IDI_ICON3                       105

src/win32-resource.rc

@@ -0,0 +1,47 @@
+// Generated by ResEdit 1.3.6
+// Copyright (C) 2006-2007
+// http://www.resedit.net
+
+#include "win32-resource.h"
+#include "windows.h"
+
+
+//
+// Icon resources
+//
+IDI_ICON3           ICON          "gkrellm.ico"
+
+
+//
+// Version Information resources
+//
+1 VERSIONINFO
+    FILEVERSION     2,3,1,0
+    PRODUCTVERSION  0,0,0,0
+    FILEOS          VOS__WINDOWS32
+    FILETYPE        VFT_APP
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "GKrellM"
+            VALUE "FileVersion", "2.3.1"
+            VALUE "InternalName", "gkrellm"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2007 Bill Wilson"
+            VALUE "OriginalFilename", "gkrellm.exe"
+            VALUE "ProductName", "GKrellM"
+            VALUE "ProductVersion", "2.3.1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+//
+// Manifest resources
+//
+1                   RT_MANIFEST   "win32-manifest.xml"

src/winops-win32.c

@@ -21,7 +21,7 @@
 
 #include "gkrellm.h"
 #include "gkrellm-private.h"
-#include "resource.h"
+#include "win32-resource.h"
 #include <gdk/gdkwin32.h>
 
 static UINT      WM_GKRELLMCALLBACK;
@@ -252,7 +252,7 @@ gboolean gkrellm_winop_draw_rootpixmap_onto_transparent_chart(GkrellmChart *p)
 gboolean gkrellm_winop_draw_rootpixmap_onto_transparent_panel(GkrellmPanel *p)
 	{
 	if (!p->transparency || !p->drawing_area || !p->drawing_area->window || trans_gc == NULL)
-	return FALSE;
+		return FALSE;
 
 	gdk_gc_set_fill(trans_gc, GDK_SOLID);
 	gdk_gc_set_foreground(trans_gc, &trans_color);