summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2018-05-21 17:06:23 +0100
committerRichard Hughes <richard@hughsie.com>2018-05-21 17:15:10 +0100
commit0f0b783b29abea97879295e5c9f0cbdb085e18c7 (patch)
tree0ad0ee6d637d7e86ce18fe4526a9ba7c7673b7cb
parent1b96188cb151ad37dc8923d98e8ea67ba70ed159 (diff)
downloadappstream-glib-0f0b783b29abea97879295e5c9f0cbdb085e18c7.tar.gz
trivial: Do not use deprecated API internally
-rw-r--r--libappstream-glib/as-app.c2
-rw-r--r--libappstream-glib/as-node.c14
-rw-r--r--libappstream-glib/as-stemmer.c2
-rw-r--r--libappstream-glib/as-yaml.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/libappstream-glib/as-app.c b/libappstream-glib/as-app.c
index b79c862..6b9d4e5 100644
--- a/libappstream-glib/as-app.c
+++ b/libappstream-glib/as-app.c
@@ -2289,7 +2289,7 @@ as_app_set_id (AsApp *app, const gchar *id)
/* save filename */
if (priv->id_filename != NULL)
as_ref_string_unref (priv->id_filename);
- priv->id_filename = as_ref_string_new_copy (as_app_get_id_no_prefix (app));
+ priv->id_filename = as_ref_string_new (as_app_get_id_no_prefix (app));
g_strdelimit (priv->id_filename, "&<>", '-');
for (i = 0; suffixes[i] != NULL; i++) {
tmp = g_strrstr_len (priv->id_filename, -1, suffixes[i]);
diff --git a/libappstream-glib/as-node.c b/libappstream-glib/as-node.c
index 72e906b..87c11a8 100644
--- a/libappstream-glib/as-node.c
+++ b/libappstream-glib/as-node.c
@@ -287,7 +287,7 @@ as_node_cdata_to_escaped (AsNodeData *data)
as_utils_string_replace (str, "&", "&amp;");
as_utils_string_replace (str, "<", "&lt;");
as_utils_string_replace (str, ">", "&gt;");
- data->cdata = as_ref_string_new_copy_with_length (str->str, str->len);
+ data->cdata = as_ref_string_new_with_length (str->str, str->len);
}
data->is_cdata_escaped = TRUE;
}
@@ -518,7 +518,7 @@ as_node_reflow_text (const gchar *text, gssize text_len)
!g_str_has_suffix (text, " ")) {
gsize len;
len = text_len >= 0 ? (gsize) text_len : strlen (text);
- return as_ref_string_new_copy_with_length (text, len);
+ return as_ref_string_new_with_length (text, len);
}
/* split the text into lines */
@@ -553,7 +553,7 @@ as_node_reflow_text (const gchar *text, gssize text_len)
/* this last section was paragraph */
newline_count = 1;
}
- return as_ref_string_new_copy_with_length (tmp->str, tmp->len);
+ return as_ref_string_new_with_length (tmp->str, tmp->len);
}
typedef struct {
@@ -1501,7 +1501,7 @@ as_node_find_with_attribute (AsNode *root, const gchar *path,
return node;
}
-static gchar *
+static AsRefString *
as_node_insert_line_breaks (const gchar *text, guint break_len)
{
guint i;
@@ -1518,7 +1518,7 @@ as_node_insert_line_breaks (const gchar *text, guint break_len)
for (i = break_len + 1; i < str->len; i += break_len + 1)
g_string_insert (str, (gssize) i, "\n");
g_string_append (str, "\n");
- return as_ref_string_new_copy_with_length (str->str, str->len);;
+ return as_ref_string_new_with_length (str->str, str->len);
}
/**
@@ -1618,7 +1618,7 @@ as_node_insert_localized (AsNode *parent,
as_node_data_set_name (root, data, name, insert_flags);
if (insert_flags & AS_NODE_INSERT_FLAG_NO_MARKUP) {
g_autofree gchar *tmp = as_markup_convert_simple (value_c, NULL);
- data->cdata = as_ref_string_new_copy (tmp);
+ data->cdata = as_ref_string_new (tmp);
data->is_cdata_escaped = FALSE;
} else {
data->cdata = as_ref_string_new (value_c);
@@ -1644,7 +1644,7 @@ as_node_insert_localized (AsNode *parent,
as_node_data_set_name (root, data, name, insert_flags);
if (insert_flags & AS_NODE_INSERT_FLAG_NO_MARKUP) {
g_autofree gchar *tmp = as_markup_convert_simple (value, NULL);
- data->cdata = as_ref_string_new_copy (tmp);
+ data->cdata = as_ref_string_new (tmp);
data->is_cdata_escaped = FALSE;
} else {
data->cdata = as_ref_string_new (value);
diff --git a/libappstream-glib/as-stemmer.c b/libappstream-glib/as-stemmer.c
index 3a9478d..a7666c4 100644
--- a/libappstream-glib/as-stemmer.c
+++ b/libappstream-glib/as-stemmer.c
@@ -80,7 +80,7 @@ as_stemmer_process (AsStemmer *stemmer, const gchar *value)
if (value_len == (gsize) sb_stemmer_length (stemmer->ctx)) {
new = as_ref_string_new_with_length (value_casefold, value_len);
} else {
- new = as_ref_string_new_copy (tmp);
+ new = as_ref_string_new (tmp);
}
g_hash_table_insert (stemmer->hash,
as_ref_string_new (value_casefold),
diff --git a/libappstream-glib/as-yaml.c b/libappstream-glib/as-yaml.c
index 0a7d49e..81ccdfb 100644
--- a/libappstream-glib/as-yaml.c
+++ b/libappstream-glib/as-yaml.c
@@ -371,12 +371,12 @@ as_node_yaml_process_layer (AsYamlContext *ctx, AsNode *parent, GError **error)
last_scalar != NULL) {
ym = last_scalar->data;
if (ym->key != NULL)
- ym->value = as_ref_string_new_copy (tmp);
+ ym->value = as_ref_string_new (tmp);
ym->kind = AS_YAML_NODE_KIND_KEY_VALUE;
last_scalar = NULL;
} else {
if (as_yaml_node_valid (ctx, parent, tmp)) {
- g_autoptr(AsRefString) rstr = as_ref_string_new_copy (tmp);
+ g_autoptr(AsRefString) rstr = as_ref_string_new (tmp);
ym = as_yaml_node_new (AS_YAML_NODE_KIND_KEY, rstr);
} else {
ym = as_yaml_node_new (AS_YAML_NODE_KIND_KEY, NULL);