aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog20
-rw-r--r--lib/ephy-node.c12
-rw-r--r--lib/ephy-node.h4
-rw-r--r--src/bookmarks/ephy-bookmark-action.c2
-rw-r--r--src/bookmarks/ephy-bookmark-properties.c4
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c6
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.c4
-rw-r--r--src/bookmarks/ephy-new-bookmark.c4
-rw-r--r--src/bookmarks/ephy-new-bookmark.h2
-rw-r--r--src/bookmarks/ephy-topic-action.c6
10 files changed, 42 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 160eee946..0770d47dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
2004-06-24 Marco Pesenti Gritti <marco@gnome.org>
+ * lib/ephy-node.c: (ephy_node_new_with_id), (ephy_node_get_id),
+ (child_changed), (write_parent):
+ * lib/ephy-node.h:
+ * src/bookmarks/ephy-bookmark-action.c:
+ (bookmarks_child_changed_cb):
+ * src/bookmarks/ephy-bookmark-properties.c:
+ (toolbar_checkbox_changed_cb), (build_ui):
+ * src/bookmarks/ephy-bookmarks-editor.c:
+ (cmd_show_in_bookmarks_bar), (ephy_bookmarks_editor_update_menu):
+ * src/bookmarks/ephy-bookmarks-menu.c: (create_menu),
+ (topic_child_changed_cb):
+ * src/bookmarks/ephy-new-bookmark.c:
+ * src/bookmarks/ephy-new-bookmark.h:
+ * src/bookmarks/ephy-topic-action.c:
+ (ephy_topic_action_set_topic_id), (topic_child_changed_cb):
+
+ Use guint consistently for node ids
+
+2004-06-24 Marco Pesenti Gritti <marco@gnome.org>
+
* src/bookmarks/ephy-bookmarksbar.c: (open_in_tabs_cb),
(go_location_cb), (ephy_bookmarksbar_action_request):
* src/bookmarks/ephy-topic-action.c: (append_bookmarks_menu),
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index 087d18fdc..ed5e23eb8 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -60,7 +60,7 @@ struct EphyNode
{
int ref_count;
- gulong id;
+ guint id;
GPtrArray *properties;
@@ -308,7 +308,7 @@ ephy_node_new (EphyNodeDb *db)
}
EphyNode *
-ephy_node_new_with_id (EphyNodeDb *db, gulong reserved_id)
+ephy_node_new_with_id (EphyNodeDb *db, guint reserved_id)
{
EphyNode *node;
@@ -352,12 +352,12 @@ ephy_node_get_db (EphyNode *node)
return node->db;
}
-long
+guint
ephy_node_get_id (EphyNode *node)
{
long ret;
- g_return_val_if_fail (EPHY_IS_NODE (node), -1);
+ g_return_val_if_fail (EPHY_IS_NODE (node), G_MAXUINT);
ret = node->id;
@@ -386,7 +386,7 @@ ephy_node_unref (EphyNode *node)
}
static void
-child_changed (gulong id,
+child_changed (guint id,
EphyNodeParent *node_info,
EphyNodeChange *change)
{
@@ -642,7 +642,7 @@ typedef struct
} ForEachData;
static void
-write_parent (gulong id,
+write_parent (guint id,
EphyNodeParent *node_info,
ForEachData* data)
{
diff --git a/lib/ephy-node.h b/lib/ephy-node.h
index b87b56649..b2c13225e 100644
--- a/lib/ephy-node.h
+++ b/lib/ephy-node.h
@@ -51,12 +51,12 @@ typedef void (*EphyNodeCallback) (EphyNode *node, ...);
EphyNode *ephy_node_new (EphyNodeDb *db);
EphyNode *ephy_node_new_with_id (EphyNodeDb *db,
- gulong reserved_id);
+ guint reserved_id);
EphyNodeDb *ephy_node_get_db (EphyNode *node);
/* unique node ID */
-long ephy_node_get_id (EphyNode *node);
+guint ephy_node_get_id (EphyNode *node);
/* refcounting */
void ephy_node_ref (EphyNode *node);
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 479790bc1..f47f46683 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -569,7 +569,7 @@ bookmarks_child_changed_cb (EphyNode *node,
guint property_id,
GtkAction *action)
{
- gulong id;
+ guint id;
id = EPHY_BOOKMARK_ACTION (action)->priv->bookmark_id;
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index f984124b8..d72482a65 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -254,7 +254,7 @@ static void
toolbar_checkbox_changed_cb (GtkWidget *checkbox, EphyBookmarkProperties *props)
{
gboolean state;
- gulong id;
+ guint id;
state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
@@ -314,7 +314,7 @@ build_ui (EphyBookmarkProperties *editor)
char *str;
const char *tmp;
gboolean state;
- gulong id;
+ guint id;
g_signal_connect (G_OBJECT (editor),
"response",
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 810bb9cb2..a22ae3191 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -345,7 +345,7 @@ cmd_show_in_bookmarks_bar (GtkAction *action,
EphyNode *node;
GList *selection;
gboolean state, topic;
- gulong id;
+ guint id;
if (ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->bm_view)))
{
@@ -1001,7 +1001,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
{
EphyNode *node = selected->data;
EphyNodePriority priority;
- gulong id;
+ guint id;
id = ephy_node_get_id (node);
show_in_bookmarks_bar = ephy_bookmarksbar_model_has_bookmark
@@ -1019,7 +1019,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
if (bmk_focus && selected)
{
EphyNode *node = selected->data;
- gulong id;
+ guint id;
g_return_if_fail (node != NULL);
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 7caa40d7a..601027aa2 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -210,7 +210,7 @@ create_menu (EphyBookmarksMenu *menu, EphyNode *node, const char *path)
child = l->data;
id = ephy_node_get_id (child);
g_snprintf (verb, sizeof (verb),
- "OpenBmk%ld", ephy_node_get_id (child));
+ "OpenBmk%d", ephy_node_get_id (child));
g_snprintf (name, sizeof (name), "%sName", verb);
g_snprintf (accel_path, sizeof (accel_path),
"<Actions>/BookmarksActions/%s", verb);
@@ -487,7 +487,7 @@ topic_child_changed_cb (EphyNode *node,
return;
}
- g_snprintf (name, sizeof (name), "OpenTopic%ld", ephy_node_get_id (child));
+ g_snprintf (name, sizeof (name), "OpenTopic%d", ephy_node_get_id (child));
action = gtk_action_group_get_action (menu->priv->action_group, name);
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index 9723690b9..742ae005b 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -65,7 +65,7 @@ struct EphyNewBookmarkPrivate
EphyBookmarks *bookmarks;
char *location;
char *icon;
- gulong id;
+ guint id;
GtkWidget *title_entry;
GtkWidget *topics_selector;
@@ -508,7 +508,7 @@ ephy_new_bookmark_set_icon (EphyNewBookmark *bookmark,
bookmark->priv->icon = icon ? g_strdup (icon) : NULL;
}
-gulong
+guint
ephy_new_bookmark_get_id (EphyNewBookmark *bookmark)
{
return bookmark->priv->id;
diff --git a/src/bookmarks/ephy-new-bookmark.h b/src/bookmarks/ephy-new-bookmark.h
index 3891887a0..a10c31250 100644
--- a/src/bookmarks/ephy-new-bookmark.h
+++ b/src/bookmarks/ephy-new-bookmark.h
@@ -65,7 +65,7 @@ void ephy_new_bookmark_set_title (EphyNewBookmark *bookmark,
void ephy_new_bookmark_set_icon (EphyNewBookmark *bookmark,
const char *icon);
-gulong ephy_new_bookmark_get_id (EphyNewBookmark *bookmark);
+guint ephy_new_bookmark_get_id (EphyNewBookmark *bookmark);
G_END_DECLS
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 64ecff7e9..7e6694539 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -42,7 +42,7 @@ static void ephy_topic_action_class_init (EphyTopicActionClass *class);
struct EphyTopicActionPrivate
{
- gulong topic_id;
+ guint topic_id;
EphyNode *topic_node;
};
@@ -546,7 +546,7 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
}
static void
-ephy_topic_action_set_topic_id (EphyTopicAction *action, gulong id)
+ephy_topic_action_set_topic_id (EphyTopicAction *action, guint id)
{
EphyBookmarks *bookmarks;
EphyNode *node;
@@ -678,7 +678,7 @@ topic_child_changed_cb (EphyNode *node,
guint property_id,
GtkAction *action)
{
- gulong id;
+ guint id;
id = EPHY_TOPIC_ACTION (action)->priv->topic_id;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 16:00:57 +0800