From 9df7cb68359b7d3aabc92cb3e81df4e96d4e2e68 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Mon, 16 Mar 2009 10:50:32 +0000
Subject: [PATCH] fix abnormal cpu consumption under windows (gtk bug)

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@344 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/gtk-glade/linphone.iss | 2 +-
 linphone/gtk-glade/main.c       | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/linphone/gtk-glade/linphone.iss b/linphone/gtk-glade/linphone.iss
index 89be5090f..eaa45db31 100755
--- a/linphone/gtk-glade/linphone.iss
+++ b/linphone/gtk-glade/linphone.iss
@@ -3,7 +3,7 @@
 
 [Setup]
 AppName=Linphone
-AppVerName=Linphone version 3.0.0
+AppVerName=Linphone version 3.1.0
 AppPublisher=linphone.org
 AppPublisherURL=http://www.linphone.org
 AppSupportURL=http://www.linphone.org
diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c
index 13d742447..e81588edb 100644
--- a/linphone/gtk-glade/main.c
+++ b/linphone/gtk-glade/main.c
@@ -323,12 +323,15 @@ static void set_video_window_decorations(GdkWindow *w){
 	}
 }
 
+
 static gboolean linphone_gtk_iterate(LinphoneCore *lc){
 	unsigned long id;
 	static unsigned long previd=0;
+
 	linphone_core_iterate(lc);
 	id=linphone_core_get_native_video_window_id(lc);
 	if (id!=previd){
+		ms_message("Updating window decorations");
 		GdkWindow *w;
 		previd=id;
 		if (id!=0){
@@ -938,8 +941,9 @@ int main(int argc, char *argv[]){
 	linphone_core_enable_logs_with_cb(linphone_gtk_log_handler);
 
 	linphone_gtk_init_liblinphone(config_file);
-	gtk_timeout_add(20,(GtkFunction)linphone_gtk_iterate,(gpointer)linphone_gtk_get_core());
-	gtk_timeout_add(20,(GtkFunction)linphone_gtk_check_logs,(gpointer)NULL);
+	/* do not lower timeouts under 30 ms because it exhibits a bug on gtk+/win32, with cpu running 20% all the time...*/
+	gtk_timeout_add(30,(GtkFunction)linphone_gtk_iterate,(gpointer)linphone_gtk_get_core());
+	gtk_timeout_add(30,(GtkFunction)linphone_gtk_check_logs,(gpointer)NULL);
 	linphone_gtk_init_main_window();
 	linphone_gtk_init_status_icon();
 	linphone_gtk_show_main_window();