[goffice] Compilation: simplify GValue handling.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Compilation: simplify GValue handling.
- Date: Tue, 26 Mar 2013 22:20:41 +0000 (UTC)
commit e18d997f635a2d894711434ab53d921d045ca9e3
Author: Morten Welinder <terra gnome org>
Date: Tue Mar 26 18:20:17 2013 -0400
Compilation: simplify GValue handling.
goffice/app/file.c | 12 ++++++------
goffice/graph/gog-plot.c | 8 +++-----
goffice/graph/gog-series-labels.c | 4 ++--
3 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/goffice/app/file.c b/goffice/app/file.c
index f1c6178..ea24aae 100644
--- a/goffice/app/file.c
+++ b/goffice/app/file.c
@@ -83,13 +83,13 @@ go_file_opener_set_property (GObject *object, guint property_id,
switch (property_id) {
case FO_PROP_ID: {
- char *s = g_strdup (g_value_get_string (value));
+ char *s = g_value_dup_string (value);
g_free (fo->id);
fo->id = s;
break;
}
case FO_PROP_DESCRIPTION: {
- char *s = g_strdup (g_value_get_string (value));
+ char *s = g_value_dup_string (value);
g_free (fo->description);
fo->description = s;
break;
@@ -487,25 +487,25 @@ go_file_saver_set_property (GObject *object, guint property_id,
switch (property_id) {
case FS_PROP_ID: {
- char *s = g_strdup (g_value_get_string (value));
+ char *s = g_value_dup_string (value);
g_free (fs->id);
fs->id = s;
break;
}
case FS_PROP_MIME_TYPE: {
- char *s = g_strdup (g_value_get_string (value));
+ char *s = g_value_dup_string (value);
g_free (fs->mime_type);
fs->mime_type = s;
break;
}
case FS_PROP_EXTENSION: {
- char *s = g_strdup (g_value_get_string (value));
+ char *s = g_value_dup_string (value);
g_free (fs->extension);
fs->extension = s;
break;
}
case FS_PROP_DESCRIPTION: {
- char *s = g_strdup (g_value_get_string (value));
+ char *s = g_value_dup_string (value);
g_free (fs->description);
fs->description = s;
break;
diff --git a/goffice/graph/gog-plot.c b/goffice/graph/gog-plot.c
index 62ee030..e29f3e4 100644
--- a/goffice/graph/gog-plot.c
+++ b/goffice/graph/gog-plot.c
@@ -347,18 +347,16 @@ gog_plot_set_property (GObject *obj, guint param_id,
case PLOT_PROP_AXIS_BUBBLE:
gog_plot_set_axis_by_id (plot, GOG_AXIS_BUBBLE, g_value_get_uint (value));
break;
- case PLOT_PROP_GROUP: {
- char const *group = g_value_get_string (value);
+ case PLOT_PROP_GROUP:
g_free (plot->plot_group);
- plot->plot_group = (group)? g_strdup (g_value_get_string (value)): NULL;
+ plot->plot_group = g_value_dup_string (value);
break;
- }
case PLOT_PROP_DEFAULT_INTERPOLATION:
plot->interpolation = go_line_interpolation_from_str (g_value_get_string (value));
break;
case PLOT_PROP_GURU_HINTS:
g_free (plot->guru_hints);
- plot->guru_hints = g_strdup (g_value_get_string (value));
+ plot->guru_hints = g_value_dup_string (value);
break;
default: G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, param_id, pspec);
diff --git a/goffice/graph/gog-series-labels.c b/goffice/graph/gog-series-labels.c
index 101576a..b189d1f 100644
--- a/goffice/graph/gog-series-labels.c
+++ b/goffice/graph/gog-series-labels.c
@@ -672,7 +672,7 @@ gog_data_label_set_property (GObject *obj, guint param_id,
break;
case DATA_LABEL_PROP_FORMAT:
g_free (label->format);
- label->format = g_strdup (g_value_get_string (value));
+ label->format = g_value_dup_string (value);
break;
}
case DATA_LABEL_PROP_INDEX:
@@ -1101,7 +1101,7 @@ gog_series_labels_set_property (GObject *obj, guint param_id,
break;
case SERIES_LABELS_PROP_FORMAT:
g_free (labels->format);
- labels->format = g_strdup (g_value_get_string (value));
+ labels->format = g_value_dup_string (value);
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]