aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--lib/eel-gconf-extensions.c2
-rw-r--r--src/ephy-navigation-action.c4
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b38b359e0..62ead18d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-09 Christopher Blizzard <blizzard@redhat.com>
+
+ * src/ephy-navigation-action.c (activate_up_menu_item_cb):
+ * src/ephy-navigation-action.c (activate_back_or_forward_menu_item_cb):
+ * lib/eel-gconf-extensions.c (ephy_notification_add):
+
+ Fix 64 bit problems. Patch from katzj@redhat.com.
+
2003-05-10 Marco Pesenti Gritti <marco@it.gnome.org>
* src/prefs-dialog.c: (prefs_dialog_show_help):
diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index e6593219a..2d29bdf36 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -538,7 +538,7 @@ ephy_notification_add (const char *key,
callback_data);
if (notifiers != NULL) {
*notifiers = g_list_append(*notifiers,
- (gpointer)id);
+ GINT_TO_POINTER(id));
}
}
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index 6073292ac..f53a43e82 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -94,7 +94,7 @@ activate_back_or_forward_menu_item_cb (GtkWidget *menu, EphyWindow *window)
embed = ephy_window_get_active_embed (window);
g_return_if_fail (embed != NULL);
- go_nth = (int)g_object_get_data (G_OBJECT(menu), "go_nth");
+ go_nth = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(menu), "go_nth"));
ephy_embed_shistory_go_nth (embed, go_nth);
}
@@ -110,7 +110,7 @@ activate_up_menu_item_cb (GtkWidget *menu, EphyWindow *window)
embed = ephy_window_get_active_embed (window);
g_return_if_fail (embed != NULL);
- go_nth = (int)g_object_get_data (G_OBJECT(menu), "go_nth");
+ go_nth = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(menu), "go_nth"));
ephy_embed_get_go_up_list (embed, &l);