set correct icon sizes in tabs

diff --git a/gtk/main.c b/gtk/main.c
index 79e2eed24fb860635e1c665c2818d5351229d83d..6e7ca0292fb64126b7af5540bc14fd950cc3392d 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1436,7 +1436,13 @@ static void linphone_gtk_configure_main_window(){
        {
                GdkPixbuf *pbuf=create_pixbuf("dialer-orange.png");
                if (pbuf) {
-                       gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"keypad_tab_icon")),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));
                }
        }

diff --git a/gtk/main.ui b/gtk/main.ui
index f6f418a03c55ca4686940cf23a3615ee07069e78..d4c061a452d49ea63600877487c0a6cb83e139b0 100644 (file)
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -970,6 +970,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="stock">gtk-directory</property>
+                            <property name="icon-size">1</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -1083,6 +1084,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="stock">gtk-refresh</property>
+                            <property name="icon-size">1</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -1398,6 +1400,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="stock">gtk-missing-image</property>
+                            <property name="icon-size">1</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>

diff --git a/gtk/parameters.ui b/gtk/parameters.ui
index 4a6748f763f291a7643e140e5d0169027d94ad10..b5b0b8c6fd3ecc067ba1ee01fc6c8c3fe45f802a 100644 (file)
--- a/gtk/parameters.ui
+++ b/gtk/parameters.ui
@@ -667,6 +667,7 @@
                     <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="stock">gtk-network</property>
+                    <property name="icon-size">1</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -1064,6 +1065,7 @@
                     <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="stock">gtk-media-play</property>
+                    <property name="icon-size">1</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -2042,6 +2044,7 @@ virtual network !</property>
                     <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="stock">gtk-execute</property>
+                    <property name="icon-size">1</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -2167,7 +2170,7 @@ virtual network !</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="stock">gtk-properties</property>
-                    <property name="icon-size">3</property>
+                    <property name="icon-size">1</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>