From a8ebf14da64c08801c3095574d3dc4233465900b Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 30 Mar 2015 15:30:34 +0200
Subject: [PATCH] Fix icon size in the volume control on Windows.

---
 gtk/main.c        | 12 +++++++++++-
 gtk/videowindow.c |  5 -----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gtk/main.c b/gtk/main.c
index a95893898..b87c3f088 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -343,8 +343,18 @@ static void linphone_gtk_configure_window(GtkWidget *w, const char *window_name)
 	if (icon_path) {
 		GdkPixbuf *pbuf=create_pixbuf(icon_path);
 		if(pbuf != NULL) {
-			gtk_window_set_icon(GTK_WINDOW(w),pbuf);
+			GList *pbuf_list = NULL;
+			GdkPixbuf *pbuf_16=gdk_pixbuf_scale_simple(pbuf, 16, 16, GDK_INTERP_BILINEAR);
+			GdkPixbuf *pbuf_32=gdk_pixbuf_scale_simple(pbuf, 32, 32, GDK_INTERP_BILINEAR);
+			pbuf_list = g_list_append(pbuf_list, pbuf);
+			pbuf_list = g_list_append(pbuf_list, pbuf_16);
+			pbuf_list = g_list_append(pbuf_list, pbuf_32);
+			gtk_window_set_icon_list(GTK_WINDOW(w), pbuf_list);
+			gtk_window_set_default_icon_list(pbuf_list);
+			g_object_unref(G_OBJECT(pbuf_16));
+			g_object_unref(G_OBJECT(pbuf_32));
 			g_object_unref(G_OBJECT(pbuf));
+			g_list_free(pbuf_list);
 		}
 	}
 }
diff --git a/gtk/videowindow.c b/gtk/videowindow.c
index 8d26eb212..07a22bf29 100644
--- a/gtk/videowindow.c
+++ b/gtk/videowindow.c
@@ -257,8 +257,6 @@ static GtkWidget *create_video_window(LinphoneCall *call){
 	char *remote,*title;
 	GtkWidget *video_window;
 	const LinphoneAddress *addr;
-	const char *icon_path=linphone_gtk_get_ui_config("icon",LINPHONE_ICON);
-	GdkPixbuf *pbuf=create_pixbuf(icon_path);
 	guint timeout;
 	MSVideoSize vsize={MS_VIDEO_SIZE_CIF_W,MS_VIDEO_SIZE_CIF_H};
 	GdkColor color;
@@ -270,9 +268,6 @@ static GtkWidget *create_video_window(LinphoneCall *call){
 	ms_free(remote);
 	gtk_window_set_title(GTK_WINDOW(video_window),title);
 	g_free(title);
-	if (pbuf){
-		gtk_window_set_icon(GTK_WINDOW(video_window),pbuf);
-	}
 	gtk_window_resize(GTK_WINDOW(video_window),vsize.width,vsize.height);
 	gdk_color_parse("black",&color);
 	gtk_widget_modify_bg(video_window,GTK_STATE_NORMAL,&color);