[Gaim-commits] CVS: gaim/src gtkblist.c,1.120,1.121 gtkconv.c,1.219,1.220 gtkimhtml.c,1.211,1.212 gtknotify.c,1.24,1.25 util.c,1.231,1.232

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5460/src

Modified Files:
	gtkblist.c gtkconv.c gtkimhtml.c gtknotify.c util.c 
Log Message:
Code cleanup to get rid of all warnings for AMD64 from augustus at linuxhardware dot org


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -p -r1.120 -r1.121
--- gtkblist.c	30 Oct 2003 21:39:51 -0000	1.120
+++ gtkblist.c	30 Oct 2003 22:27:34 -0000	1.121
@@ -2067,7 +2067,7 @@ enum {DRAG_BUDDY, DRAG_ROW};
 static char *
 item_factory_translate_func (const char *path, gpointer func_data)
 {
-	return _(path);
+	return _((char *)path);
 }
 
 void gaim_gtk_blist_setup_sort_methods()

Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -p -r1.219 -r1.220
--- gtkconv.c	25 Oct 2003 00:03:13 -0000	1.219
+++ gtkconv.c	30 Oct 2003 22:27:35 -0000	1.220
@@ -2988,7 +2988,7 @@ static const int menu_item_count =
 static char *
 item_factory_translate_func (const char *path, gpointer func_data)
 {
-	return _(path);
+	return _((char *)path);
 }
 
 static GtkWidget *
@@ -5919,7 +5919,7 @@ show_timestamps_pref_cb(const char *name
 
 		gtkconv = GAIM_GTK_CONVERSATION(conv);
 
-		gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml), (gboolean)value);
+		gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml), (gboolean)GPOINTER_TO_INT(value));
 	}
 }
 
@@ -5968,7 +5968,7 @@ show_smileys_pref_cb(const char *name, G
 
 		gtkconv = GAIM_GTK_CONVERSATION(conv);
 
-		gtk_imhtml_show_smileys(GTK_IMHTML(gtkconv->imhtml), (gboolean)value);
+		gtk_imhtml_show_smileys(GTK_IMHTML(gtkconv->imhtml), (gboolean)GPOINTER_TO_INT(value));
 	}
 }
 
@@ -6016,7 +6016,7 @@ show_formatting_toolbar_pref_cb(const ch
 		win     = gaim_conversation_get_window(conv);
 		gtkwin  = GAIM_GTK_WINDOW(win);
 
-		gtkconv->show_formatting_toolbar = (gboolean)value;
+		gtkconv->show_formatting_toolbar = (gboolean)GPOINTER_TO_INT(value);
 		gtk_check_menu_item_set_active(
 				GTK_CHECK_MENU_ITEM(gtkwin->menu.show_formatting_toolbar),
 				gtkconv->show_formatting_toolbar);

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -p -r1.211 -r1.212
--- gtkimhtml.c	30 Oct 2003 21:19:27 -0000	1.211
+++ gtkimhtml.c	30 Oct 2003 22:27:35 -0000	1.212
@@ -95,7 +95,7 @@ gtk_smiley_tree_insert (GtkSmileyTree *t
 			t->children = g_realloc (t->children, t->values->len * sizeof (GtkSmileyTree *));
 			t->children [index] = g_new0 (GtkSmileyTree, 1);
 		} else
-			index = (int) pos - GPOINTER_TO_INT(t->values->str);
+			index = GPOINTER_TO_INT(pos) - GPOINTER_TO_INT(t->values->str);
 		
 		t = t->children [index];
 		

Index: gtknotify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtknotify.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -p -r1.24 -r1.25
--- gtknotify.c	3 Oct 2003 23:19:21 -0000	1.24
+++ gtknotify.c	30 Oct 2003 22:27:35 -0000	1.25
@@ -206,8 +206,8 @@ gaim_gtk_notify_emails(size_t count, gbo
 
 	/* Descriptive label */
 	detail_text = g_strdup_printf(
-		ngettext("%s has %d new message.", "%s has %d new messages.", count),
-		*tos, count);
+		ngettext("%s has %d new message.", "%s has %d new messages.", (int) count),
+		*tos, (int) count);
 
 	if (count == 1) {
 		char *from_text = NULL, *subject_text = NULL;

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -p -r1.231 -r1.232
--- util.c	24 Oct 2003 05:46:01 -0000	1.231
+++ util.c	30 Oct 2003 22:27:35 -0000	1.232
@@ -1778,7 +1778,7 @@ parse_content_len(const char *data, size
 {
 	size_t content_len = 0;
 
-	sscanf(data, "Content-Length: %d", &content_len);
+	sscanf(data, "Content-Length: %d", (int *)&content_len);
 
 	return content_len;
 }