Advertisement
Guest User

Untitled

a guest
May 22nd, 2017
52
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.14 KB | None | 0 0
  1. --- twitux-0.69/src/twitux-network.h
  2. +++ twitux-0.69/src/twitux-network.h
  3. @@ -72,7 +72,7 @@
  4. GList *twitux_network_get_followers (void);
  5.  
  6. /* Get an image from servers */
  7. -void twitux_network_get_image (const gchar *url_image,
  8. +void twitux_network_get_image (const TwituxUser *user,
  9. GtkTreeIter iter);
  10.  
  11. /* Add a user to follow */
  12. only in patch2:
  13. unchanged:
  14. --- twitux-0.69/src/twitux-parser.c
  15. +++ twitux-0.69/src/twitux-parser.c
  16. @@ -278,8 +278,7 @@
  17. g_free (tweet);
  18.  
  19. /* Get Image */
  20. - twitux_network_get_image (status->user->image_url,
  21. - iter);
  22. + twitux_network_get_image (status->user, iter);
  23.  
  24. /* Free struct */
  25. parser_free_user (status->user);
  26. only in patch2:
  27. unchanged:
  28. --- twitux-0.69/src/twitux-network.c
  29. +++ twitux-0.69/src/twitux-network.c
  30. @@ -379,7 +379,7 @@
  31.  
  32. /* Get an image from servers */
  33. void
  34. -twitux_network_get_image (const gchar *url_image,
  35. +twitux_network_get_image (const TwituxUser *user,
  36. GtkTreeIter iter)
  37. {
  38. gchar *image_file;
  39. @@ -387,13 +387,16 @@
  40.  
  41. TwituxImage *image;
  42.  
  43. - /* save using the filename */
  44. - image_name = strrchr (url_image, '/');
  45. - if (image_name && image_name[1] != '\0') {
  46. - image_name++;
  47. - } else {
  48. - image_name = "twitux_unknown_image";
  49. - }
  50. + /* save using the username as the filename */
  51. + /* Bugfix #412390 */
  52. + if (user->screen_name)
  53. + {
  54. + image_name = user->screen_name;
  55. + }
  56. + else
  57. + {
  58. + image_name = "twitux_unknown_image";
  59. + }
  60.  
  61. image_file = g_build_filename (g_get_home_dir(), ".gnome2",
  62. TWITUX_CACHE_IMAGES,
  63. @@ -414,7 +417,7 @@
  64. g_free (image_file);
  65.  
  66. /* Note: 'image' will be freed in 'network_cb_on_image' */
  67. - network_get_data (url_image, network_cb_on_image, image);
  68. + network_get_data (user->image_url, network_cb_on_image, image);
  69. }
  70.  
  71.  
  72. only in patch2:
  73. unchanged:
  74. --- twitux-0.69/src/twitux-app.c
  75. +++ twitux-0.69/src/twitux-app.c
  76. @@ -1470,7 +1470,7 @@
  77. GdkPixbuf *pixbuf;
  78. GError *error = NULL;
  79.  
  80. - pixbuf = gdk_pixbuf_new_from_file (file, &error);
  81. + pixbuf = gdk_pixbuf_new_from_file_at_size (file, 48, 48, &error);
  82.  
  83. if (!pixbuf){
  84. twitux_debug (DEBUG_DOMAIN_SETUP, "Image error: %s: %s",
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement