--- src/chatwindow.cpp.orig	2006-09-08 01:47:35.000000000 +0200
+++ src/chatwindow.cpp.orig	2006-09-08 01:40:26.000000000 +0200
@@ -2325,8 +2325,8 @@ 
 	guint menu, 
 		  selection;
 	
-	menu = (guint)g_object_get_data(G_OBJECT(item), "ICQmenuMENU");
-	selection = (guint)g_object_get_data(G_OBJECT(item), "ICQmenuID");
+	menu = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "ICQmenuMENU"));
+	selection = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "ICQmenuID"));
 		
 	switch(menu)
 	{
--- src/historywindow.cpp.orig	2006-09-08 01:47:35.000000000 +0200
+++ src/historywindow.cpp.orig	2006-09-08 01:40:26.000000000 +0200
@@ -581,11 +581,11 @@ 
 	data = g_object_get_data(G_OBJECT(w), "icqnd-hdata");
 	
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
-		((IMHistoryManager*)hw->manager)->readMask = ((IMHistoryManager*)hw->manager)->readMask | (guint)data;
+		((IMHistoryManager*)hw->manager)->readMask = ((IMHistoryManager*)hw->manager)->readMask | GPOINTER_TO_INT(data);
 	else
 	{
-		if (((IMHistoryManager*)hw->manager)->readMask & (guint)data)
-			((IMHistoryManager*)hw->manager)->readMask = ((IMHistoryManager*)hw->manager)->readMask ^ (guint)data;
+		if (((IMHistoryManager*)hw->manager)->readMask & GPOINTER_TO_INT(data))
+			((IMHistoryManager*)hw->manager)->readMask = ((IMHistoryManager*)hw->manager)->readMask ^ GPOINTER_TO_INT(data);
 	}
 	((IMHistoryManager*)hw->manager)->resetHistoryReading();
 	hw->showEntries();	
--- src/mainwindow.cpp.orig	2006-09-08 01:47:35.000000000 +0200
+++ src/mainwindow.cpp.orig	2006-09-08 01:40:26.000000000 +0200
@@ -1418,8 +1418,8 @@ 
 	guint menu, 
 		  selection;
 	
-	menu = (guint)g_object_get_data(G_OBJECT(item), "ICQmenuMENU");
-	selection = (guint)g_object_get_data(G_OBJECT(item), "ICQmenuID");
+	menu = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "ICQmenuMENU"));
+	selection = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "ICQmenuID"));
 			
 	if (selection != MENU_NONE && mw->menuCallBack)
 		mw->menuCallBack(item, menu, selection, mw->menuCallBackData);