From: Margaux Clerc <margaux.clerc@belledonne-communications>
Date: Thu, 18 Oct 2012 13:32:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into dev_gtk_new_ui
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=212e987db958c3f447b96bf1b380ace57b25810b

Merge remote-tracking branch 'origin/master' into dev_gtk_new_ui

Conflicts:
	gtk/incall_view.c
	gtk/main.ui
---

212e987db958c3f447b96bf1b380ace57b25810b
diff --cc gtk/incall_view.c
index 25ee2348,9798a718..346e8af6
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@@ -214,13 -313,7 +310,14 @@@ void linphone_gtk_create_in_call_view(L
  	linphone_gtk_enable_hold_button (call,FALSE,TRUE);
  	linphone_gtk_enable_mute_button(
  					GTK_BUTTON(linphone_gtk_get_widget(call_view,"incall_mute")),FALSE);
 +	
 +	GtkWidget *button=linphone_gtk_get_widget(call_view,"terminate_call");
 +	GtkWidget *image=create_pixmap("stopcall-red.png");
 +	gtk_button_set_label(GTK_BUTTON(button),_("Stop"));
 +	gtk_button_set_image(GTK_BUTTON(button),image);
 +	gtk_widget_show(image);
+ 	g_signal_connect_swapped(G_OBJECT(linphone_gtk_get_widget(call_view,"quality_indicator")),"button-press-event",(GCallback)linphone_gtk_show_call_stats,call);
 +
  }
  
  static void video_button_clicked(GtkWidget *button, LinphoneCall *call){
diff --cc gtk/main.c
index 0acbf6d4,b773a5b7..8ec303e2
--- a/gtk/main.c
+++ b/gtk/main.c
@@@ -1528,10 -1520,18 +1530,12 @@@ static void linphone_gtk_configure_main
  		if (!buttons_have_borders)
  			gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"add_call")),GTK_RELIEF_NONE);
  	}
 -	if (stop_call_icon){
 -		gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"terminate_call")),
 -		                    create_pixmap (stop_call_icon));
 -		if (!buttons_have_borders)
 -			gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"terminate_call")),GTK_RELIEF_NONE);
 -	}
  	if (search_icon){
  		GdkPixbuf *pbuf=create_pixbuf(search_icon);
- 		gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"directory_search_button_icon")),pbuf);
- 		g_object_unref(G_OBJECT(pbuf));
+ 		if(pbuf != NULL) {
+ 			gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"directory_search_button_icon")),pbuf);
+ 			g_object_unref(G_OBJECT(pbuf));
+ 		}
  	}
  	if (home){
  		gchar *tmp;
diff --cc gtk/main.ui
index 1b147fed,a57b7996..8731a495
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@@ -505,9 -368,9 +505,10 @@@
              </child>
              <child>
                <object class="GtkProgressBar" id="quality_indicator">
 +                <property name="width_request">90</property>
                  <property name="visible">True</property>
                  <property name="can_focus">False</property>
 -                <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
++                <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
                  <property name="tooltip_text" translatable="yes">Call quality rating</property>
                </object>
                <packing>