qulogic/pidgin

Merged in CMaiku/pidgin (pull request #369)

2018-06-09, Gary Kramlich
cfab2119b1b7
Parents 18b17cdff81470843401e6e7
Children adf7ec9cd09c
Merged in CMaiku/pidgin (pull request #369)

gtkmedia: Replace usage of deprecated gtk_widget_render_icon()

Approved-by: Elliott Sales de Andrade
Approved-by: Gary Kramlich
1 files changed, 2 insertions(+), 12 deletions(-)
  • +2 -12
    pidgin/gtkmedia.c
    • --- a/pidgin/gtkmedia.c Sat Jun 09 01:38:07 2018 +0000
    +++ b/pidgin/gtkmedia.c Sat Jun 09 01:42:45 2018 +0000
    @@ -914,7 +914,6 @@
    GtkWidget *send_widget = NULL, *recv_widget = NULL, *button_widget = NULL;
    PurpleMediaSessionType type =
    purple_media_get_session_type(media, sid);
    - GdkPixbuf *icon = NULL;
    if (gtkmedia->priv->recv_widget == NULL
    && type & (PURPLE_MEDIA_RECV_VIDEO |
    @@ -1068,18 +1067,9 @@
    /* set the window icon according to the type */
    if (type & PURPLE_MEDIA_VIDEO) {
    - icon = gtk_widget_render_icon(GTK_WIDGET(gtkmedia),
    - PIDGIN_STOCK_TOOLBAR_VIDEO_CALL,
    - gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), NULL);
    + gtk_window_set_icon_name(GTK_WINDOW(gtkmedia), "video-call");
    } else if (type & PURPLE_MEDIA_AUDIO) {
    - icon = gtk_widget_render_icon(GTK_WIDGET(gtkmedia),
    - PIDGIN_STOCK_TOOLBAR_AUDIO_CALL,
    - gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), NULL);
    - }
    -
    - if (icon) {
    - gtk_window_set_icon(GTK_WINDOW(gtkmedia), icon);
    - g_object_unref(icon);
    + gtk_window_set_icon_name(GTK_WINDOW(gtkmedia), "audio-call");
    }
    gtk_widget_show(gtkmedia->priv->display);