AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wip/chergert/profiler-gtk4-dbus-api' into 'master'

Browse Source 
gtkapplication: track changes to profiler D-Bus API

See merge request GNOME/gtk!919
This commit is contained in:
Matthias Clasen 2019-06-12 01:04:53 +00:00
commit f5ce5a0abd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkapplication.c
View File

@ -614,7 +614,9 @@ gtk_application_finalize (GObject *object)
static const gchar org_gnome_Sysprof3_Profiler_xml[] = static const gchar org_gnome_Sysprof3_Profiler_xml[] =
"<node>" "<node>"
"<interface name='org.gnome.Sysprof3.Profiler'>" "<interface name='org.gnome.Sysprof3.Profiler'>"
"<property name='Capabilities' type='a{sv}' access='read'/>"
"<method name='Start'>" "<method name='Start'>"
"<arg type='a{sv}' name='options' direction='in'/>"
"<arg type='h' name='fd' direction='in'/>" "<arg type='h' name='fd' direction='in'/>"
"</method>" "</method>"
"<method name='Stop'>" "<method name='Stop'>"
@ -638,6 +640,7 @@ sysprof_profiler_method_call (GDBusConnection *connection,
{ {
GDBusMessage *message; GDBusMessage *message;
GUnixFDList *fd_list; GUnixFDList *fd_list;
GVariant *options;
int fd = -1; int fd = -1;
int idx; int idx;
@ -650,7 +653,7 @@ sysprof_profiler_method_call (GDBusConnection *connection,
return; return;
} }
g_variant_get (parameters, "(h)", &idx); g_variant_get (parameters, "(@a{sv}h)", &options, &idx);
message = g_dbus_method_invocation_get_message (invocation); message = g_dbus_method_invocation_get_message (invocation);
fd_list = g_dbus_message_get_unix_fd_list (message); fd_list = g_dbus_message_get_unix_fd_list (message);
@ -658,6 +661,8 @@ sysprof_profiler_method_call (GDBusConnection *connection,
fd = g_unix_fd_list_get (fd_list, idx, NULL); fd = g_unix_fd_list_get (fd_list, idx, NULL);
gdk_profiler_start (fd); gdk_profiler_start (fd);
g_variant_unref (options);
} }
else if (strcmp (method_name, "Stop") == 0) else if (strcmp (method_name, "Stop") == 0)
{ {