From 8210107a35463f30894027ad271ee0f66d79cb00 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 21 Sep 2010 21:13:01 +0200
Subject: [PATCH] change copyright and move presence button

---
 gtk/about.ui |  2 +-
 gtk/main.ui  | 75 ++++++++++++++++++++++++----------------------------
 2 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/gtk/about.ui b/gtk/about.ui
index 3fc7d3538..1d79dbf7e 100644
--- a/gtk/about.ui
+++ b/gtk/about.ui
@@ -12,7 +12,7 @@
     <property name="has_separator">False</property>
     <property name="program_name">Linphone</property>
     <property name="version">undef</property>
-    <property name="copyright" translatable="yes">Created by Simon Morlat
+    <property name="copyright" translatable="yes">(C) Belledonne Communications,2010
 </property>
     <property name="comments" translatable="yes">An internet video phone using the standard SIP (rfc3261) protocol.</property>
     <property name="website">http://www.linphone.org</property>
diff --git a/gtk/main.ui b/gtk/main.ui
index 3de82a672..e1ea351ea 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -617,44 +617,17 @@
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label_xalign">0</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox9">
+                                  <object class="GtkComboBox" id="identities">
                                     <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="model">model3</property>
+                                    <property name="active">0</property>
+                                    <signal name="changed" handler="linphone_gtk_used_identity_changed"/>
                                     <child>
-                                      <object class="GtkAlignment" id="alignment8">
-                                        <property name="visible">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="left_padding">12</property>
-                                        <child>
-                                          <object class="GtkComboBox" id="identities">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="model">model3</property>
-                                            <property name="active">0</property>
-                                            <signal name="changed" handler="linphone_gtk_used_identity_changed"/>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="renderer3"/>
-                                              <attributes>
-                                                <attribute name="text">0</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="presence_button">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <signal name="clicked" handler="linphone_gtk_my_presence_clicked"/>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
+                                      <object class="GtkCellRendererText" id="renderer3"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
                                     </child>
                                   </object>
                                 </child>
@@ -1271,14 +1244,34 @@
           </packing>
         </child>
         <child>
-          <object class="GtkStatusbar" id="status_bar">
+          <object class="GtkHBox" id="hbox4">
             <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">2</property>
+            <child>
+              <object class="GtkStatusbar" id="status_bar">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="spacing">2</property>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="presence_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="relief">none</property>
+                <signal name="clicked" handler="linphone_gtk_my_presence_clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="padding">5</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">2</property>
           </packing>
         </child>