[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2028: push some gio patches (bug 3548)
Mats Wichmann
mats at linuxfoundation.org
Sat Dec 15 14:08:42 UTC 2012
------------------------------------------------------------
revno: 2028
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Sat 2012-12-15 07:08:42 -0700
message:
push some gio patches (bug 3548)
modified:
headers/All/5.0/glib-2.0/gio/gaction.h.defs
headers/All/5.0/glib-2.0/gio/gactiongroup.h.defs
headers/All/5.0/glib-2.0/gio/gapplication.h.defs
headers/All/5.0/glib-2.0/gio/gasyncinitable.h.defs
headers/All/5.0/glib-2.0/gio/gdbusconnection.h.defs
headers/All/5.0/glib-2.0/gio/gdbuserror.h.defs
headers/All/5.0/glib-2.0/gio/gdbusmessage.h.defs
headers/All/5.0/glib-2.0/gio/gdbusmethodinvocation.h.defs
headers/All/5.0/glib-2.0/gio/gfile.h.defs
headers/All/5.0/glib-2.0/gio/gfileinfo.h.defs
headers/All/5.0/glib-2.0/gio/gsimpleaction.h.defs
headers/All/5.0/glib-2.0/gio/gsimpleasyncresult.h.defs
headers/All/5.0/glib-2.0/gio/gthemedicon.h.defs
headers/glib-2.0/gio/gaction.h
headers/glib-2.0/gio/gactiongroup.h
headers/glib-2.0/gio/gapplication.h
headers/glib-2.0/gio/gasyncinitable.h
headers/glib-2.0/gio/gdbusconnection.h
headers/glib-2.0/gio/gdbuserror.h
headers/glib-2.0/gio/gdbusmessage.h
headers/glib-2.0/gio/gdbusmethodinvocation.h
headers/glib-2.0/gio/gfile.h
headers/glib-2.0/gio/gfileinfo.h
headers/glib-2.0/gio/gsimpleaction.h
headers/glib-2.0/gio/gsimpleasyncresult.h
headers/glib-2.0/gio/gthemedicon.h
package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/glib-2.0/gio/gaction.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gaction.h.defs 2012-12-10 18:47:38 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gaction.h.defs 2012-12-15 14:08:42 +0000
@@ -20,8 +20,8 @@
extern void g_action_change_state(GAction * action, GVariant * value);
extern gboolean g_action_get_enabled(GAction * action);
extern const char *g_action_get_name(GAction * action);
-extern g_action_get_parameter_type(GAction * action);
+extern GVariantType *g_action_get_parameter_type(GAction * action);
extern GVariant *g_action_get_state(GAction * action);
extern GVariant *g_action_get_state_hint(GAction * action);
-extern g_action_get_state_type(GAction * action);
+extern GVariantType *g_action_get_state_type(GAction * action);
extern GType g_action_get_type(void);
=== modified file 'headers/All/5.0/glib-2.0/gio/gactiongroup.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gactiongroup.h.defs 2012-12-10 18:47:38 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gactiongroup.h.defs 2012-12-15 14:08:42 +0000
@@ -67,9 +67,11 @@
extern gboolean g_action_group_get_action_enabled(GActionGroup *
action_group,
const char *action_name);
-extern g_action_group_get_action_parameter_type(GActionGroup *
- action_group,
- const char *action_name);
+extern GVariantType *g_action_group_get_action_parameter_type(GActionGroup
+ *
+ action_group,
+ const char
+ *action_name);
extern GVariant *g_action_group_get_action_state(GActionGroup *
action_group,
const char *action_name);
@@ -77,8 +79,10 @@
action_group,
const char
*action_name);
-extern g_action_group_get_action_state_type(GActionGroup * action_group,
- const char *action_name);
+extern GVariantType *g_action_group_get_action_state_type(GActionGroup *
+ action_group,
+ const char
+ *action_name);
extern GType g_action_group_get_type(void);
extern gboolean g_action_group_has_action(GActionGroup * action_group,
const char *action_name);
=== modified file 'headers/All/5.0/glib-2.0/gio/gapplication.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gapplication.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gapplication.h.defs 2012-12-15 14:08:42 +0000
@@ -56,7 +56,7 @@
GError * *error);
extern void g_application_release(GApplication * application);
extern int g_application_run(GApplication * application, int argc,
- void argv);
+ char **argv);
extern void g_application_set_action_group(GApplication * application,
GActionGroup * action_group);
extern void g_application_set_application_id(GApplication * application,
=== modified file 'headers/All/5.0/glib-2.0/gio/gasyncinitable.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gasyncinitable.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gasyncinitable.h.defs 2012-12-15 14:08:42 +0000
@@ -26,15 +26,15 @@
GCancellable * cancellable,
GAsyncReadyCallback callback,
gpointer user_data,
- const char *first_property_name,
+ const gchar * first_property_name,
...);
extern GObject *g_async_initable_new_finish(GAsyncInitable * initable,
GAsyncResult * res,
GError * *error);
extern void g_async_initable_new_valist_async(GType object_type,
- const char
- *first_property_name,
- void var_args,
+ const gchar *
+ first_property_name,
+ va_list var_args,
int io_priority,
GCancellable * cancellable,
GAsyncReadyCallback callback,
=== modified file 'headers/All/5.0/glib-2.0/gio/gdbusconnection.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gdbusconnection.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gdbusconnection.h.defs 2012-12-15 14:08:42 +0000
@@ -264,6 +264,8 @@
extern guint g_dbus_connection_register_subtree(GDBusConnection *
connection,
const gchar * object_path,
+ const GDBusSubtreeVTable *
+ vtable,
GDBusSubtreeFlags flags,
void *user_data,
GDestroyNotify
=== modified file 'headers/All/5.0/glib-2.0/gio/gdbuserror.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gdbuserror.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gdbuserror.h.defs 2012-12-15 14:08:42 +0000
@@ -20,7 +20,8 @@
error_domain_quark_name,
volatile gsize *
quark_volatile,
- guint num_entries);
+ const GDBusErrorEntry *
+ entries, guint num_entries);
extern void g_dbus_error_set_dbus_error(GError * *error,
const gchar * dbus_error_name,
const gchar * dbus_error_message,
@@ -31,7 +32,7 @@
const gchar *
dbus_error_message,
const gchar * format,
- void var_args);
+ va_list var_args);
extern gboolean g_dbus_error_strip_remote_error(GError * error);
extern gboolean g_dbus_error_unregister_error(GQuark error_domain,
gint error_code,
=== modified file 'headers/All/5.0/glib-2.0/gio/gdbusmessage.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gdbusmessage.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gdbusmessage.h.defs 2012-12-15 14:08:42 +0000
@@ -63,7 +63,8 @@
error_name,
const gchar *
error_message_format,
- void var_args);
+ va_list
+ var_args);
extern GDBusMessage *g_dbus_message_new_method_reply(GDBusMessage *
method_call_message);
extern GDBusMessage *g_dbus_message_new_signal(const gchar * path,
=== modified file 'headers/All/5.0/glib-2.0/gio/gdbusmethodinvocation.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gdbusmethodinvocation.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gdbusmethodinvocation.h.defs 2012-12-15 14:08:42 +0000
@@ -50,7 +50,7 @@
invocation, GQuark domain,
gint code,
const gchar * format,
- void var_args);
+ va_list var_args);
extern void g_dbus_method_invocation_return_gerror(GDBusMethodInvocation *
invocation,
const struct _GError
=== modified file 'headers/All/5.0/glib-2.0/gio/gfile.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gfile.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gfile.h.defs 2012-12-15 14:08:42 +0000
@@ -429,16 +429,17 @@
extern gboolean g_file_is_native(GFile * file);
extern gboolean g_file_load_contents(GFile * file,
GCancellable * cancellable,
- void contents, gsize * length,
- void etag_out, GError * *error);
+ char **contents, gsize * length,
+ char **etag_out, GError * *error);
extern void g_file_load_contents_async(GFile * file,
GCancellable * cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
extern gboolean g_file_load_contents_finish(GFile * file,
GAsyncResult * res,
- void contents, gsize * length,
- void etag_out,
+ char **contents,
+ gsize * length,
+ char **etag_out,
GError * *error);
extern void g_file_load_partial_contents_async(GFile * file,
GCancellable * cancellable,
@@ -449,9 +450,9 @@
gpointer user_data);
extern gboolean g_file_load_partial_contents_finish(GFile * file,
GAsyncResult * res,
- void contents,
+ char **contents,
gsize * length,
- void etag_out,
+ char **etag_out,
GError * *error);
extern gboolean g_file_make_directory(GFile * file,
GCancellable * cancellable,
@@ -591,11 +592,11 @@
GCancellable * cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-extern gboolean g_file_replace_contents(GFile * file, const char *contents,
+extern gboolean g_file_replace_contents(GFile * file, char **contents,
gsize length, const char *etag,
gboolean make_backup,
GFileCreateFlags flags,
- void new_etag,
+ char **new_etag,
GCancellable * cancellable,
GError * *error);
extern void g_file_replace_contents_async(GFile * file,
@@ -608,7 +609,7 @@
gpointer user_data);
extern gboolean g_file_replace_contents_finish(GFile * file,
GAsyncResult * res,
- void new_etag,
+ char **new_etag,
GError * *error);
extern GFileOutputStream *g_file_replace_finish(GFile * file,
GAsyncResult * res,
=== modified file 'headers/All/5.0/glib-2.0/gio/gfileinfo.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gfileinfo.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gfileinfo.h.defs 2012-12-15 14:08:42 +0000
@@ -201,7 +201,7 @@
const char *attr_value);
extern void g_file_info_set_attribute_stringv(GFileInfo * info,
const char *attribute,
- void attr_value);
+ char **attr_value);
extern void g_file_info_set_attribute_uint32(GFileInfo * info,
const char *attribute,
guint32 attr_value);
=== modified file 'headers/All/5.0/glib-2.0/gio/gsimpleaction.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gsimpleaction.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gsimpleaction.h.defs 2012-12-15 14:08:42 +0000
@@ -4,8 +4,11 @@
#define G_IS_SIMPLE_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_SIMPLE_ACTION))
extern GType g_simple_action_get_type(void);
-extern GSimpleAction *g_simple_action_new(const gchar * name);
+extern GSimpleAction *g_simple_action_new(const gchar * name,
+ GVariantType * parameter_type);
extern GSimpleAction *g_simple_action_new_stateful(const gchar * name,
+ GVariantType *
+ parameter_type,
GVariant * state);
extern void g_simple_action_set_enabled(GSimpleAction * simple,
gboolean enabled);
=== modified file 'headers/All/5.0/glib-2.0/gio/gsimpleasyncresult.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gsimpleasyncresult.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gsimpleasyncresult.h.defs 2012-12-15 14:08:42 +0000
@@ -92,7 +92,7 @@
extern void g_simple_async_result_set_error_va(GSimpleAsyncResult * simple,
GQuark domain, gint code,
const char *format,
- void args);
+ va_list args);
extern void g_simple_async_result_set_from_error(GSimpleAsyncResult *
simple,
const struct _GError
=== modified file 'headers/All/5.0/glib-2.0/gio/gthemedicon.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gthemedicon.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gthemedicon.h.defs 2012-12-15 14:08:42 +0000
@@ -12,7 +12,7 @@
extern const char *const *g_themed_icon_get_names(GThemedIcon * icon);
extern GType g_themed_icon_get_type(void);
extern GIcon *g_themed_icon_new(const char *iconname);
-extern GIcon *g_themed_icon_new_from_names(void iconnames, int len);
+extern GIcon *g_themed_icon_new_from_names(char **iconnames, int len);
extern GIcon *g_themed_icon_new_with_default_fallbacks(const char
*iconname);
extern void g_themed_icon_prepend_name(GThemedIcon * icon,
=== modified file 'headers/glib-2.0/gio/gaction.h'
--- a/headers/glib-2.0/gio/gaction.h 2012-12-10 18:47:38 +0000
+++ b/headers/glib-2.0/gio/gaction.h 2012-12-15 14:08:42 +0000
@@ -39,10 +39,10 @@
extern void g_action_change_state(GAction * action, GVariant * value);
extern gboolean g_action_get_enabled(GAction * action);
extern const char *g_action_get_name(GAction * action);
- extern g_action_get_parameter_type(GAction * action);
+ extern GVariantType *g_action_get_parameter_type(GAction * action);
extern GVariant *g_action_get_state(GAction * action);
extern GVariant *g_action_get_state_hint(GAction * action);
- extern g_action_get_state_type(GAction * action);
+ extern GVariantType *g_action_get_state_type(GAction * action);
extern GType g_action_get_type(void);
#ifdef __cplusplus
}
=== modified file 'headers/glib-2.0/gio/gactiongroup.h'
--- a/headers/glib-2.0/gio/gactiongroup.h 2012-12-10 18:47:38 +0000
+++ b/headers/glib-2.0/gio/gactiongroup.h 2012-12-15 14:08:42 +0000
@@ -91,10 +91,10 @@
action_group,
const char
*action_name);
- extern g_action_group_get_action_parameter_type(GActionGroup *
- action_group,
- const char
- *action_name);
+ extern GVariantType
+ *g_action_group_get_action_parameter_type(GActionGroup *
+ action_group,
+ const char *action_name);
extern GVariant *g_action_group_get_action_state(GActionGroup *
action_group,
const char
@@ -103,9 +103,11 @@
action_group,
const char
*action_name);
- extern g_action_group_get_action_state_type(GActionGroup *
- action_group,
- const char *action_name);
+ extern GVariantType *g_action_group_get_action_state_type(GActionGroup
+ *
+ action_group,
+ const char
+ *action_name);
extern GType g_action_group_get_type(void);
extern gboolean g_action_group_has_action(GActionGroup * action_group,
const char *action_name);
=== modified file 'headers/glib-2.0/gio/gapplication.h'
--- a/headers/glib-2.0/gio/gapplication.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gapplication.h 2012-12-15 14:08:42 +0000
@@ -89,7 +89,7 @@
GError * *error);
extern void g_application_release(GApplication * application);
extern int g_application_run(GApplication * application, int argc,
- void argv);
+ char **argv);
extern void g_application_set_action_group(GApplication * application,
GActionGroup *
action_group)
=== modified file 'headers/glib-2.0/gio/gasyncinitable.h'
--- a/headers/glib-2.0/gio/gasyncinitable.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gasyncinitable.h 2012-12-15 14:08:42 +0000
@@ -2,6 +2,7 @@
#ifndef _GLIB_2_0_GIO_GASYNCINITABLE_H_
#define _GLIB_2_0_GIO_GASYNCINITABLE_H_
+#include <stdarg.h>
#include <glib-2.0/glib.h>
#include <glib-2.0/glib-object.h>
#include <glib-2.0/gio/giotypes.h>
@@ -47,15 +48,15 @@
GCancellable * cancellable,
GAsyncReadyCallback callback,
gpointer user_data,
- const char *first_property_name,
- ...);
+ const gchar *
+ first_property_name, ...);
extern GObject *g_async_initable_new_finish(GAsyncInitable * initable,
GAsyncResult * res,
GError * *error);
extern void g_async_initable_new_valist_async(GType object_type,
- const char
- *first_property_name,
- void var_args,
+ const gchar *
+ first_property_name,
+ va_list var_args,
int io_priority,
GCancellable *
cancellable,
=== modified file 'headers/glib-2.0/gio/gdbusconnection.h'
--- a/headers/glib-2.0/gio/gdbusconnection.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gdbusconnection.h 2012-12-15 14:08:42 +0000
@@ -333,6 +333,9 @@
connection,
const gchar *
object_path,
+ const
+ GDBusSubtreeVTable *
+ vtable,
GDBusSubtreeFlags
flags, void *user_data,
GDestroyNotify
=== modified file 'headers/glib-2.0/gio/gdbuserror.h'
--- a/headers/glib-2.0/gio/gdbuserror.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gdbuserror.h 2012-12-15 14:08:42 +0000
@@ -2,7 +2,9 @@
#ifndef _GLIB_2_0_GIO_GDBUSERROR_H_
#define _GLIB_2_0_GIO_GDBUSERROR_H_
+#include <stdarg.h>
#include <glib-2.0/glib.h>
+#include <glib-2.0/gio/giotypes.h>
#ifdef __cplusplus
extern "C" {
@@ -36,6 +38,8 @@
error_domain_quark_name,
volatile gsize *
quark_volatile,
+ const GDBusErrorEntry *
+ entries,
guint num_entries);
extern void g_dbus_error_set_dbus_error(GError * *error,
const gchar * dbus_error_name,
@@ -48,7 +52,7 @@
const gchar *
dbus_error_message,
const gchar * format,
- void var_args);
+ va_list var_args);
extern gboolean g_dbus_error_strip_remote_error(GError * error);
extern gboolean g_dbus_error_unregister_error(GQuark error_domain,
gint error_code,
=== modified file 'headers/glib-2.0/gio/gdbusmessage.h'
--- a/headers/glib-2.0/gio/gdbusmessage.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gdbusmessage.h 2012-12-15 14:08:42 +0000
@@ -2,6 +2,7 @@
#ifndef _GLIB_2_0_GIO_GDBUSMESSAGE_H_
#define _GLIB_2_0_GIO_GDBUSMESSAGE_H_
+#include <stdarg.h>
#include <glib-2.0/glib.h>
#include <glib-2.0/glib-object.h>
#include <glib-2.0/gio/gioenums.h>
@@ -88,7 +89,7 @@
const gchar * error_name,
const gchar *
error_message_format,
- void var_args);
+ va_list var_args);
extern GDBusMessage *g_dbus_message_new_method_reply(GDBusMessage *
method_call_message);
extern GDBusMessage *g_dbus_message_new_signal(const gchar * path,
=== modified file 'headers/glib-2.0/gio/gdbusmethodinvocation.h'
--- a/headers/glib-2.0/gio/gdbusmethodinvocation.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gdbusmethodinvocation.h 2012-12-15 14:08:42 +0000
@@ -2,6 +2,7 @@
#ifndef _GLIB_2_0_GIO_GDBUSMETHODINVOCATION_H_
#define _GLIB_2_0_GIO_GDBUSMETHODINVOCATION_H_
+#include <stdarg.h>
#include <glib-2.0/glib.h>
#include <glib-2.0/glib-object.h>
#include <glib-2.0/gio/giotypes.h>
@@ -73,7 +74,7 @@
GQuark domain,
gint code,
const gchar * format,
- void var_args);
+ va_list var_args);
extern void
g_dbus_method_invocation_return_gerror(GDBusMethodInvocation *
invocation,
=== modified file 'headers/glib-2.0/gio/gfile.h'
--- a/headers/glib-2.0/gio/gfile.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gfile.h 2012-12-15 14:08:42 +0000
@@ -508,17 +508,17 @@
extern gboolean g_file_is_native(GFile * file);
extern gboolean g_file_load_contents(GFile * file,
GCancellable * cancellable,
- void contents, gsize * length,
- void etag_out, GError * *error);
+ char **contents, gsize * length,
+ char **etag_out, GError * *error);
extern void g_file_load_contents_async(GFile * file,
GCancellable * cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
extern gboolean g_file_load_contents_finish(GFile * file,
GAsyncResult * res,
- void contents,
+ char **contents,
gsize * length,
- void etag_out,
+ char **etag_out,
GError * *error);
extern void g_file_load_partial_contents_async(GFile * file,
GCancellable *
@@ -530,9 +530,9 @@
gpointer user_data);
extern gboolean g_file_load_partial_contents_finish(GFile * file,
GAsyncResult * res,
- void contents,
+ char **contents,
gsize * length,
- void etag_out,
+ char **etag_out,
GError * *error);
extern gboolean g_file_make_directory(GFile * file,
GCancellable * cancellable,
@@ -688,12 +688,11 @@
GCancellable * cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
- extern gboolean g_file_replace_contents(GFile * file,
- const char *contents,
+ extern gboolean g_file_replace_contents(GFile * file, char **contents,
gsize length, const char *etag,
gboolean make_backup,
GFileCreateFlags flags,
- void new_etag,
+ char **new_etag,
GCancellable * cancellable,
GError * *error);
extern void g_file_replace_contents_async(GFile * file,
@@ -707,7 +706,7 @@
gpointer user_data);
extern gboolean g_file_replace_contents_finish(GFile * file,
GAsyncResult * res,
- void new_etag,
+ char **new_etag,
GError * *error);
extern GFileOutputStream *g_file_replace_finish(GFile * file,
GAsyncResult * res,
=== modified file 'headers/glib-2.0/gio/gfileinfo.h'
--- a/headers/glib-2.0/gio/gfileinfo.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gfileinfo.h 2012-12-15 14:08:42 +0000
@@ -231,7 +231,7 @@
const char *attr_value);
extern void g_file_info_set_attribute_stringv(GFileInfo * info,
const char *attribute,
- void attr_value);
+ char **attr_value);
extern void g_file_info_set_attribute_uint32(GFileInfo * info,
const char *attribute,
guint32 attr_value);
=== modified file 'headers/glib-2.0/gio/gsimpleaction.h'
--- a/headers/glib-2.0/gio/gsimpleaction.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gsimpleaction.h 2012-12-15 14:08:42 +0000
@@ -20,8 +20,12 @@
/* Function prototypes */
extern GType g_simple_action_get_type(void);
- extern GSimpleAction *g_simple_action_new(const gchar * name);
+ extern GSimpleAction *g_simple_action_new(const gchar * name,
+ GVariantType *
+ parameter_type);
extern GSimpleAction *g_simple_action_new_stateful(const gchar * name,
+ GVariantType *
+ parameter_type,
GVariant * state);
extern void g_simple_action_set_enabled(GSimpleAction * simple,
gboolean enabled);
=== modified file 'headers/glib-2.0/gio/gsimpleasyncresult.h'
--- a/headers/glib-2.0/gio/gsimpleasyncresult.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gsimpleasyncresult.h 2012-12-15 14:08:42 +0000
@@ -2,6 +2,7 @@
#ifndef _GLIB_2_0_GIO_GSIMPLEASYNCRESULT_H_
#define _GLIB_2_0_GIO_GSIMPLEASYNCRESULT_H_
+#include <stdarg.h>
#include <glib-2.0/glib.h>
#include <glib-2.0/glib-object.h>
#include <glib-2.0/gio/giotypes.h>
@@ -126,7 +127,7 @@
simple, GQuark domain,
gint code,
const char *format,
- void args);
+ va_list args);
extern void g_simple_async_result_set_from_error(GSimpleAsyncResult *
simple,
const struct _GError
=== modified file 'headers/glib-2.0/gio/gthemedicon.h'
--- a/headers/glib-2.0/gio/gthemedicon.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gthemedicon.h 2012-12-15 14:08:42 +0000
@@ -29,7 +29,7 @@
extern const char *const *g_themed_icon_get_names(GThemedIcon * icon);
extern GType g_themed_icon_get_type(void);
extern GIcon *g_themed_icon_new(const char *iconname);
- extern GIcon *g_themed_icon_new_from_names(void iconnames, int len);
+ extern GIcon *g_themed_icon_new_from_names(char **iconnames, int len);
extern GIcon *g_themed_icon_new_with_default_fallbacks(const char
*iconname);
extern void g_themed_icon_prepend_name(GThemedIcon * icon,
=== modified file 'package/Makefile'
--- a/package/Makefile 2012-12-14 16:17:22 +0000
+++ b/package/Makefile 2012-12-15 14:08:42 +0000
@@ -46,7 +46,7 @@
# We define this here instead of directly in the spec file as
# we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=7
+RPM_PACKAGE_RELEASE=8
# Initialize LIB64 to proper value for 64-bit architectures
export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)
More information about the lsb-messages
mailing list