From c0eb16613fdbdb73d47e62dad4df0ed7f0389188 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 6 Feb 2013 10:48:34 +0100
Subject: [PATCH] Add dialer pixmap

---
 gtk/main.c          |  16 +++++-----------
 gtk/main.ui         |   3 ++-
 pixmaps/Makefile.am |   1 +
 pixmaps/dialer.png  | Bin 0 -> 3744 bytes
 4 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 pixmaps/dialer.png

diff --git a/gtk/main.c b/gtk/main.c
index 520af7b5..cfbd8983 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1559,19 +1559,13 @@ static void linphone_gtk_configure_main_window(){
 		}
 		*/
 	}
-	/*{
-		GdkPixbuf *pbuf=create_pixbuf("dialer-orange.png");
+	{
+		GdkPixbuf *pbuf=create_pixbuf("dialer.png");
 		if (pbuf) {
-			GtkImage *img=GTK_IMAGE(linphone_gtk_get_widget(w,"keypad_tab_icon"));
-			int w,h;
-			GdkPixbuf *scaled;
-			gtk_icon_size_lookup(GTK_ICON_SIZE_MENU,&w,&h);
-			scaled=gdk_pixbuf_scale_simple(pbuf,w,h,GDK_INTERP_BILINEAR);
-			gtk_image_set_from_pixbuf(img,scaled);
-			g_object_unref(G_OBJECT(scaled));
-			g_object_unref(G_OBJECT(pbuf));
+			GtkButton *button=GTK_BUTTON(linphone_gtk_get_widget(w,"keypad"));
+			gtk_button_set_image(button,gtk_image_new_from_pixbuf (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 5e84bcc2..6c15688c 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -982,11 +982,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="dialpad">
+                      <object class="GtkButton" id="keypad">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_action_appearance">False</property>
+                        <signal name="clicked" handler="linphone_gtk_create_keypad" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 186254c1..d10d4822 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -18,6 +18,7 @@ startcall-green.png startcall-small.png stopcall-red.png stopcall-small.png addc
 contact_starred.png contact_unstarred.png \
 speaker.png \
 ok.png \
+dialer.png \
 notok.png
 
 EXTRA_DIST=$(pixmap_DATA)
diff --git a/pixmaps/dialer.png b/pixmaps/dialer.png
new file mode 100644
index 0000000000000000000000000000000000000000..5da3ad70dee838f952fbee2ce3ad1cef729f9c24
GIT binary patch
literal 3744
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
KMNUMnLSTY5-cCdS

literal 0
HcmV?d00001

-- 
2.39.2