[glib] docs: Make argument names in GAppInfo consistent
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] docs: Make argument names in GAppInfo consistent
- Date: Tue, 7 Nov 2017 14:51:48 +0000 (UTC)
commit 249d74fcf6499a543807fa4158bef26426dd39de
Author: Philip Withnall <withnall endlessm com>
Date: Tue Nov 7 13:35:51 2017 +0000
docs: Make argument names in GAppInfo consistent
This fixes a mismatch between some of the gtk-doc comments and reality.
Signed-off-by: Philip Withnall <withnall endlessm com>
https://bugzilla.gnome.org/show_bug.cgi?id=790015
gio/gappinfo.c | 12 ++++++------
gio/gappinfo.h | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 411f7ea..6e9f878 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -536,11 +536,11 @@ g_app_info_get_icon (GAppInfo *appinfo)
* g_app_info_launch:
* @appinfo: a #GAppInfo
* @files: (nullable) (element-type GFile): a #GList of #GFile objects
- * @launch_context: (nullable): a #GAppLaunchContext or %NULL
+ * @context: (nullable): a #GAppLaunchContext or %NULL
* @error: a #GError
*
* Launches the application. Passes @files to the launched application
- * as arguments, using the optional @launch_context to get information
+ * as arguments, using the optional @context to get information
* about the details of the launcher (like what screen it is on).
* On error, @error will be set accordingly.
*
@@ -565,7 +565,7 @@ g_app_info_get_icon (GAppInfo *appinfo)
* process. This can be used to ignore `GIO_LAUNCHED_DESKTOP_FILE`,
* should it be inherited by further processes. The `DISPLAY` and
* `DESKTOP_STARTUP_ID` environment variables are also set, based
- * on information provided in @launch_context.
+ * on information provided in @context.
*
* Returns: %TRUE on successful launch, %FALSE otherwise.
**/
@@ -631,11 +631,11 @@ g_app_info_supports_files (GAppInfo *appinfo)
* g_app_info_launch_uris:
* @appinfo: a #GAppInfo
* @uris: (nullable) (element-type utf8): a #GList containing URIs to launch.
- * @launch_context: (nullable): a #GAppLaunchContext or %NULL
+ * @context: (nullable): a #GAppLaunchContext or %NULL
* @error: a #GError
*
* Launches the application. This passes the @uris to the launched application
- * as arguments, using the optional @launch_context to get information
+ * as arguments, using the optional @context to get information
* about the details of the launcher (like what screen it is on).
* On error, @error will be set accordingly.
*
@@ -727,7 +727,7 @@ launch_default_for_uri (const char *uri,
/**
* g_app_info_launch_default_for_uri:
* @uri: the uri to show
- * @launch_context: (nullable): an optional #GAppLaunchContext
+ * @context: (nullable): an optional #GAppLaunchContext
* @error: (nullable): return location for an error, or %NULL
*
* Utility function that launches the default application
diff --git a/gio/gappinfo.h b/gio/gappinfo.h
index 18f0126..4889be9 100644
--- a/gio/gappinfo.h
+++ b/gio/gappinfo.h
@@ -99,13 +99,13 @@ struct _GAppInfoIface
GIcon * (* get_icon) (GAppInfo *appinfo);
gboolean (* launch) (GAppInfo *appinfo,
GList *files,
- GAppLaunchContext *launch_context,
+ GAppLaunchContext *context,
GError **error);
gboolean (* supports_uris) (GAppInfo *appinfo);
gboolean (* supports_files) (GAppInfo *appinfo);
gboolean (* launch_uris) (GAppInfo *appinfo,
GList *uris,
- GAppLaunchContext *launch_context,
+ GAppLaunchContext *context,
GError **error);
gboolean (* should_show) (GAppInfo *appinfo);
@@ -162,7 +162,7 @@ GIcon * g_app_info_get_icon (GAppInfo *appin
GLIB_AVAILABLE_IN_ALL
gboolean g_app_info_launch (GAppInfo *appinfo,
GList *files,
- GAppLaunchContext *launch_context,
+ GAppLaunchContext *context,
GError **error);
GLIB_AVAILABLE_IN_ALL
gboolean g_app_info_supports_uris (GAppInfo *appinfo);
@@ -171,7 +171,7 @@ gboolean g_app_info_supports_files (GAppInfo *appin
GLIB_AVAILABLE_IN_ALL
gboolean g_app_info_launch_uris (GAppInfo *appinfo,
GList *uris,
- GAppLaunchContext *launch_context,
+ GAppLaunchContext *context,
GError **error);
GLIB_AVAILABLE_IN_ALL
gboolean g_app_info_should_show (GAppInfo *appinfo);
@@ -226,12 +226,12 @@ GAppInfo *g_app_info_get_default_for_uri_scheme (const char *uri_scheme);
GLIB_AVAILABLE_IN_ALL
gboolean g_app_info_launch_default_for_uri (const char *uri,
- GAppLaunchContext *launch_context,
+ GAppLaunchContext *context,
GError **error);
GLIB_AVAILABLE_IN_2_50
void g_app_info_launch_default_for_uri_async (const char *uri,
- GAppLaunchContext *launch_context,
+ GAppLaunchContext *context,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]