wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

winecfg-Staging: Fix check for GTK3 support.

Browse Source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48155
This commit is contained in:
Torge Matthies 2019-11-22 20:08:48 -06:00 committed by Zebediah Figura
parent 194199011a
commit 3fe9b83fa4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch
View File

@ -1,4 +1,4 @@
From ad78908234abc43ef56b5d005e22abde445f8760 Mon Sep 17 00:00:00 2001
From 2df5e371cbad9ca066479ac5f169a8d77cbdfbe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 9 Aug 2015 18:01:11 +0200
Subject: winecfg: Add option to enable/disable GTK3 theming.
@ -10,7 +10,7 @@ Subject: winecfg: Add option to enable/disable GTK3 theming.
3 files changed, 31 insertions(+)
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index f8c2fdf8..96f24290 100644
index f8c2fdf8b..96f242909 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -218,6 +218,7 @@
@ -22,7 +22,7 @@ index f8c2fdf8..96f24290 100644
/* About tab */
#define IDC_ABT_OWNER 8432
diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c
index 2e305a2c..b573db71 100644
index 2e305a2c1..e703a6559 100644
--- a/programs/winecfg/staging.c
+++ b/programs/winecfg/staging.c
@@ -99,6 +99,27 @@ static void hidewine_set(BOOL status)
@ -34,7 +34,7 @@ index 2e305a2c..b573db71 100644
+ */
+static BOOL gtk3_get(void)
+{
+#ifdef HAVE_GTK3
+#if defined(HAVE_GTK_GTK_H) && defined(SONAME_LIBGTK_3)
+ BOOL ret;
+ char *value = get_reg_key(config_key, keypath(""), "ThemeEngine", NULL);
+ ret = (value && !strcasecmp(value, "GTK"));
@ -46,7 +46,7 @@ index 2e305a2c..b573db71 100644
+}
+static void gtk3_set(BOOL status)
+{
+#ifdef HAVE_GTK3
+#if defined(HAVE_GTK_GTK_H) && defined(SONAME_LIBGTK_3)
+ set_reg_key(config_key, keypath(""), "ThemeEngine", status ? "GTK" : NULL);
+#endif
+}
@ -62,7 +62,7 @@ index 2e305a2c..b573db71 100644
#ifndef HAVE_VAAPI
disable(IDC_ENABLE_VAAPI);
#endif
+#ifndef HAVE_GTK3
+#if !defined(HAVE_GTK_GTK_H) || !defined(SONAME_LIBGTK_3)
+ disable(IDC_ENABLE_GTK3);
+#endif
}
@ -80,7 +80,7 @@ index 2e305a2c..b573db71 100644
break;
}
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 469ae101..33f2642e 100644
index ce18e5bc4..332520b15 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -323,6 +323,7 @@ BEGIN
@ -92,5 +92,5 @@ index 469ae101..33f2642e 100644
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
--
2.20.1
2.23.0