[goffice] Revert "Fixed GOStyle leaks. [#615491]"
- From: Jean Bréfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Revert "Fixed GOStyle leaks. [#615491]"
- Date: Mon, 12 Apr 2010 15:06:41 +0000 (UTC)
commit 971a59a172b34691570149971a6dabfb74f0ee86
Author: Jean Brefort <jean brefort normalesup org>
Date: Mon Apr 12 17:08:49 2010 +0200
Revert "Fixed GOStyle leaks. [#615491]"
This reverts commit c34bd034b9d18216c5eb60f0b279bfe0caed2aaa.
ChangeLog | 7 -------
NEWS | 1 -
goffice/canvas/goc-styled-item.c | 7 ++-----
goffice/graph/gog-styled-object.c | 7 ++-----
4 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1e3b708..29a5bb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-2010-04-12 Jean Brefort <jean brefort normalesup org>
-
- * goffice/canvas/goc-styled-item.c (goc_styled_item_set_property): unref
- the style after setting it. [#615491]
- * goffice/graph/gog-styled-object.c
- (gog_styled_object_set_property): ditto.
-
2010-04-10 Valek Filippov <frob gnome org>
* goffice/tests/mf-demo.c: move objects to drawing context,
diff --git a/NEWS b/NEWS
index e787d65..c85e217 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,6 @@ goffice 0.8.2:
Jean:
* Support fd:// URIs on win32. [#608422]
- * Fixed a style leak. [#615491]
Morten:
* Implement conf notification in keyfile case. [#613523]
diff --git a/goffice/canvas/goc-styled-item.c b/goffice/canvas/goc-styled-item.c
index 7617c0d..9b155ae 100644
--- a/goffice/canvas/goc-styled-item.c
+++ b/goffice/canvas/goc-styled-item.c
@@ -64,13 +64,10 @@ goc_styled_item_set_property (GObject *obj, guint param_id,
switch (param_id) {
- case STYLED_ITEM_PROP_STYLE : {
- GOStyle *style = GO_STYLE (g_value_get_object (value));
+ case STYLED_ITEM_PROP_STYLE :
resize = go_styled_object_set_style (GO_STYLED_OBJECT (gsi),
- style);
- g_object_unref (style);
+ g_value_get_object (value));
break;
- }
case STYLED_ITEM_PROP_SCALE_LINE_WIDTH :
gsi->scale_line_width = g_value_get_boolean (value);
diff --git a/goffice/graph/gog-styled-object.c b/goffice/graph/gog-styled-object.c
index 5d07ce5..ed72c45 100644
--- a/goffice/graph/gog-styled-object.c
+++ b/goffice/graph/gog-styled-object.c
@@ -89,13 +89,10 @@ gog_styled_object_set_property (GObject *obj, guint param_id,
switch (param_id) {
- case STYLED_OBJECT_PROP_STYLE : {
- GOStyle *style = GO_STYLE (g_value_get_object (value));
+ case STYLED_OBJECT_PROP_STYLE :
resize = go_styled_object_set_style (GO_STYLED_OBJECT (gso),
- style);
- g_object_unref (style);
+ g_value_get_object (value));
break;
- }
default: G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, param_id, pspec);
return; /* NOTE : RETURN */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]