luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-29 10:36:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'appinfo-shellany' into 'master'

Browse Source 
GWin32AppInfo: Support verbs other than "open"

See merge request GNOME/glib!1502
This commit is contained in:
Philip Withnall 2020-10-01 16:37:36 +00:00
commit 37d04c2f6b
3 changed files with 1962 additions and 2099 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3757
gio/gwin32appinfo.c
View File

File diff suppressed because it is too large Load Diff

18
gio/gwin32registrykey.c
View File

@ -946,7 +946,7 @@ g_win32_registry_subkey_iter_next (GWin32RegistrySubkeyIter *iter,
**/ **/
gboolean gboolean
g_win32_registry_subkey_iter_get_name_w (GWin32RegistrySubkeyIter *iter, g_win32_registry_subkey_iter_get_name_w (GWin32RegistrySubkeyIter *iter,
gunichar2 **subkey_name, const gunichar2 **subkey_name,
gsize *subkey_name_len, gsize *subkey_name_len,
GError **error) GError **error)
{ {
@ -988,7 +988,7 @@ g_win32_registry_subkey_iter_get_name_w (GWin32RegistrySubkeyIter *iter,
**/ **/
gboolean gboolean
g_win32_registry_subkey_iter_get_name (GWin32RegistrySubkeyIter *iter, g_win32_registry_subkey_iter_get_name (GWin32RegistrySubkeyIter *iter,
gchar **subkey_name, const gchar **subkey_name,
gsize *subkey_name_len, gsize *subkey_name_len,
GError **error) GError **error)
{ {
@ -1013,13 +1013,15 @@ g_win32_registry_subkey_iter_get_name (GWin32RegistrySubkeyIter *iter,
&subkey_name_len_glong, &subkey_name_len_glong,
error); error);
if (iter->subkey_name_u8 != NULL) if (iter->subkey_name_u8 == NULL)
{
*subkey_name_len = subkey_name_len_glong;
return TRUE;
}
return FALSE; return FALSE;
*subkey_name = iter->subkey_name_u8;
if (subkey_name_len)
*subkey_name_len = subkey_name_len_glong;
return TRUE;
} }
/** /**

4
gio/gwin32registrykey.h
View File

@ -191,12 +191,12 @@ gboolean g_win32_registry_subkey_iter_next (GWin32RegistrySubk
GError **error); GError **error);
GLIB_AVAILABLE_IN_2_46 GLIB_AVAILABLE_IN_2_46
gboolean g_win32_registry_subkey_iter_get_name (GWin32RegistrySubkeyIter *iter, gboolean g_win32_registry_subkey_iter_get_name (GWin32RegistrySubkeyIter *iter,
gchar **subkey_name, const gchar **subkey_name,
gsize *subkey_name_len, gsize *subkey_name_len,
GError **error); GError **error);
GLIB_AVAILABLE_IN_2_46 GLIB_AVAILABLE_IN_2_46
gboolean g_win32_registry_subkey_iter_get_name_w (GWin32RegistrySubkeyIter *iter, gboolean g_win32_registry_subkey_iter_get_name_w (GWin32RegistrySubkeyIter *iter,
gunichar2 **subkey_name, const gunichar2 **subkey_name,
gsize *subkey_name_len, gsize *subkey_name_len,
GError **error); GError **error);