From e177c7e7817a22addcd536cf667f9e5e40a3b8fd Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 10 Jan 2012 13:32:34 +0100 Subject: [PATCH] GTK2.18 support --- gtk/incall_view.c | 2 ++ gtk/main.c | 2 ++ gtk/main.ui | 2 +- gtk/parameters.ui | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk/incall_view.c b/gtk/incall_view.c index 75060da9..5674d554 100644 --- a/gtk/incall_view.c +++ b/gtk/incall_view.c @@ -94,6 +94,7 @@ static void linphone_gtk_in_call_set_animation_image(GtkWidget *callview, const } static void linphone_gtk_in_call_set_animation_spinner(GtkWidget *callview){ +#if GTK_CHECK_VERSION(2,20,0) GtkWidget *container=linphone_gtk_get_widget(callview,"in_call_animation"); GList *elem=gtk_container_get_children(GTK_CONTAINER(container)); GtkWidget *spinner=gtk_spinner_new(); @@ -103,6 +104,7 @@ static void linphone_gtk_in_call_set_animation_spinner(GtkWidget *callview){ gtk_container_add(GTK_CONTAINER(container),spinner); gtk_widget_set_size_request(spinner, 20,20); gtk_spinner_start(GTK_SPINNER(spinner)); +#endif } diff --git a/gtk/main.c b/gtk/main.c index d577b331..88f2807f 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1208,7 +1208,9 @@ static void linphone_gtk_init_status_icon(){ const char *title; title=linphone_gtk_get_ui_config("title",_("Linphone - a video internet phone")); icon=gtk_status_icon_new_from_pixbuf(pbuf); +#if GTK_CHECK_VERSION(2,20,0) gtk_status_icon_set_name(icon,title); +#endif g_signal_connect_swapped(G_OBJECT(icon),"activate",(GCallback)handle_icon_click,NULL); g_signal_connect(G_OBJECT(icon),"popup-menu",(GCallback)icon_popup_menu,NULL); gtk_status_icon_set_tooltip(icon,title); diff --git a/gtk/main.ui b/gtk/main.ui index 2cfe555e..7ebe9536 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -1,6 +1,6 @@ - + False diff --git a/gtk/parameters.ui b/gtk/parameters.ui index 2403b331..153b5bdd 100644 --- a/gtk/parameters.ui +++ b/gtk/parameters.ui @@ -1,6 +1,6 @@ - + 500 -- 2.39.2