diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
commit | b3490213f42ed63bc4b05b37bcfc12809f2d432c (patch) | |
tree | d56ede6f1ea8d20c2120eba2b9ca705927a77913 /windows.c | |
parent | 92d8978ab4ad980397883b50d0e7bc81d2bf5f73 (diff) | |
parent | 70352c3962cf3b4379590326cdc489ac0543f7e9 (diff) | |
download | subsurface-b3490213f42ed63bc4b05b37bcfc12809f2d432c.tar.gz |
Merge branch 'glib-removal-hack'
Fix obvious merge issue in Rules.mk
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'windows.c')
-rw-r--r-- | windows.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -60,7 +60,7 @@ void subsurface_set_conf_int(const char *name, int value) RegSetValueEx(hkey, (LPCTSTR)name, 0, REG_DWORD, (const BYTE *)&value, 4); } -void subsurface_set_conf_bool(const char *name, int value) +void subsurface_set_conf_bool(const char *name, bool value) { subsurface_set_conf_int(name, value); } @@ -305,7 +305,7 @@ void subsurface_command_line_exit(gint *argc, gchar ***argv) g_free(*argv); } -gboolean subsurface_launch_for_uri(const char* uri) +bool subsurface_launch_for_uri(const char* uri) { gboolean ret = FALSE; wchar_t *wuri = (wchar_t *)g_utf8_to_utf16(uri, -1, NULL, NULL, NULL); @@ -320,7 +320,7 @@ gboolean subsurface_launch_for_uri(const char* uri) } /* check if we are running a newer OS version */ -gboolean subsurface_os_feature_available(os_feature_t f) +bool subsurface_os_feature_available(os_feature_t f) { switch (f) { case UTF8_FONT_WITH_STARS: |