# HG changeset patch # User Mark Doliner # Date 1121997975 0 # Node ID 5c56223fa24f70a2c8806ea48c13b09b8fe7adff # Parent ee059fe9b3620e6ca7a681154470d1d27bd4fec5 [gaim-migrate @ 13207] I think this gets rid of the last of the gcc4 -Wall warnings in the core committer: Tailor Script diff -r ee059fe9b362 -r 5c56223fa24f src/cipher.c --- a/src/cipher.c Fri Jul 22 01:49:19 2005 +0000 +++ b/src/cipher.c Fri Jul 22 02:06:15 2005 +0000 @@ -650,7 +650,7 @@ context = gaim_cipher_context_new(cipher, NULL); gaim_cipher_context_append(context, data, data_len); ret = gaim_cipher_context_digest(context, in_len, digest, out_len); - gaim_cipher_context_destroy(context); + gaim_cipher_context_destroy(context); return ret; } diff -r ee059fe9b362 -r 5c56223fa24f src/gtkimhtml.c --- a/src/gtkimhtml.c Fri Jul 22 01:49:19 2005 +0000 +++ b/src/gtkimhtml.c Fri Jul 22 02:06:15 2005 +0000 @@ -828,7 +828,7 @@ str = g_string_append(str, text); str = g_string_append_unichar(str, 0x0000); selection = g_convert(str->str, str->len, "UCS-2", "UTF-8", NULL, &len, NULL); - gtk_selection_data_set(selection_data, gdk_atom_intern("text/html", FALSE), 16, selection, len); + gtk_selection_data_set(selection_data, gdk_atom_intern("text/html", FALSE), 16, (const guchar *)selection, len); g_string_free(str, TRUE); g_free(selection); } else { @@ -1546,11 +1546,11 @@ static void gtk_imhtml_link_drag_rcv_cb(GtkWidget *widget, GdkDragContext *dc, guint x, guint y, - GtkSelectionData *sd, guint info, guint t, GtkIMHtml *imhtml) + GtkSelectionData *sd, guint info, guint t, GtkIMHtml *imhtml) { gchar **links; gchar *link; - char *text = sd->data; + char *text = (char *)sd->data; GtkTextMark *mark = gtk_text_buffer_get_insert(imhtml->text_buffer); GtkTextIter iter; gint i = 0; @@ -1560,9 +1560,10 @@ if(gtk_imhtml_get_editable(imhtml) && sd->data){ switch (info) { case GTK_IMHTML_DRAG_URL: - gaim_str_strip_cr(sd->data); - - links = g_strsplit(sd->data, "\n", 0); + /* TODO: Is it really ok to change sd->data...? */ + gaim_str_strip_cr((char *)sd->data); + + links = g_strsplit((char *)sd->data, "\n", 0); while((link = links[i]) != NULL){ if(gaim_str_has_prefix(link, "http://") || gaim_str_has_prefix(link, "https://") || diff -r ee059fe9b362 -r 5c56223fa24f src/proxy.c --- a/src/proxy.c Fri Jul 22 01:49:19 2005 +0000 +++ b/src/proxy.c Fri Jul 22 02:06:15 2005 +0000 @@ -1083,9 +1083,9 @@ char *t1, *t2; t1 = g_strdup_printf("%s:%s", gaim_proxy_info_get_username(phb->gpi), - gaim_proxy_info_get_password(phb->gpi) ? + gaim_proxy_info_get_password(phb->gpi) ? gaim_proxy_info_get_password(phb->gpi) : ""); - t2 = gaim_base64_encode(t1, strlen(t1)); + t2 = gaim_base64_encode((const guchar *)t1, strlen(t1)); g_free(t1); g_return_if_fail(request_len < sizeof(request)); request_len += g_snprintf(request + request_len, @@ -1418,7 +1418,7 @@ unsigned char Kxoropad[65]; int pwlen; char * pwinput; - char md5buf[16]; + guint8 md5buf[16]; cipher = gaim_ciphers_find_cipher("md5"); ctx = gaim_cipher_context_new(cipher, NULL); @@ -1426,7 +1426,7 @@ pwinput=(char *)passwd; pwlen=strlen(passwd); if (pwlen>64) { - gaim_cipher_context_append(ctx, passwd, strlen(passwd)); + gaim_cipher_context_append(ctx, (const guint8 *)passwd, strlen(passwd)); gaim_cipher_context_digest(ctx, sizeof(md5buf), md5buf, NULL); pwinput=(char *)md5buf; pwlen=16;