[glib/wip/pwithnall/2119-osx-app-info: 1/3] gosxappinfo: Fix some const-correctness issues
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/pwithnall/2119-osx-app-info: 1/3] gosxappinfo: Fix some const-correctness issues
- Date: Wed, 9 Dec 2020 11:45:33 +0000 (UTC)
commit 1862a900b1419f77f8b965cfbc517e244e471eb9
Author: Philip Withnall <pwithnall endlessos org>
Date: Wed Dec 9 11:41:38 2020 +0000
gosxappinfo: Fix some const-correctness issues
This is technically an API break, as the following assignment may now
raise warnings in user code:
```
gchar *filename = g_osx_app_info_get_filename (app_info);
```
However, from code search it seems like the number of users of that
function is zero.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
gio/gosxappinfo.h | 2 +-
gio/gosxappinfo.m | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gio/gosxappinfo.h b/gio/gosxappinfo.h
index 7beeaad16..793ce1fcd 100644
--- a/gio/gosxappinfo.h
+++ b/gio/gosxappinfo.h
@@ -43,7 +43,7 @@ GLIB_AVAILABLE_IN_2_52
GType g_osx_app_info_get_type (void) G_GNUC_CONST;
GLIB_AVAILABLE_IN_2_52
-char * g_osx_app_info_get_filename (GOsxAppInfo *info);
+const char *g_osx_app_info_get_filename (GOsxAppInfo *info);
GLIB_AVAILABLE_IN_2_52
GList * g_osx_app_info_get_all_for_scheme (const gchar *scheme);
diff --git a/gio/gosxappinfo.m b/gio/gosxappinfo.m
index 849d63575..0a9cd0501 100644
--- a/gio/gosxappinfo.m
+++ b/gio/gosxappinfo.m
@@ -226,8 +226,8 @@ url_escape_hostname (const char *url)
}
static CFURLRef
-create_url_from_cstr (gchar *cstr,
- gboolean is_file)
+create_url_from_cstr (const gchar *cstr,
+ gboolean is_file)
{
gchar *puny_cstr;
CFStringRef str;
@@ -280,7 +280,7 @@ create_urlspec_for_appinfo (GOsxAppInfo *info,
gboolean are_files)
{
LSLaunchURLSpec *urlspec = g_new0 (LSLaunchURLSpec, 1);
- gchar *app_cstr = g_osx_app_info_get_filename (info);
+ const gchar *app_cstr = g_osx_app_info_get_filename (info);
/* Strip file:// from app url but ensure filesystem url */
urlspec->appURL = create_url_from_cstr (app_cstr + 7, TRUE);
@@ -402,7 +402,7 @@ g_osx_app_info_get_executable (GAppInfo *appinfo)
return info->executable;
}
-char *
+const char *
g_osx_app_info_get_filename (GOsxAppInfo *info)
{
g_return_val_if_fail (info != NULL, NULL);
@@ -431,7 +431,8 @@ g_osx_app_info_get_icon (GAppInfo *appinfo)
if (!info->icon)
{
- gchar *icon_name, *app_uri, *icon_uri;
+ const gchar *app_uri;
+ gchar *icon_name, *icon_uri;
GFile *file;
icon_name = get_bundle_string_value (info->bundle, @"CFBundleIconFile");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]