mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

47 lines
1.4 KiB

  1. # fixes 64bit issues (where a pointer to int was given, instead of gsize).
  2. --- xchat-2.0.5/src/common/server.c 2003-08-11 01:40:15.000000000 +1000
  3. +++ xchat-2.0.6/src/common/server.c 2003-10-07 14:54:26.000000000 +1000
  4. @@ -289,8 +289,8 @@
  5. {
  6. char *conv_line; /* holds a copy of the original string */
  7. int conv_len; /* tells g_convert how much of line to convert */
  8. - int utf_len;
  9. - int read_len;
  10. + gsize utf_len;
  11. + gsize read_len;
  12. GError *err;
  13. gboolean retry;
  14. --- xchat-2.0.5/src/common/text.c 2003-09-21 20:36:15.000000000 +1000
  15. +++ xchat-2.0.6/src/common/text.c 2003-10-07 15:01:06.000000000 +1000
  16. @@ -446,7 +446,7 @@
  17. get_stamp_str (char *fmt, time_t tim, char **ret)
  18. {
  19. char dest[128];
  20. - int len;
  21. + gsize len;
  22. len = strftime (dest, sizeof (dest), fmt, localtime (&tim));
  23. if (len)
  24. --- xchat-2.0.5/src/fe-gtk/xtext.c 2003-09-18 15:26:52.000000000 +1000
  25. +++ xchat-2.0.6/src/fe-gtk/xtext.c 2003-10-07 14:57:14.000000000 +1000
  26. @@ -2126,6 +2126,7 @@
  27. char *stripped;
  28. guchar *new_text;
  29. int len;
  30. + gsize glen;
  31. stripped = gtk_xtext_selection_get_text (xtext, &len);
  32. if (!stripped)
  33. @@ -2158,9 +2159,9 @@
  34. }
  35. break;
  36. default:
  37. - new_text = g_locale_from_utf8 (stripped, len, NULL, &len, NULL);
  38. + new_text = g_locale_from_utf8 (stripped, len, NULL, &glen, NULL);
  39. gtk_selection_data_set (selection_data_ptr, GDK_SELECTION_TYPE_STRING,
  40. - 8, new_text, len);
  41. + 8, new_text, glen);
  42. g_free (new_text);
  43. }