From e7f46ddfbbce83c6786cc8c29d199f3dd6fd76f8 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 1 Feb 2011 17:23:22 +0100
Subject: [PATCH] show buttons
---
gtk/incall_view.c | 12 ++++++++----
gtk/main.c | 1 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index 3941bfe727..9a4861a5d5 100644
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -201,6 +201,7 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call, bool_t with_paus
GtkWidget *animation=linphone_gtk_get_widget(callview,"in_call_animation");
GdkPixbufAnimation *pbuf=create_pixbuf_animation("calling_anim.gif");
GtkWidget *answer_button;
+ GtkWidget *image;
gtk_label_set_markup(GTK_LABEL(status),_("<b>Incoming call</b>"));
gtk_widget_show_all(linphone_gtk_get_widget(callview,"answer_decline_panel"));
@@ -209,14 +210,17 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call, bool_t with_paus
display_peer_name_in_label(callee,linphone_call_get_remote_address (call));
answer_button=linphone_gtk_get_widget(callview,"accept_call");
- gtk_button_set_image(GTK_BUTTON(answer_button),
- create_pixmap (linphone_gtk_get_ui_config("start_call_icon","startcall-green.png")));
+ image=create_pixmap (linphone_gtk_get_ui_config("start_call_icon","startcall-green.png"));
if (with_pause){
gtk_button_set_label(GTK_BUTTON(answer_button),
_("Pause all calls\nand answer"));
}else gtk_button_set_label(GTK_BUTTON(answer_button),_("Answer"));
- gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(callview,"decline_call")),
- create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png")));
+ gtk_button_set_image(GTK_BUTTON(answer_button),image);
+ gtk_widget_show(image);
+
+ image=create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png"));
+ gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(callview,"decline_call")),image);
+ gtk_widget_show(image);
if (pbuf!=NULL){
gtk_image_set_from_animation(GTK_IMAGE(animation),pbuf);
diff --git a/gtk/main.c b/gtk/main.c
index 643f948d9a..77689b3977 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1446,6 +1446,7 @@ int main(int argc, char *argv[]){
settings=gtk_settings_get_default();
g_type_class_unref (g_type_class_ref (GTK_TYPE_IMAGE_MENU_ITEM));
+ g_type_class_unref (g_type_class_ref (GTK_TYPE_BUTTON));
g_object_set(settings, "gtk-menu-images", TRUE, NULL);
g_object_set(settings, "gtk-button-images", TRUE, NULL);
#ifdef WIN32
--
GitLab