commit 356e90ecb6b2eb16f3daf60d9c3e58a714f349de
Author: Alicia <...>
Date:   Wed May 4 12:04:22 2016 +0200

    tc_client-gtk: made the settings accessible from the start window (previously only accessible from the main window, after already joining a channel)

diff --git a/ChangeLog b/ChangeLog
index 2f4b0b8..8d833eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ tc_client-gtk: moved encoding out of the cam thread, allowing postprocessing to
 tc_client-gtk: added horizontal and vertical flip as postprocessing options.
 tc_client-gtk: reallocate frame when camera input size changes.
 tc_client-gtk: if we failed to open the camera, just give a grey screen.
+tc_client-gtk: made the settings accessible from the start window (previously only accessible from the main window, after already joining a channel)
 tc_client-gtk and camviewer: fixed compatibility with newer libavutil.
 tc_client-gtk and camviewer: added compatibility fallbacks for av_image_get_buffer_size() and av_packet_unref()
 libcamera(v4l2): if we failed to read the frame, give grey instead.
diff --git a/gtkgui.glade b/gtkgui.glade
index 71be1c7..5b4131a 100644
--- a/gtkgui.glade
+++ b/gtkgui.glade
@@ -917,6 +917,28 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Options</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem_options_settings2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Settings</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/utilities/gtk/camviewer.c b/utilities/gtk/camviewer.c
index 778669f..51323fe 100644
--- a/utilities/gtk/camviewer.c
+++ b/utilities/gtk/camviewer.c
@@ -977,6 +977,8 @@ int main(int argc, char** argv)
 
   item=GTK_WIDGET(gtk_builder_get_object(gui, "menuitem_options_settings"));
   g_signal_connect(item, "activate", G_CALLBACK(showsettings), gui);
+  item=GTK_WIDGET(gtk_builder_get_object(gui, "menuitem_options_settings2"));
+  g_signal_connect(item, "activate", G_CALLBACK(showsettings), gui);
   
   data->box=GTK_WIDGET(gtk_builder_get_object(gui, "cambox"));
   userlistwidget=GTK_WIDGET(gtk_builder_get_object(gui, "userlistbox"));