File libgnome-va_list-empty.patch of Package libgnome

Overview Repositories Revisions Requests Users Attributes Meta

File libgnome-va_list-empty.patch of Package libgnome (Revision 7fb8e8d2a219940bbe4c568061ae2541)

Currently displaying revision 7fb8e8d2a219940bbe4c568061ae2541 , Show latest

gnome-program.c: In function 'gnome_program_init_paramv':
gnome-program.c:2002: error: invalid initializer
---
 libgnome/gnome-program.c |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

Index: libgnome-2.16.0/libgnome/gnome-program.c
===================================================================
--- libgnome-2.16.0.orig/libgnome/gnome-program.c
+++ libgnome-2.16.0/libgnome/gnome-program.c
@@ -1992,6 +1992,19 @@ gnome_program_initv (GType type,
  *
  * Since: 2.8
  */
+static GnomeProgram *Matthew_Wilcox_fixed_libgnome_without_touching_GNOME_source_code(GType type,
+		const char *app_id, const char *app_version, const GnomeModuleInfo *module_info,
+		int argc, char **argv, guint nparams, GParameter *params, ...)
+{
+	va_list empty_va;
+	GnomeProgram *ret;
+
+	va_start(empty_va, params);
+	ret = gnome_program_init_common(type, app_id, app_version, module_info,
+				      argc, argv, NULL, empty_va, nparams, params);
+	va_end(empty_va);
+	return ret;
+}
 GnomeProgram*
 gnome_program_init_paramv (GType type,
                            const char *app_id, const char *app_version,
@@ -1999,9 +2012,5 @@ gnome_program_init_paramv (GType type,
                            int argc, char **argv,
                            guint nparams, GParameter *params)
 {
-    va_list empty_va = NULL;
-
-    return gnome_program_init_common (type, app_id, app_version, module_info,
-				      argc, argv, NULL, empty_va, nparams, params);
-
+    return Matthew_Wilcox_fixed_libgnome_without_touching_GNOME_source_code(type, app_id, app_version, module_info, argc, argv, nparams, params);
 }

Places

File libgnome-va_list-empty.patch of Package libgnome (Revision 7fb8e8d2a219940bbe4c568061ae2541)

Places