aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/InitOutput.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-02-23 12:35:44 +0100
committermarha <marha@users.sourceforge.net>2012-02-23 12:36:22 +0100
commit769a37773769b08829f68e7f5ce0fc3bf66f6445 (patch)
tree8f38c4a5164626cd50e5f09ab3cec0663fd833e8 /xorg-server/hw/xwin/InitOutput.c
parent50cb30a8b13f3218a1dc933a4584466f4d616438 (diff)
downloadvcxsrv-769a37773769b08829f68e7f5ce0fc3bf66f6445.tar.gz
vcxsrv-769a37773769b08829f68e7f5ce0fc3bf66f6445.tar.bz2
vcxsrv-769a37773769b08829f68e7f5ce0fc3bf66f6445.zip
Added taskbar grouping for windows 7
Diffstat (limited to 'xorg-server/hw/xwin/InitOutput.c')
-rw-r--r--xorg-server/hw/xwin/InitOutput.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index a40446d98..2a1635c92 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -186,6 +186,9 @@ ddxGiveUp (enum ExitCode error)
}
#ifdef XWIN_MULTIWINDOW
+ /* Unload libraries for taskbar grouping */
+ winTaskbarDestroy ();
+
/* Notify the worker threads we're exiting */
winDeinitMultiWindowWM ();
#endif
@@ -833,7 +836,7 @@ winUseMsg (void)
ErrorF ("-resize=none|scrollbars|randr"
"\tIn windowed mode, [don't] allow resizing of the window. 'scrollbars'\n"
"\tmode gives the window scrollbars as needed, 'randr' mode uses the RANR\n"
- "\textension to resize the X screen.\n");
+ "\textension to resize the X screen. 'randr' is the default.\n");
ErrorF ("-rootless\n"
"\tRun the server in rootless mode.\n");
@@ -979,6 +982,11 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
/* Detect supported engines */
winDetectSupportedEngines ();
+#ifdef XWIN_MULTIWINDOW
+ /* Load libraries for taskbar grouping */
+ winTaskbarInit ();
+#endif
+
/* Store the instance handle */
g_hInstance = GetModuleHandle (NULL);