1 files changed, 65 insertions, 8 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index d004360c..4802bbee 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -3144,7 +3144,7 @@ Press ENTER to add the data.</atkproperty>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="searchCloseButton">
+                      <widget class="GtkButton" id="searchCloseButtonOnPage">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="tooltip" translatable="yes">Close search tab (also aborts search)</property>
@@ -3311,6 +3311,8 @@ Press ENTER to add the data.</atkproperty>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <signal name="activate" handler="on_chat_frame_send_button_click_event_"/>
+                    <accelerator key="Return" modifiers="" signal="activate"/>
                   </widget>
                   <packing>
                     <property name="padding">5</property>
@@ -3324,8 +3326,8 @@ Press ENTER to add the data.</atkproperty>
                     <property name="has_default">True</property>
                     <property name="tooltip" translatable="yes">Broadcast the message to all participants in the current chat room</property>
                     <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_chat_frame_send_button_click_event_"/>
-                    <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                    <signal name="activate" handler="on_chat_frame_send_button_click_event_"/>
+                    <accelerator key="Return" modifiers="" signal="activate"/>
                     <child>
                       <widget class="GtkAlignment" id="alignment6">
                         <property name="visible">True</property>
@@ -3348,8 +3350,7 @@ Press ENTER to add the data.</atkproperty>
                             <child>
                               <widget class="GtkLabel" id="label69">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Sen_d</property>
-                                <property name="use_underline">True</property>
+                                <property name="label" translatable="yes">Send</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
@@ -3380,6 +3381,16 @@ Press ENTER to add the data.</atkproperty>
           </widget>
         </child>
         <child>
+          <widget class="GtkVSeparator" id="vseparator2">
+            <property name="visible">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="padding">2</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <widget class="GtkScrolledWindow" id="chatScroll">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -3389,16 +3400,18 @@ Press ENTER to add the data.</atkproperty>
             <property name="shadow_type">GTK_SHADOW_IN</property>
             <child>
               <widget class="GtkTreeView" id="roomMembersTreeView">
+                <property name="width_request">200</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="headers_clickable">True</property>
+                <property name="rules_hint">True</property>
               </widget>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </widget>
@@ -4363,7 +4376,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
                 <property name="response_id">-6</property>
-                <accelerator key="Escape" modifiers="GDK_MOD1_MASK" signal="activate"/>
+                <accelerator key="Escape" modifiers="" signal="activate"/>
               </widget>
             </child>
             <child>
@@ -4855,7 +4868,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkButton" id="searchCloseButton1">
+          <widget class="GtkButton" id="searchCloseButton">
             <property name="visible">True</property>
             <property name="tooltip" translatable="yes">Stop the search and close the tab</property>
             <property name="relief">GTK_RELIEF_NONE</property>
@@ -4928,4 +4941,48 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
       </widget>
     </child>
   </widget>
+  <widget class="GtkWindow" id="chatTabLabelWindow">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Chat Tab Label with Close Button</property>
+    <child>
+      <widget class="GtkHBox" id="chatTabHBox">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkLabel" id="chatTabLabel">
+            <property name="visible">True</property>
+            <property name="xpad">5</property>
+            <property name="label" translatable="yes">FIXME</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">chatCloseButton</property>
+            <property name="single_line_mode">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkButton" id="chatCloseButton">
+            <property name="visible">True</property>
+            <property name="tooltip" translatable="yes">Leave the chat room and close the tab</property>
+            <property name="relief">GTK_RELIEF_NONE</property>
+            <property name="response_id">0</property>
+            <signal name="clicked" handler="on_closeChatButton_clicked_" object="chatTabHBox"/>
+            <child>
+              <widget class="GtkImage" id="image9">
+                <property name="visible">True</property>
+                <property name="stock">gtk-cancel</property>
+                <property name="icon_size">1</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>