[epiphany/wip/sync: 10/11] sync: Change modified to time_modified
- From: Gabriel Ivașcu <gabrielivascu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/sync: 10/11] sync: Change modified to time_modified
- Date: Wed, 19 Apr 2017 17:47:36 +0000 (UTC)
commit 114e23a63cd623e1f0877e84b04866ec2fee79b5
Author: Gabriel Ivascu <ivascu gabriel59 gmail com>
Date: Wed Apr 19 19:06:17 2017 +0300
sync: Change modified to time_modified
src/bookmarks/ephy-bookmark.c | 28 +++++++-------
src/bookmarks/ephy-bookmark.h | 66 ++++++++++++++++----------------
src/bookmarks/ephy-bookmarks-export.c | 2 +-
src/bookmarks/ephy-bookmarks-import.c | 6 +-
src/bookmarks/ephy-bookmarks-manager.c | 8 ++--
src/sync/ephy-sync-service.c | 8 ++--
src/sync/ephy-synchronizable.c | 30 +++++++-------
src/sync/ephy-synchronizable.h | 56 +++++++++++++-------------
8 files changed, 102 insertions(+), 102 deletions(-)
---
diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c
index aa36dfc..da6900c 100644
--- a/src/bookmarks/ephy-bookmark.c
+++ b/src/bookmarks/ephy-bookmark.c
@@ -42,13 +42,13 @@ struct _EphyBookmark {
gint64 time_added;
/* Firefox Sync specific fields.
- * Modified timestamp must be double to match server's precision. */
+ * Time modified timestamp must be double to match server's precision. */
char *id;
char *type;
char *parent_id;
char *parent_name;
gboolean load_in_sidebar;
- double modified;
+ double time_modified;
gboolean uploaded;
};
@@ -368,16 +368,16 @@ ephy_bookmark_synchronizable_set_id (EphySynchronizable *synchronizable,
}
static double
-ephy_bookmark_synchronizable_get_modification_time (EphySynchronizable *synchronizable)
+ephy_bookmark_synchronizable_get_time_modified (EphySynchronizable *synchronizable)
{
- return ephy_bookmark_get_modification_time (EPHY_BOOKMARK (synchronizable));
+ return ephy_bookmark_get_time_modified (EPHY_BOOKMARK (synchronizable));
}
static void
-ephy_bookmark_synchronizable_set_modification_time (EphySynchronizable *synchronizable,
- double modified)
+ephy_bookmark_synchronizable_set_time_modified (EphySynchronizable *synchronizable,
+ double time_modified)
{
- ephy_bookmark_set_modification_time (EPHY_BOOKMARK (synchronizable), modified);
+ ephy_bookmark_set_time_modified (EPHY_BOOKMARK (synchronizable), time_modified);
}
static gboolean
@@ -405,8 +405,8 @@ ephy_synchronizable_iface_init (EphySynchronizableInterface *iface)
{
iface->get_id = ephy_bookmark_synchronizable_get_id;
iface->set_id = ephy_bookmark_synchronizable_set_id;
- iface->get_modification_time = ephy_bookmark_synchronizable_get_modification_time;
- iface->set_modification_time = ephy_bookmark_synchronizable_set_modification_time;
+ iface->get_time_modified = ephy_bookmark_synchronizable_get_time_modified;
+ iface->set_time_modified = ephy_bookmark_synchronizable_set_time_modified;
iface->is_uploaded = ephy_bookmark_synchronizable_is_uploaded;
iface->set_is_uploaded = ephy_bookmark_synchronizable_set_is_uploaded;
iface->to_bso = ephy_bookmark_synchronizable_to_bso;
@@ -505,20 +505,20 @@ ephy_bookmark_get_id (EphyBookmark *self)
}
void
-ephy_bookmark_set_modification_time (EphyBookmark *self,
- double modified)
+ephy_bookmark_set_time_modified (EphyBookmark *self,
+ double time_modified)
{
g_return_if_fail (EPHY_IS_BOOKMARK (self));
- self->modified = modified;
+ self->time_modified = time_modified;
}
double
-ephy_bookmark_get_modification_time (EphyBookmark *self)
+ephy_bookmark_get_time_modified (EphyBookmark *self)
{
g_return_val_if_fail (EPHY_IS_BOOKMARK (self), -1);
- return self->modified;
+ return self->time_modified;
}
void
diff --git a/src/bookmarks/ephy-bookmark.h b/src/bookmarks/ephy-bookmark.h
index 8763365..729f5f0 100644
--- a/src/bookmarks/ephy-bookmark.h
+++ b/src/bookmarks/ephy-bookmark.h
@@ -29,46 +29,46 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (EphyBookmark, ephy_bookmark, EPHY, BOOKMARK, GObject)
-EphyBookmark *ephy_bookmark_new (const char *url,
- const char *title,
- GSequence *tags,
- const char *id);
+EphyBookmark *ephy_bookmark_new (const char *url,
+ const char *title,
+ GSequence *tags,
+ const char *id);
-void ephy_bookmark_set_time_added (EphyBookmark *self,
- gint64 time_added);
-gint64 ephy_bookmark_get_time_added (EphyBookmark *self);
+void ephy_bookmark_set_time_added (EphyBookmark *self,
+ gint64 time_added);
+gint64 ephy_bookmark_get_time_added (EphyBookmark *self);
-void ephy_bookmark_set_url (EphyBookmark *self,
- const char *url);
-const char *ephy_bookmark_get_url (EphyBookmark *self);
+void ephy_bookmark_set_url (EphyBookmark *self,
+ const char *url);
+const char *ephy_bookmark_get_url (EphyBookmark *self);
-void ephy_bookmark_set_title (EphyBookmark *self,
- const char *title);
-const char *ephy_bookmark_get_title (EphyBookmark *self);
+void ephy_bookmark_set_title (EphyBookmark *self,
+ const char *title);
+const char *ephy_bookmark_get_title (EphyBookmark *self);
-void ephy_bookmark_set_id (EphyBookmark *self,
- const char *id);
-const char *ephy_bookmark_get_id (EphyBookmark *self);
+void ephy_bookmark_set_id (EphyBookmark *self,
+ const char *id);
+const char *ephy_bookmark_get_id (EphyBookmark *self);
-void ephy_bookmark_set_modification_time (EphyBookmark *self,
- double modified);
-double ephy_bookmark_get_modification_time (EphyBookmark *self);
+void ephy_bookmark_set_time_modified (EphyBookmark *self,
+ double time_modified);
+double ephy_bookmark_get_time_modified (EphyBookmark *self);
-void ephy_bookmark_set_is_uploaded (EphyBookmark *self,
- gboolean uploaded);
-gboolean ephy_bookmark_is_uploaded (EphyBookmark *self);
+void ephy_bookmark_set_is_uploaded (EphyBookmark *self,
+ gboolean uploaded);
+gboolean ephy_bookmark_is_uploaded (EphyBookmark *self);
-void ephy_bookmark_add_tag (EphyBookmark *self,
- const char *tag);
-void ephy_bookmark_remove_tag (EphyBookmark *self,
- const char *tag);
-gboolean ephy_bookmark_has_tag (EphyBookmark *self,
- const char *tag);
-GSequence *ephy_bookmark_get_tags (EphyBookmark *self);
+void ephy_bookmark_add_tag (EphyBookmark *self,
+ const char *tag);
+void ephy_bookmark_remove_tag (EphyBookmark *self,
+ const char *tag);
+gboolean ephy_bookmark_has_tag (EphyBookmark *self,
+ const char *tag);
+GSequence *ephy_bookmark_get_tags (EphyBookmark *self);
-int ephy_bookmark_bookmarks_compare_func (EphyBookmark *bookmark1,
- EphyBookmark *bookmark2);
-int ephy_bookmark_tags_compare (const char *tag1,
- const char *tag2);
+int ephy_bookmark_bookmarks_compare_func (EphyBookmark *bookmark1,
+ EphyBookmark *bookmark2);
+int ephy_bookmark_tags_compare (const char *tag1,
+ const char *tag2);
G_END_DECLS
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index 4e4525b..4284c2b 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -45,7 +45,7 @@ build_variant (EphyBookmark *bookmark)
g_variant_builder_add (&builder, "x", ephy_bookmark_get_time_added (bookmark));
g_variant_builder_add (&builder, "s", ephy_bookmark_get_title (bookmark));
g_variant_builder_add (&builder, "s", ephy_bookmark_get_id (bookmark));
- g_variant_builder_add (&builder, "d", ephy_bookmark_get_modification_time (bookmark));
+ g_variant_builder_add (&builder, "d", ephy_bookmark_get_time_modified (bookmark));
g_variant_builder_add (&builder, "b", ephy_bookmark_is_uploaded (bookmark));
g_variant_builder_open (&builder, G_VARIANT_TYPE ("as"));
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index f805db2..9c20654 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -59,13 +59,13 @@ get_bookmarks_from_table (GvdbTable *table)
const char *title;
gint64 time_added;
char *id;
- double modified;
+ double time_modified;
gboolean uploaded;
/* Obtain the corresponding GVariant. */
value = gvdb_table_get_value (table, list[i]);
- g_variant_get (value, "(x&s&sdbas)", &time_added, &title, &id, &modified, &uploaded, &iter);
+ g_variant_get (value, "(x&s&sdbas)", &time_added, &title, &id, &time_modified, &uploaded, &iter);
/* Add all stored tags in a GSequence. */
tags = g_sequence_new (g_free);
@@ -79,7 +79,7 @@ get_bookmarks_from_table (GvdbTable *table)
/* Create the new bookmark. */
bookmark = ephy_bookmark_new (list[i], title, tags, id);
ephy_bookmark_set_time_added (bookmark, time_added);
- ephy_bookmark_set_modification_time (bookmark, modified);
+ ephy_bookmark_set_time_modified (bookmark, time_modified);
ephy_bookmark_set_is_uploaded (bookmark, uploaded);
g_sequence_prepend (bookmarks, bookmark);
diff --git a/src/bookmarks/ephy-bookmarks-manager.c b/src/bookmarks/ephy-bookmarks-manager.c
index 7383a40..e4e8911 100644
--- a/src/bookmarks/ephy-bookmarks-manager.c
+++ b/src/bookmarks/ephy-bookmarks-manager.c
@@ -339,7 +339,7 @@ synchronizable_manager_merge_remotes (EphySynchronizableManager *manager,
id = ephy_bookmark_get_id (remote);
local = ephy_bookmarks_manager_get_bookmark_by_id (self, id);
if (local) {
- if (ephy_bookmark_get_modification_time (local) > ephy_bookmark_get_modification_time (remote)) {
+ if (ephy_bookmark_get_time_modified (local) > ephy_bookmark_get_time_modified (remote)) {
to_upload = g_list_prepend (to_upload, g_object_ref (local));
g_hash_table_add (handled, (char *)id);
} else {
@@ -369,12 +369,12 @@ handle_updated:
ephy_bookmarks_manager_add_bookmark (self, remote);
ephy_bookmarks_manager_create_tags_from_bookmark (self, remote);
} else {
- /* Keep the bookmark with most recent modified timestamp. */
- if (ephy_bookmark_get_modification_time (remote) > ephy_bookmark_get_modification_time (local)) {
+ /* Keep the bookmark with most recent time modified timestamp. */
+ if (ephy_bookmark_get_time_modified (remote) > ephy_bookmark_get_time_modified (local)) {
ephy_bookmarks_manager_remove_bookmark (self, local);
ephy_bookmarks_manager_add_bookmark (self, remote);
ephy_bookmarks_manager_create_tags_from_bookmark (self, remote);
- } else if (ephy_bookmark_get_modification_time (local) > ephy_bookmark_get_modification_time (remote))
{
+ } else if (ephy_bookmark_get_time_modified (local) > ephy_bookmark_get_time_modified (remote)) {
ephy_bookmarks_manager_create_tags_from_bookmark (self, remote);
to_upload = g_list_prepend (to_upload, g_object_ref (local));
}
diff --git a/src/sync/ephy-sync-service.c b/src/sync/ephy-sync-service.c
index 2c335f8..80f9c9e 100644
--- a/src/sync/ephy-sync-service.c
+++ b/src/sync/ephy-sync-service.c
@@ -940,7 +940,7 @@ upload_synchronizable_cb (SoupSession *session,
{
EphySyncService *self;
SyncAsyncData *data;
- double modified;
+ double time_modified;
data = (SyncAsyncData *)user_data;
self = ephy_shell_get_sync_service (ephy_shell_get_default ());
@@ -952,9 +952,9 @@ upload_synchronizable_cb (SoupSession *session,
ephy_sync_service_download_synchronizable (self, data->manager, data->synchronizable);
} else if (msg->status_code == 200) {
LOG ("Successfully uploaded to server");
- modified = g_ascii_strtod (msg->response_body->data, NULL);
+ time_modified = g_ascii_strtod (msg->response_body->data, NULL);
/* FIXME: Make sure the synchronizable manager commits this change to file/database. */
- ephy_synchronizable_set_modification_time (data->synchronizable, modified);
+ ephy_synchronizable_set_time_modified (data->synchronizable, time_modified);
ephy_synchronizable_set_is_uploaded (data->synchronizable, TRUE);
} else {
g_warning ("Failed to upload object. Status code: %u, response: %s",
@@ -991,7 +991,7 @@ ephy_sync_service_upload_synchronizable (EphySyncService *self,
LOG ("Uploading object with id %s...", id);
ephy_sync_service_queue_storage_request (self, endpoint, SOUP_METHOD_PUT, body, -1,
- ephy_synchronizable_get_modification_time (synchronizable),
+ ephy_synchronizable_get_time_modified (synchronizable),
upload_synchronizable_cb, data);
g_free (body);
diff --git a/src/sync/ephy-synchronizable.c b/src/sync/ephy-synchronizable.c
index 250a686..1b4fdca 100644
--- a/src/sync/ephy-synchronizable.c
+++ b/src/sync/ephy-synchronizable.c
@@ -27,8 +27,8 @@ static void
ephy_synchronizable_default_init (EphySynchronizableInterface *iface)
{
iface->get_id = ephy_synchronizable_get_id;
- iface->get_modification_time = ephy_synchronizable_get_modification_time;
- iface->set_modification_time = ephy_synchronizable_set_modification_time;
+ iface->get_time_modified = ephy_synchronizable_get_time_modified;
+ iface->set_time_modified = ephy_synchronizable_set_time_modified;
iface->is_uploaded = ephy_synchronizable_is_uploaded;
iface->set_is_uploaded = ephy_synchronizable_set_is_uploaded;
iface->to_bso = ephy_synchronizable_to_bso;
@@ -80,7 +80,7 @@ ephy_synchronizable_set_id (EphySynchronizable *synchronizable,
}
/**
- * ephy_synchronizable_get_modification_time:
+ * ephy_synchronizable_get_time_modified:
* @synchronizable: an #EphySynchronizable
*
* Returns @synchronizable's last modification time.
@@ -88,33 +88,33 @@ ephy_synchronizable_set_id (EphySynchronizable *synchronizable,
* Return value: @synchronizable's last modification time
**/
double
-ephy_synchronizable_get_modification_time (EphySynchronizable *synchronizable)
+ephy_synchronizable_get_time_modified (EphySynchronizable *synchronizable)
{
EphySynchronizableInterface *iface;
g_return_val_if_fail (EPHY_IS_SYNCHRONIZABLE (synchronizable), 0);
iface = EPHY_SYNCHRONIZABLE_GET_IFACE (synchronizable);
- return iface->get_modification_time (synchronizable);
+ return iface->get_time_modified (synchronizable);
}
/**
- * ephy_synchronizable_set_modification_time:
+ * ephy_synchronizable_set_time_modified:
* @synchronizable: an #EphySynchronizable
- * @modified: the last modification time
+ * @time_modified: the last modification time
*
- * Sets @modified as @synchronizable's last modification time.
+ * Sets @time_modified as @synchronizable's last modification time.
**/
void
-ephy_synchronizable_set_modification_time (EphySynchronizable *synchronizable,
- double modified)
+ephy_synchronizable_set_time_modified (EphySynchronizable *synchronizable,
+ double time_modified)
{
EphySynchronizableInterface *iface;
g_return_if_fail (EPHY_IS_SYNCHRONIZABLE (synchronizable));
iface = EPHY_SYNCHRONIZABLE_GET_IFACE (synchronizable);
- iface->set_modification_time (synchronizable, modified);
+ iface->set_time_modified (synchronizable, time_modified);
}
/**
@@ -215,7 +215,7 @@ ephy_synchronizable_from_bso (JsonNode *bso,
JsonObject *json;
char *serialized = NULL;
const char *payload = NULL;
- double modified;
+ double time_modified;
g_return_val_if_fail (bso, NULL);
g_return_val_if_fail (bundle, NULL);
@@ -227,8 +227,8 @@ ephy_synchronizable_from_bso (JsonNode *bso,
goto out;
}
payload = json_object_get_string_member (json, "payload");
- modified = json_object_get_double_member (json, "modified");
- if (!payload || !modified) {
+ time_modified = json_object_get_double_member (json, "modified");
+ if (!payload || !time_modified) {
g_warning ("JSON object has missing or invalid members");
goto out;
}
@@ -256,7 +256,7 @@ ephy_synchronizable_from_bso (JsonNode *bso,
goto out;
}
- ephy_synchronizable_set_modification_time (EPHY_SYNCHRONIZABLE (object), modified);
+ ephy_synchronizable_set_time_modified (EPHY_SYNCHRONIZABLE (object), time_modified);
ephy_synchronizable_set_is_uploaded (EPHY_SYNCHRONIZABLE (object), TRUE);
out:
diff --git a/src/sync/ephy-synchronizable.h b/src/sync/ephy-synchronizable.h
index ef677b5..47be97e 100644
--- a/src/sync/ephy-synchronizable.h
+++ b/src/sync/ephy-synchronizable.h
@@ -38,40 +38,40 @@ G_DECLARE_INTERFACE (EphySynchronizable, ephy_synchronizable, EPHY, SYNCHRONIZAB
struct _EphySynchronizableInterface {
GTypeInterface parent_iface;
- const char * (*get_id) (EphySynchronizable *synchronizable);
- void (*set_id) (EphySynchronizable *synchronizable,
- const char *id);
+ const char * (*get_id) (EphySynchronizable *synchronizable);
+ void (*set_id) (EphySynchronizable *synchronizable,
+ const char *id);
- double (*get_modification_time) (EphySynchronizable *synchronizable);
- void (*set_modification_time) (EphySynchronizable *synchronizable,
- double modified);
+ double (*get_time_modified) (EphySynchronizable *synchronizable);
+ void (*set_time_modified) (EphySynchronizable *synchronizable,
+ double time_modified);
- gboolean (*is_uploaded) (EphySynchronizable *synchronizable);
- void (*set_is_uploaded) (EphySynchronizable *synchronizable,
- gboolean uploaded);
+ gboolean (*is_uploaded) (EphySynchronizable *synchronizable);
+ void (*set_is_uploaded) (EphySynchronizable *synchronizable,
+ gboolean uploaded);
- JsonNode * (*to_bso) (EphySynchronizable *synchronizable,
- SyncCryptoKeyBundle *bundle);
+ JsonNode * (*to_bso) (EphySynchronizable *synchronizable,
+ SyncCryptoKeyBundle *bundle);
};
-const char *ephy_synchronizable_get_id (EphySynchronizable *synchronizable);
-void ephy_synchronizable_set_id (EphySynchronizable *synchronizable,
- const char *id);
-double ephy_synchronizable_get_modification_time (EphySynchronizable *synchronizable);
-void ephy_synchronizable_set_modification_time (EphySynchronizable *synchronizable,
- double modified);
-gboolean ephy_synchronizable_is_uploaded (EphySynchronizable *synchronizable);
-void ephy_synchronizable_set_is_uploaded (EphySynchronizable *synchronizable,
- gboolean uploaded);
-JsonNode *ephy_synchronizable_to_bso (EphySynchronizable *synchronizable,
- SyncCryptoKeyBundle *bundle);
+const char *ephy_synchronizable_get_id (EphySynchronizable *synchronizable);
+void ephy_synchronizable_set_id (EphySynchronizable *synchronizable,
+ const char *id);
+double ephy_synchronizable_get_time_modified (EphySynchronizable *synchronizable);
+void ephy_synchronizable_set_time_modified (EphySynchronizable *synchronizable,
+ double time_modified);
+gboolean ephy_synchronizable_is_uploaded (EphySynchronizable *synchronizable);
+void ephy_synchronizable_set_is_uploaded (EphySynchronizable *synchronizable,
+ gboolean uploaded);
+JsonNode *ephy_synchronizable_to_bso (EphySynchronizable *synchronizable,
+ SyncCryptoKeyBundle *bundle);
/* This can't be an interface method because we lack the EphySynchronizable object. */
-GObject *ephy_synchronizable_from_bso (JsonNode *bso,
- GType gtype,
- SyncCryptoKeyBundle *bundle,
- gboolean *is_deleted);
+GObject *ephy_synchronizable_from_bso (JsonNode *bso,
+ GType gtype,
+ SyncCryptoKeyBundle *bundle,
+ gboolean *is_deleted);
/* Default implementations. */
-JsonNode *ephy_synchronizable_default_to_bso (EphySynchronizable *synchronizable,
- SyncCryptoKeyBundle *bundle);
+JsonNode *ephy_synchronizable_default_to_bso (EphySynchronizable *synchronizable,
+ SyncCryptoKeyBundle *bundle);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
