preferences: split "Open new chats in separate windows" into a radiobutton

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=562462

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index cd755a9ae420e8d6684147184b62916ad7f76583..c96be4c52b2e79a875f6bc98f36b7dc18b3e3c61 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -67,7 +67,7 @@ struct _EmpathyPreferencesPriv {
 
        GtkWidget *checkbutton_show_smileys;
        GtkWidget *checkbutton_show_contacts_in_rooms;
-       GtkWidget *checkbutton_separate_chat_windows;
+       GtkWidget *radiobutton_chats_new_windows;
        GtkWidget *checkbutton_events_notif_area;
        GtkWidget *checkbutton_autoconnect;
        GtkWidget *checkbutton_logging;
@@ -248,7 +248,7 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
 
        g_settings_bind (priv->gsettings_ui,
                         EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS,
-                        priv->checkbutton_separate_chat_windows,
+                        priv->radiobutton_chats_new_windows,
                         "active",
                         G_SETTINGS_BIND_DEFAULT);
 
@@ -1172,7 +1172,7 @@ empathy_preferences_init (EmpathyPreferences *preferences)
                "combobox_chat_theme_variant", &priv->combobox_chat_theme_variant,
                "hbox_chat_theme_variant", &priv->hbox_chat_theme_variant,
                "sw_chat_theme_preview", &priv->sw_chat_theme_preview,
-               "checkbutton_separate_chat_windows", &priv->checkbutton_separate_chat_windows,
+               "radiobutton_chats_new_windows", &priv->radiobutton_chats_new_windows,
                "checkbutton_events_notif_area", &priv->checkbutton_events_notif_area,
                "checkbutton_autoconnect", &priv->checkbutton_autoconnect,
                "checkbutton_logging", &priv->checkbutton_logging,

diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 03a628cb6a9414418bd266ce6ae98db3439e39fb..f13f6c0b29a186ccda7925f6484a8d12d89a478e 100644 (file)
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -107,14 +107,47 @@
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkCheckButton" id="checkbutton_separate_chat_windows">
-                        <property name="label" translatable="yes">_Open new chats in separate windows</property>
+                      <object class="GtkBox" id="vbox2180">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="label1000">
+                            <property name="label" translatable="yes">Start chats in:</property>
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="radiobutton_chats_new_tabs">
+                            <property name="label" translatable="yes">new ta_bs</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="radiobutton_chats_new_windows">
+                            <property name="label" translatable="yes">new _windows</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radiobutton_chats_new_tabs</property>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>