gui fixes

diff --git a/Makefile.am b/Makefile.am
index 458ddbe80b38bd4cec5932c4436100417541f503..e0c3068064685609d210e2087101e96e1467288a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ SDK_EXCLUDED= \
 
 
 GTK_PREFIX=/usr
+GTK_THEME=Outcrop
 GTK_FILELIST=gtk+-2.18.5.filelist
 GTK_FILELIST_PATH=$(shell cd $(top_srcdir) && pwd)/$(GTK_FILELIST)
 LINPHONEDEPS_FILELIST=linphone-deps.filelist
@@ -113,7 +114,8 @@ gtk-cherrypick:
                        cp $$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
                fi \
        done && \
-       cp -rf share/themes $(INSTALLDIR_WITH_PREFIX)/share/.
+       mkdir -p  $(INSTALLDIR_WITH_PREFIX)/share/themes && \
+       cp -rf share/themes/$(GTK_THEME) $(INSTALLDIR_WITH_PREFIX)/share/themes/.
 
 zip:
        rm -f $(ZIPFILE)

diff --git a/gtk/loginframe.c b/gtk/loginframe.c
index 538fab17427bfa097515fa35d5e6b5ef919b53ea..957b267267bfe88c388f1cbfa8af8ba29e41e6a8 100644 (file)
--- a/gtk/loginframe.c
+++ b/gtk/loginframe.c
@@ -87,7 +87,6 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){
 
        gtk_widget_hide(linphone_gtk_get_widget(mw,"disconnect_item"));
        gtk_widget_hide(linphone_gtk_get_widget(mw,"main_frame"));
-       gtk_widget_hide(linphone_gtk_get_widget(mw,"keypad_frame"));
        gtk_widget_show(linphone_gtk_get_widget(mw,"login_frame"));
        gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"main_menu"),FALSE);
        gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"options_menu"),FALSE);