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

Merge branch 'ebassi/for-master' into 'master'

Browse Source 
Ebassi/for master

Closes #3118

See merge request GNOME/gtk!2527
This commit is contained in:
Emmanuele Bassi 2020-09-04 11:56:03 +00:00
commit 749d0744da
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtktogglebutton.c
View File

@ -440,7 +440,7 @@ gtk_toggle_button_toggled (GtkToggleButton *toggle_button)
/**
* gtk_toggle_button_set_group:
* @self: a #GtkToggleButton
* @toggle_button: a #GtkToggleButton
* @group: (nullable) (transfer none): another #GtkToggleButton to
* form a group with
*
@ -454,13 +454,13 @@ gtk_toggle_button_toggled (GtkToggleButton *toggle_button)
*/
void
gtk_toggle_button_set_group (GtkToggleButton *self,
gtk_toggle_button_set_group (GtkToggleButton *toggle_button,
GtkToggleButton *group)
{
GtkToggleButtonPrivate *priv = gtk_toggle_button_get_instance_private (self);
GtkToggleButtonPrivate *priv = gtk_toggle_button_get_instance_private (toggle_button);
GtkToggleButtonPrivate *group_priv = gtk_toggle_button_get_instance_private (group);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (self));
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
if (!group)
{
@ -477,7 +477,7 @@ gtk_toggle_button_set_group (GtkToggleButton *self,
priv->group_next = NULL;
priv->group_prev = NULL;
g_object_notify_by_pspec (G_OBJECT (self), toggle_button_props[PROP_GROUP]);
g_object_notify_by_pspec (G_OBJECT (toggle_button), toggle_button_props[PROP_GROUP]);
return;
}
@ -489,12 +489,12 @@ gtk_toggle_button_set_group (GtkToggleButton *self,
{
GtkToggleButtonPrivate *prev = gtk_toggle_button_get_instance_private (group_priv->group_prev);
prev->group_next = self;
prev->group_next = toggle_button;
priv->group_prev = group_priv->group_prev;
}
group_priv->group_prev = self;
group_priv->group_prev = toggle_button;
priv->group_next = group;
g_object_notify_by_pspec (G_OBJECT (self), toggle_button_props[PROP_GROUP]);
g_object_notify_by_pspec (G_OBJECT (toggle_button), toggle_button_props[PROP_GROUP]);
}

62
meson.build
View File

@ -672,35 +672,41 @@ cloudproviders_dep = dependency('cloudproviders',
])
cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found())
profiler_enabled = get_option('sysprof').enabled()
# libsysprof-capture support
libsysprof_capture_dep = dependency('sysprof-capture-4',
required: get_option('sysprof'),
default_options: [
'enable_examples=false',
'enable_gtk=false',
'enable_tests=false',
'enable_tools=false',
'libsysprof=true',
'with_sysprofd=none',
'help=false',
],
fallback: ['sysprof', 'libsysprof_capture_dep'],
)
cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
libsysprof_dep = dependency('sysprof-4',
required: false,
default_options: [
'enable_examples=false',
'enable_gtk=false',
'enable_tests=false',
'enable_tools=false',
'libsysprof=true',
'with_sysprofd=none',
'help=false',
],
fallback: ['sysprof', 'libsysprof_dep'],
)
if not get_option('sysprof').disabled()
libsysprof_capture_dep = dependency('sysprof-capture-4',
required: get_option('sysprof'),
default_options: [
'enable_examples=false',
'enable_gtk=false',
'enable_tests=false',
'enable_tools=false',
'libsysprof=true',
'with_sysprofd=none',
'help=false',
],
fallback: ['sysprof', 'libsysprof_capture_dep'],
)
cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
libsysprof_dep = dependency('sysprof-4',
required: false,
default_options: [
'enable_examples=false',
'enable_gtk=false',
'enable_tests=false',
'enable_tools=false',
'libsysprof=true',
'with_sysprofd=none',
'help=false',
],
fallback: ['sysprof', 'libsysprof_dep'],
)
profiler_enabled = true
else
libsysprof_capture_dep = disabler()
libsysprof_dep = disabler()
profiler_enabled = false
endif
graphene_dep_type = graphene_dep.type_name()
if graphene_dep_type == 'pkgconfig'