diff options
| author | Colin Walters <walters@verbum.org> | 2010-06-08 16:25:33 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-06-14 16:36:23 -0400 |
| commit | 85210bcf9b7f597aa2ad2a7087709c6091638805 (patch) | |
| tree | b919b3bd3fa5f3680789a7960d6922533e7a5dc7 /gio/gapplication.h | |
| parent | 8c4e1fa0afd97ae211260e4990585629d3c010a1 (diff) | |
| download | glib-85210bcf9b7f597aa2ad2a7087709c6091638805.tar.gz | |
Switch to using variants for timestamps, split out signals
Like how we're handling activation, use GVariant for timestamps. To
avoid polluting the GtkApplication API with GVariants, we rename the
GApplication signals to "quit-with-data" and "action-with-data".
GtkApplication will then wrap those as just "quit" and "action".
https://bugzilla.gnome.org/show_bug.cgi?id=621002
Diffstat (limited to 'gio/gapplication.h')
| -rw-r--r-- | gio/gapplication.h | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/gio/gapplication.h b/gio/gapplication.h index 7a77199c1..898c43a47 100644 --- a/gio/gapplication.h +++ b/gio/gapplication.h @@ -66,7 +66,6 @@ struct _GApplication * @quit: class handler for the #GApplication::quit signal * @prepare_activation: class handler for the #GApplication::prepare-activation signal * @run: virtual function, called by g_application_run() - * @format_activation_data: virtual function, called by g_application_format_activation_data() * * The <structname>GApplicationClass</structname> structure contains * private data only @@ -80,19 +79,17 @@ struct _GApplicationClass /*< public >*/ /* signals */ - void (* action) (GApplication *application, - const gchar *action_name, - guint timestamp); - gboolean (* quit) (GApplication *application, - guint timestamp); + void (* action_with_data) (GApplication *application, + const gchar *action_name, + GVariant *platform_data); + gboolean (* quit_with_data) (GApplication *application, + GVariant *platform_data); void (* prepare_activation) (GApplication *application, GVariant *arguments, GVariant *platform_data); /* vfuncs */ void (* run) (GApplication *application); - void (*format_activation_data) (GApplication *application, - GVariantBuilder *builder); /*< private >*/ /* Padding for future expansion */ @@ -130,22 +127,18 @@ void g_application_set_action_enabled (GApplication gboolean enabled); gboolean g_application_get_action_enabled (GApplication *application, const gchar *name); -G_CONST_RETURN gchar * g_application_get_action_description (GApplication *application, - const gchar *name); +G_CONST_RETURN gchar * g_application_get_action_description (GApplication *application, + const gchar *name); void g_application_invoke_action (GApplication *application, const gchar *name, - guint timestamp); + GVariant *platform_data); void g_application_run (GApplication *application); -gboolean g_application_quit (GApplication *app, - guint timestamp); +gboolean g_application_quit_with_data (GApplication *app, + GVariant *platform_data); gboolean g_application_is_remote (GApplication *application); -void g_application_format_activation_data (GApplication *app, - GVariantBuilder *builder); - - G_END_DECLS #endif /* __G_APPLICATION_H__ */ |