applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't leak the ATK relation set (bug #509240)

Browse source 
2008-01-29  Jens Granseuer  <jensgr@gmx.net>

	* themus-properties-view.c: (add_atk_relation): don't leak the ATK
	relation set (bug #509240)

svn path=/trunk/; revision=8431
This commit is contained in:
Jens Granseuer 2008-01-29 17:21:52 +00:00 • committed by Jens Granseuer
parent a8c8a736b3
commit 32b12a1e87
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
vfs-methods/themus/ChangeLog
View file

@ -1,3 +1,8 @@
2008-01-29 Jens Granseuer <jensgr@gmx.net>
* themus-properties-view.c: (add_atk_relation): don't leak the ATK
relation set (bug #509240)
2008-01-25 Jens Granseuer <jensgr@gmx.net> 2008-01-25 Jens Granseuer <jensgr@gmx.net>
Patch by: Damien Carberry <damien.carberry@sun.com> Patch by: Damien Carberry <damien.carberry@sun.com>

31
vfs-methods/themus/themus-properties-view.c
View file

@ -79,25 +79,26 @@ themus_properties_view_class_init (ThemusPropertiesViewClass *class)
} }
static void static void
add_atk_relation (GtkWidget *obj1, add_atk_relation (GtkWidget *obj1,
GtkWidget *obj2, GtkWidget *obj2,
AtkRelationType rel_type) AtkRelationType rel_type)
{ {
AtkObject *atk_obj1, *atk_obj2; AtkObject *atk_obj1, *atk_obj2;
AtkRelationSet *relation_set; AtkRelationSet *relation_set;
AtkRelation *relation; AtkRelation *relation;
g_return_if_fail (GTK_IS_WIDGET(obj1)); g_return_if_fail (GTK_IS_WIDGET(obj1));
g_return_if_fail (GTK_IS_WIDGET(obj2)); g_return_if_fail (GTK_IS_WIDGET(obj2));
atk_obj1 = gtk_widget_get_accessible(obj1); atk_obj1 = gtk_widget_get_accessible (obj1);
atk_obj2 = gtk_widget_get_accessible (obj2);
atk_obj2 = gtk_widget_get_accessible(obj2);
relation_set = atk_object_ref_relation_set (atk_obj1); relation_set = atk_object_ref_relation_set (atk_obj1);
relation = atk_relation_new(&atk_obj2, 1, rel_type); relation = atk_relation_new (&atk_obj2, 1, rel_type);
atk_relation_set_add(relation_set, relation); atk_relation_set_add (relation_set, relation);
g_object_unref(G_OBJECT (relation));
g_object_unref (relation);
g_object_unref (relation_set);
} }
static void static void
@ -146,7 +147,7 @@ themus_properties_view_init (ThemusPropertiesView *self)
gtk_label_set_markup (GTK_LABEL (self->details->icon_caption), str); gtk_label_set_markup (GTK_LABEL (self->details->icon_caption), str);
g_free (str); g_free (str);
self->details->icon_theme = gtk_label_new (NULL); self->details->icon_theme = gtk_label_new (NULL);
do_table_attach (GTK_TABLE (self), self->details->description_caption, do_table_attach (GTK_TABLE (self), self->details->description_caption,
0, 0, 1, 1, 1.0); 0, 0, 1, 1, 1.0);
do_table_attach (GTK_TABLE (self), self->details->description, do_table_attach (GTK_TABLE (self), self->details->description,
@ -163,7 +164,7 @@ themus_properties_view_init (ThemusPropertiesView *self)
0, 3, 1, 1, 1.0); 0, 3, 1, 1, 1.0);
do_table_attach (GTK_TABLE (self), self->details->icon_theme, do_table_attach (GTK_TABLE (self), self->details->icon_theme,
1, 3, 1, 1, 0.0); 1, 3, 1, 1, 0.0);
add_atk_relation (self->details->gtk_caption, self->details->gtk_theme, add_atk_relation (self->details->gtk_caption, self->details->gtk_theme,
ATK_RELATION_LABEL_FOR); ATK_RELATION_LABEL_FOR);
add_atk_relation (self->details->gtk_theme, self->details->gtk_caption, add_atk_relation (self->details->gtk_theme, self->details->gtk_caption,
@ -216,7 +217,7 @@ themus_properties_view_set_location (ThemusPropertiesView *self,
{ {
GnomeVFSURI *uri; GnomeVFSURI *uri;
GnomeThemeMetaInfo *theme; GnomeThemeMetaInfo *theme;
g_assert (THEMUS_IS_PROPERTIES_VIEW (self)); g_assert (THEMUS_IS_PROPERTIES_VIEW (self));
if (location) { if (location) {
@ -224,7 +225,7 @@ themus_properties_view_set_location (ThemusPropertiesView *self,
theme = gnome_theme_read_meta_theme (uri); theme = gnome_theme_read_meta_theme (uri);
gnome_vfs_uri_unref (uri); gnome_vfs_uri_unref (uri);
gtk_label_set_text (GTK_LABEL (self->details->description), gtk_label_set_text (GTK_LABEL (self->details->description),
theme->comment); theme->comment);
gtk_label_set_text (GTK_LABEL (self->details->gtk_theme), gtk_label_set_text (GTK_LABEL (self->details->gtk_theme),