luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-21 19:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync the parameter names with the .h files, otherwise gtk-doc misbehaves.

Browse Source 
2006-03-30  Matthias Clasen  <mclasen@redhat.com>

	* glib/gbookmarkfile.c (g_bookmark_file_get_app_info): Sync
	the parameter names with the .h files, otherwise gtk-doc
	misbehaves.
This commit is contained in:
Matthias Clasen 2006-03-30 19:36:31 +00:00 committed by Matthias Clasen
parent 89b040768f
commit bd1d98c08d
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-03-30 Matthias Clasen <mclasen@redhat.com>
* 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 <ebassi@cvs.gnome.org> 2006-03-27 Emmanuele Bassi <ebassi@cvs.gnome.org>
* tests/.cvsignore: Add bookmarkfile-test to the ignored files. * tests/.cvsignore: Add bookmarkfile-test to the ignored files.

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
2006-03-30 Matthias Clasen <mclasen@redhat.com>
* 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 <ebassi@cvs.gnome.org> 2006-03-27 Emmanuele Bassi <ebassi@cvs.gnome.org>
* tests/.cvsignore: Add bookmarkfile-test to the ignored files. * tests/.cvsignore: Add bookmarkfile-test to the ignored files.

16
glib/gbookmarkfile.c
View File

@ -3319,8 +3319,8 @@ expand_exec_line (const gchar *exec_fmt,
* g_bookmark_file_get_app_info: * g_bookmark_file_get_app_info:
* @bookmark: a #GBookmarkFile * @bookmark: a #GBookmarkFile
* @uri: a valid URI * @uri: a valid URI
* @app_name: an application's name * @name: an application's name
* @app_exec: location for the command line of the application, or %NULL * @exec: location for the command line of the application, or %NULL
* @count: return location for the registration count, or %NULL * @count: return location for the registration count, or %NULL
* @stamp: return location for the last registration time, or %NULL * @stamp: return location for the last registration time, or %NULL
* @error: return location for a #GError, or %NULL * @error: return location for a #GError, or %NULL
@ -3344,8 +3344,8 @@ expand_exec_line (const gchar *exec_fmt,
gboolean gboolean
g_bookmark_file_get_app_info (GBookmarkFile *bookmark, g_bookmark_file_get_app_info (GBookmarkFile *bookmark,
const gchar *uri, const gchar *uri,
const gchar *app_name, const gchar *name,
gchar **app_exec, gchar **exec,
guint *count, guint *count,
time_t *stamp, time_t *stamp,
GError **error) GError **error)
@ -3367,19 +3367,19 @@ g_bookmark_file_get_app_info (GBookmarkFile *bookmark,
return FALSE; return FALSE;
} }
ai = bookmark_item_lookup_app_info (item, app_name); ai = bookmark_item_lookup_app_info (item, name);
if (!ai) if (!ai)
{ {
g_set_error (error, G_BOOKMARK_FILE_ERROR, g_set_error (error, G_BOOKMARK_FILE_ERROR,
G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED, G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED,
_("No application with name '%s' registered a bookmark for '%s'"), _("No application with name '%s' registered a bookmark for '%s'"),
app_name, name,
uri); uri);
return FALSE; return FALSE;
} }
if (app_exec) if (exec)
*app_exec = expand_exec_line (ai->exec, uri); *exec = expand_exec_line (ai->exec, uri);
if (count) if (count)
*count = ai->count; *count = ai->count;