From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 6 Feb 2013 09:48:34 +0000 (+0100)
Subject: Add dialer pixmap
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=c0eb16613fdbdb73d47e62dad4df0ed7f0389188

Add dialer pixmap
---

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 00000000..5da3ad70
Binary files /dev/null and b/pixmaps/dialer.png differ