From bd1d98c08ddf7a5378187dee3c953fe40e1d1d68 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 30 Mar 2006 19:36:31 +0000 Subject: [PATCH] Sync the parameter names with the .h files, otherwise gtk-doc misbehaves. 2006-03-30 Matthias Clasen * glib/gbookmarkfile.c (g_bookmark_file_get_app_info): Sync the parameter names with the .h files, otherwise gtk-doc misbehaves. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ glib/gbookmarkfile.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 696f814..c65c39f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-30 Matthias Clasen + + * glib/gbookmarkfile.c (g_bookmark_file_get_app_info): Sync + the parameter names with the .h files, otherwise gtk-doc + misbehaves. + 2006-03-27 Emmanuele Bassi * tests/.cvsignore: Add bookmarkfile-test to the ignored files. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 696f814..c65c39f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2006-03-30 Matthias Clasen + + * glib/gbookmarkfile.c (g_bookmark_file_get_app_info): Sync + the parameter names with the .h files, otherwise gtk-doc + misbehaves. + 2006-03-27 Emmanuele Bassi * tests/.cvsignore: Add bookmarkfile-test to the ignored files. diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c index 1aa28e0..f68c5e3 100644 --- a/glib/gbookmarkfile.c +++ b/glib/gbookmarkfile.c @@ -3319,8 +3319,8 @@ expand_exec_line (const gchar *exec_fmt, * g_bookmark_file_get_app_info: * @bookmark: a #GBookmarkFile * @uri: a valid URI - * @app_name: an application's name - * @app_exec: location for the command line of the application, or %NULL + * @name: an application's name + * @exec: location for the command line of the application, or %NULL * @count: return location for the registration count, or %NULL * @stamp: return location for the last registration time, or %NULL * @error: return location for a #GError, or %NULL @@ -3344,8 +3344,8 @@ expand_exec_line (const gchar *exec_fmt, gboolean g_bookmark_file_get_app_info (GBookmarkFile *bookmark, const gchar *uri, - const gchar *app_name, - gchar **app_exec, + const gchar *name, + gchar **exec, guint *count, time_t *stamp, GError **error) @@ -3367,19 +3367,19 @@ g_bookmark_file_get_app_info (GBookmarkFile *bookmark, return FALSE; } - ai = bookmark_item_lookup_app_info (item, app_name); + ai = bookmark_item_lookup_app_info (item, name); if (!ai) { g_set_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED, _("No application with name '%s' registered a bookmark for '%s'"), - app_name, + name, uri); return FALSE; } - if (app_exec) - *app_exec = expand_exec_line (ai->exec, uri); + if (exec) + *exec = expand_exec_line (ai->exec, uri); if (count) *count = ai->count; -- 2.7.4