aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-06-24 18:03:31 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-06-24 18:03:31 +0800
commit61578d1e428abbd67ba292fcfe7310a71274ae10 (patch)
treead6dffbccd58e46c788894ab91d4402284647cf7 /lib
parent6fcf143b625f3423798bea58621a231446eac361 (diff)
downloadgsoc2013-epiphany-61578d1e428abbd67ba292fcfe7310a71274ae10.tar
gsoc2013-epiphany-61578d1e428abbd67ba292fcfe7310a71274ae10.tar.gz
gsoc2013-epiphany-61578d1e428abbd67ba292fcfe7310a71274ae10.tar.bz2
gsoc2013-epiphany-61578d1e428abbd67ba292fcfe7310a71274ae10.tar.lz
gsoc2013-epiphany-61578d1e428abbd67ba292fcfe7310a71274ae10.tar.xz
gsoc2013-epiphany-61578d1e428abbd67ba292fcfe7310a71274ae10.tar.zst
gsoc2013-epiphany-61578d1e428abbd67ba292fcfe7310a71274ae10.zip
Use guint consistently for node ids
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
Diffstat (limited to 'lib')
-rw-r--r--lib/ephy-node.c12
-rw-r--r--lib/ephy-node.h4
2 files changed, 8 insertions, 8 deletions
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);