comparison: pidgin/gtkstatusbox.c
pidgin/gtkstatusbox.c
- changeset 15568
- cd19bb5a51b8
- parent 15562
- 8c8249fe5e3c
- child 15577
- b8129373f65e
equal
deleted
inserted
replaced
| 15567:42dfb9478e9f | 15568:cd19bb5a51b8 |
|---|---|
| 243 if (box->icon_box_menu) | 243 if (box->icon_box_menu) |
| 244 gtk_widget_destroy(box->icon_box_menu); | 244 gtk_widget_destroy(box->icon_box_menu); |
| 245 | 245 |
| 246 box->icon_box_menu = gtk_menu_new(); | 246 box->icon_box_menu = gtk_menu_new(); |
| 247 | 247 |
| 248 menu_item = gaim_new_item_from_stock(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE, | 248 menu_item = pidgin_new_item_from_stock(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE, |
| 249 G_CALLBACK(remove_buddy_icon_cb), | 249 G_CALLBACK(remove_buddy_icon_cb), |
| 250 box, 0, 0, NULL); | 250 box, 0, 0, NULL); |
| 251 if (gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon") == NULL) | 251 if (gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon") == NULL) |
| 252 gtk_widget_set_sensitive(menu_item, FALSE); | 252 gtk_widget_set_sensitive(menu_item, FALSE); |
| 253 | 253 |
| 2014 status_box->buddy_icon = gdk_pixbuf_new_from_file(filename, NULL); | 2014 status_box->buddy_icon = gdk_pixbuf_new_from_file(filename, NULL); |
| 2015 g_free(filename); | 2015 g_free(filename); |
| 2016 } | 2016 } |
| 2017 | 2017 |
| 2018 if (status_box->buddy_icon != NULL) { | 2018 if (status_box->buddy_icon != NULL) { |
| 2019 status_box->icon_opaque = gaim_gdk_pixbuf_is_opaque(status_box->buddy_icon); | 2019 status_box->icon_opaque = pidgin_gdk_pixbuf_is_opaque(status_box->buddy_icon); |
| 2020 gtk_image_set_from_pixbuf(GTK_IMAGE(status_box->icon), status_box->buddy_icon); | 2020 gtk_image_set_from_pixbuf(GTK_IMAGE(status_box->icon), status_box->buddy_icon); |
| 2021 status_box->buddy_icon_hover = gdk_pixbuf_copy(status_box->buddy_icon); | 2021 status_box->buddy_icon_hover = gdk_pixbuf_copy(status_box->buddy_icon); |
| 2022 do_colorshift(status_box->buddy_icon_hover, status_box->buddy_icon_hover, 32); | 2022 do_colorshift(status_box->buddy_icon_hover, status_box->buddy_icon_hover, 32); |
| 2023 gtk_widget_queue_resize(GTK_WIDGET(status_box)); | 2023 gtk_widget_queue_resize(GTK_WIDGET(status_box)); |
| 2024 } | 2024 } |
