diff --git a/gtk/main.c b/gtk/main.c index 6eaa6e928..0635c92bf 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1752,23 +1752,6 @@ static void linphone_gtk_configure_main_window(){ tmp=g_strdup(home); g_object_set_data_full(G_OBJECT(menu_item),"home",tmp, (GDestroyNotify)g_free); } - { - /* - GdkPixbuf *pbuf=create_pixbuf("contact-orange.png"); - if (pbuf) { - gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"contact_tab_icon")),pbuf); - g_object_unref(G_OBJECT(pbuf)); - } - */ - } - { - GdkPixbuf *pbuf=create_pixbuf("dialer.png"); - if (pbuf) { - GtkButton *button=GTK_BUTTON(linphone_gtk_get_widget(w,"keypad")); - gtk_button_set_image(button,gtk_image_new_from_pixbuf (pbuf)); - g_object_unref(pbuf); - } - } if (linphone_gtk_can_manage_accounts()) { gtk_widget_show(linphone_gtk_get_widget(w,"assistant_item")); } diff --git a/gtk/main.ui b/gtk/main.ui index 2b0b45dff..aeed50cb4 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -54,6 +54,12 @@ + + True + False + 32 + linphone-show-dialer + True False @@ -360,6 +366,7 @@ True True True + dialer_image diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index 033c567d5..0af9613dc 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -61,6 +61,7 @@ install(FILES install(FILES linphone-start-call2.png + linphone-show-dialer.png DESTINATION ${ICONS_INSTALL_DIR}/48x48/actions PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index e767aa088..af4d42980 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -9,7 +9,6 @@ dist_pixmap_DATA= \ contact_starred.png contact_unstarred.png \ call_status_incoming.png call_status_outgoing.png \ ok.png \ - dialer.png \ notok.png iconsdir=$(datadir)/icons/hicolor @@ -48,5 +47,6 @@ dist_statussvgicons_DATA= \ actions48iconsdir=$(iconsdir)/48x48/actions dist_actions48icons_DATA= \ - linphone-start-call2.png -) \ No newline at end of file + linphone-start-call2.png \ + linphone-show-dialer.png +) diff --git a/pixmaps/dialer.png b/pixmaps/dialer.png deleted file mode 100644 index bb9747a90..000000000 Binary files a/pixmaps/dialer.png and /dev/null differ diff --git a/pixmaps/linphone-show-dialer.png b/pixmaps/linphone-show-dialer.png new file mode 100644 index 000000000..8f8b98f25 Binary files /dev/null and b/pixmaps/linphone-show-dialer.png differ