[frogr] Save the number of tags with projects too
- From: Mario Sanchez Prada <msanchez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [frogr] Save the number of tags with projects too
- Date: Wed, 12 Dec 2012 16:17:14 +0000 (UTC)
commit b1f875c30369689008b56a248e2f825459156271
Author: Mario Sanchez Prada <msanchez gnome org>
Date: Wed Dec 12 17:15:53 2012 +0100
Save the number of tags with projects too
src/frogr-controller.c | 14 ++++++++++----
src/frogr-model.c | 8 ++++++++
src/frogr-model.h | 2 ++
3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index 63cc41d..c4e1701 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -2870,11 +2870,13 @@ frogr_controller_open_project_from_file (FrogrController *self, const gchar *pat
DEBUG ("Opening project file %s:\n"
"\tNumber of pictures: %ld\n"
"\tNumber of photosets: %ld\n"
- "\tNumber of groups: %ld\n",
+ "\tNumber of groups: %ld\n"
+ "\tNumber of tags: %ld\n",
path,
json_object_get_int_member (root_object, "n_pictures"),
json_object_get_int_member (root_object, "n_photosets"),
- json_object_get_int_member (root_object, "n_groups"));
+ json_object_get_int_member (root_object, "n_groups"),
+ json_object_get_int_member (root_object, "n_tags"));
frogr_model_deserialize (model, data_object);
result = TRUE;
@@ -2896,6 +2898,7 @@ frogr_controller_save_project_to_file (FrogrController *self, const gchar *path)
gint n_pictures;
gint n_photosets;
gint n_groups;
+ gint n_tags;
GError *error = NULL;
g_return_val_if_fail(FROGR_IS_CONTROLLER (self), FALSE);
@@ -2907,6 +2910,7 @@ frogr_controller_save_project_to_file (FrogrController *self, const gchar *path)
n_pictures = frogr_model_n_pictures (model);
n_photosets = frogr_model_n_photosets (model);
n_groups = frogr_model_n_groups (model);
+ n_tags = frogr_model_n_tags (model);
root_node = json_node_new (JSON_NODE_OBJECT);
root_object = json_object_new ();
@@ -2914,12 +2918,14 @@ frogr_controller_save_project_to_file (FrogrController *self, const gchar *path)
json_object_set_int_member (root_object, "n_pictures", n_pictures);
json_object_set_int_member (root_object, "n_photosets", n_photosets);
json_object_set_int_member (root_object, "n_groups", n_groups);
+ json_object_set_int_member (root_object, "n_tags", n_tags);
DEBUG ("Saving project to file %s:\n"
"\tNumber of pictures: %d\n"
"\tNumber of photosets: %d\n"
- "\tNumber of groups: %d\n",
- path, n_pictures, n_photosets, n_groups);
+ "\tNumber of groups: %d\n"
+ "\tNumber of tags: %d\n",
+ path, n_pictures, n_photosets, n_groups, n_tags);
serialized_model = frogr_model_serialize (model);
json_object_set_object_member (root_object, "data", serialized_model);
diff --git a/src/frogr-model.c b/src/frogr-model.c
index f15faf5..e922bb0 100644
--- a/src/frogr-model.c
+++ b/src/frogr-model.c
@@ -776,6 +776,14 @@ frogr_model_get_tags (FrogrModel *self)
return priv->all_tags;
}
+guint
+frogr_model_n_tags (FrogrModel *self)
+{
+ g_return_val_if_fail(FROGR_IS_MODEL (self), 0);
+ return g_slist_length (frogr_model_get_tags (self));
+}
+
+
JsonObject *
frogr_model_serialize (FrogrModel *self)
{
diff --git a/src/frogr-model.h b/src/frogr-model.h
index b12d898..dcfc62a 100644
--- a/src/frogr-model.h
+++ b/src/frogr-model.h
@@ -107,6 +107,8 @@ void frogr_model_add_local_tags_from_string (FrogrModel *self,
GSList *frogr_model_get_tags (FrogrModel *self);
+guint frogr_model_n_tags (FrogrModel *self);
+
/* Serialization */
JsonObject *frogr_model_serialize (FrogrModel *self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]