[epiphany] bookmarks-manager: Use more suggestive names for tag operations to avoid confusion
- From: Iulian Radu <iulianradu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] bookmarks-manager: Use more suggestive names for tag operations to avoid confusion
- Date: Thu, 29 Sep 2016 09:58:26 +0000 (UTC)
commit 7b633553a0bef20ce1ff0948e3376452335e1bba
Author: Iulian Radu <iulian radu67 gmail com>
Date: Wed Sep 28 19:52:18 2016 +0300
bookmarks-manager: Use more suggestive names for tag operations to avoid confusion
Tag add/remove for for the bookmarks manager can easily be confused with
adding/removing a tag for a specific bookmark.
src/bookmarks/ephy-bookmark-properties-grid.c | 6 +++---
src/bookmarks/ephy-bookmarks-manager.c | 22 +++++++++++-----------
src/bookmarks/ephy-bookmarks-manager.h | 4 ++--
src/bookmarks/ephy-bookmarks-popover.c | 16 ++++++++--------
4 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/src/bookmarks/ephy-bookmark-properties-grid.c b/src/bookmarks/ephy-bookmark-properties-grid.c
index a6d041a..73356a0 100644
--- a/src/bookmarks/ephy-bookmark-properties-grid.c
+++ b/src/bookmarks/ephy-bookmark-properties-grid.c
@@ -127,7 +127,7 @@ ephy_bookmark_properties_grid_tag_widget_button_clicked_cb (EphyBookmarkProperti
g_assert (GTK_IS_BOX (box));
label = g_object_get_data (G_OBJECT (box), "label");
- ephy_bookmarks_manager_remove_tag (self->manager, gtk_label_get_text (label));
+ ephy_bookmarks_manager_delete_tag (self->manager, gtk_label_get_text (label));
flow_box_child = gtk_widget_get_parent (box);
gtk_widget_destroy (flow_box_child);
@@ -213,8 +213,8 @@ ephy_bookmarks_properties_grid_actions_add_tag (GSimpleAction *action,
buffer = gtk_entry_get_buffer (GTK_ENTRY (self->add_tag_entry));
text = gtk_entry_buffer_get_text (buffer);
- /* Add tag to the list of all tags. */
- ephy_bookmarks_manager_add_tag (self->manager, text);
+ /* Create new tag with the given title */
+ ephy_bookmarks_manager_create_tag (self->manager, text);
/* Add tag to the bookmark's list of tags. */
ephy_bookmark_add_tag (self->bookmark, text);
diff --git a/src/bookmarks/ephy-bookmarks-manager.c b/src/bookmarks/ephy-bookmarks-manager.c
index ef9207a..02d89f4 100644
--- a/src/bookmarks/ephy-bookmarks-manager.c
+++ b/src/bookmarks/ephy-bookmarks-manager.c
@@ -44,8 +44,8 @@ G_DEFINE_TYPE_EXTENDED (EphyBookmarksManager, ephy_bookmarks_manager, G_TYPE_OBJ
enum {
BOOKMARK_ADDED,
BOOKMARK_REMOVED,
- TAG_ADDED,
- TAG_REMOVED,
+ TAG_CREATED,
+ TAG_DELETED,
LAST_SIGNAL
};
@@ -160,8 +160,8 @@ ephy_bookmarks_manager_class_init (EphyBookmarksManagerClass *klass)
G_TYPE_NONE, 1,
EPHY_TYPE_BOOKMARK);
- signals[TAG_ADDED] =
- g_signal_new ("tag-added",
+ signals[TAG_CREATED] =
+ g_signal_new ("tag-created",
EPHY_TYPE_BOOKMARKS_MANAGER,
G_SIGNAL_RUN_LAST,
0,
@@ -169,8 +169,8 @@ ephy_bookmarks_manager_class_init (EphyBookmarksManagerClass *klass)
G_TYPE_NONE, 1,
G_TYPE_STRING);
- signals[TAG_REMOVED] =
- g_signal_new ("tag-removed",
+ signals[TAG_DELETED] =
+ g_signal_new ("tag-deleted",
EPHY_TYPE_BOOKMARKS_MANAGER,
G_SIGNAL_RUN_LAST,
0,
@@ -350,7 +350,7 @@ ephy_bookmarks_manager_get_bookmark_by_url (EphyBookmarksManager *self,
}
void
-ephy_bookmarks_manager_add_tag (EphyBookmarksManager *self, const char *tag)
+ephy_bookmarks_manager_create_tag (EphyBookmarksManager *self, const char *tag)
{
GSequenceIter *tag_iter;
GSequenceIter *prev_tag_iter;
@@ -367,12 +367,12 @@ ephy_bookmarks_manager_add_tag (EphyBookmarksManager *self, const char *tag)
if (g_sequence_iter_is_end (prev_tag_iter)
|| g_strcmp0 (g_sequence_get (prev_tag_iter), tag) != 0) {
g_sequence_insert_before (tag_iter, g_strdup (tag));
- g_signal_emit (self, signals[TAG_ADDED], 0, tag);
+ g_signal_emit (self, signals[TAG_CREATED], 0, tag);
}
}
void
-ephy_bookmarks_manager_remove_tag (EphyBookmarksManager *self, const char *tag)
+ephy_bookmarks_manager_delete_tag (EphyBookmarksManager *self, const char *tag)
{
GSequenceIter *iter = NULL;
int position;
@@ -393,7 +393,7 @@ ephy_bookmarks_manager_remove_tag (EphyBookmarksManager *self, const char *tag)
/* Also remove the tag from each bookmark if they have it */
g_sequence_foreach (self->bookmarks, (GFunc)ephy_bookmark_remove_tag, (gpointer)tag);
- g_signal_emit (self, signals[TAG_REMOVED], 0, position);
+ g_signal_emit (self, signals[TAG_DELETED], 0, position);
}
gboolean
@@ -515,7 +515,7 @@ ephy_bookmarks_manager_load_from_file (EphyBookmarksManager *self)
/* Iterate over all keys (url's) in the table. */
list = gvdb_table_get_names (table, &length);
for (i = 0; i < length; i++)
- ephy_bookmarks_manager_add_tag (self, list[i]);
+ ephy_bookmarks_manager_create_tag (self, list[i]);
gvdb_table_free (table);
diff --git a/src/bookmarks/ephy-bookmarks-manager.h b/src/bookmarks/ephy-bookmarks-manager.h
index 9817260..bf906d1 100644
--- a/src/bookmarks/ephy-bookmarks-manager.h
+++ b/src/bookmarks/ephy-bookmarks-manager.h
@@ -37,9 +37,9 @@ void ephy_bookmarks_manager_remove_bookmark (EphyBookmarks
EphyBookmark *ephy_bookmarks_manager_get_bookmark_by_url (EphyBookmarksManager *self,
const char *url);
-void ephy_bookmarks_manager_add_tag (EphyBookmarksManager *self,
+void ephy_bookmarks_manager_create_tag (EphyBookmarksManager *self,
const char *tag);
-void ephy_bookmarks_manager_remove_tag (EphyBookmarksManager *self,
+void ephy_bookmarks_manager_delete_tag (EphyBookmarksManager *self,
const char *tag);
gboolean ephy_bookmarks_manager_tag_exists (EphyBookmarksManager *self,
const char *tag);
diff --git a/src/bookmarks/ephy-bookmarks-popover.c b/src/bookmarks/ephy-bookmarks-popover.c
index bacf949..8a42537 100644
--- a/src/bookmarks/ephy-bookmarks-popover.c
+++ b/src/bookmarks/ephy-bookmarks-popover.c
@@ -256,9 +256,9 @@ ephy_bookmarks_popover_bookmark_removed_cb (EphyBookmarksPopover *self,
}
static void
-ephy_bookmarks_popover_tag_added_cb (EphyBookmarksPopover *self,
- const char *tag,
- EphyBookmarksManager *manager)
+ephy_bookmarks_popover_tag_created_cb (EphyBookmarksPopover *self,
+ const char *tag,
+ EphyBookmarksManager *manager)
{
GtkWidget *tag_row;
@@ -271,7 +271,7 @@ ephy_bookmarks_popover_tag_added_cb (EphyBookmarksPopover *self,
}
static void
-ephy_bookmarks_popover_tag_removed_cb (EphyBookmarksPopover *self,
+ephy_bookmarks_popover_tag_deleted_cb (EphyBookmarksPopover *self,
int position,
EphyBookmarksManager *manager)
{
@@ -505,11 +505,11 @@ ephy_bookmarks_popover_init (EphyBookmarksPopover *self)
g_signal_connect_object (self->manager, "bookmark-removed",
G_CALLBACK (ephy_bookmarks_popover_bookmark_removed_cb),
self, G_CONNECT_SWAPPED);
- g_signal_connect_object (self->manager, "tag-added",
- G_CALLBACK (ephy_bookmarks_popover_tag_added_cb),
+ g_signal_connect_object (self->manager, "tag-created",
+ G_CALLBACK (ephy_bookmarks_popover_tag_created_cb),
self, G_CONNECT_SWAPPED);
- g_signal_connect_object (self->manager, "tag-removed",
- G_CALLBACK (ephy_bookmarks_popover_tag_removed_cb),
+ g_signal_connect_object (self->manager, "tag-deleted",
+ G_CALLBACK (ephy_bookmarks_popover_tag_deleted_cb),
self, G_CONNECT_SWAPPED);
g_signal_connect_object (self->bookmarks_list_box, "row-activated",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]