From e65c096937a8bb220f7851f6383a2bb37ce7f53e Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 18 Mar 2011 08:57:05 +0100
Subject: [PATCH] [Dicson] make some dialogs of type "dialog" instead of
 "normal". Fixes #6840

---
 data/gui/account_creation_wizard_window.ui     | 1 +
 data/gui/accounts_window.ui                    | 1 +
 data/gui/add_new_contact_window.ui             | 1 +
 data/gui/adhoc_commands_window.ui              | 1 +
 data/gui/advanced_configuration_window.ui      | 1 +
 data/gui/archiving_preferences_window.ui       | 9 +++++----
 data/gui/blocked_contacts_window.ui            | 1 +
 data/gui/chat_to_muc_window.ui                 | 1 +
 data/gui/data_form_window.ui                   | 1 +
 data/gui/edit_groups_dialog.ui                 | 2 +-
 data/gui/features_window.ui                    | 1 +
 data/gui/filetransfers.ui                      | 5 +++--
 data/gui/gajim_themes_window.ui                | 4 +++-
 data/gui/groups_post_window.ui                 | 1 +
 data/gui/item_archiving_preferences_window.ui  | 5 +++--
 data/gui/join_groupchat_window.ui              | 1 +
 data/gui/manage_bookmarks_window.ui            | 1 +
 data/gui/manage_pep_services_window.ui         | 1 +
 data/gui/manage_proxies_window.ui              | 5 +++--
 data/gui/manage_sounds_window.ui               | 1 +
 data/gui/plugins_window.ui                     | 1 +
 data/gui/preferences_window.ui                 | 3 ++-
 data/gui/privacy_list_window.ui                | 1 +
 data/gui/privacy_lists_window.ui               | 3 ++-
 data/gui/profile_window.ui                     | 1 +
 data/gui/remove_account_window.ui              | 1 +
 data/gui/roster_item_exchange_window.ui        | 1 +
 data/gui/search_window.ui                      | 1 +
 data/gui/service_discovery_window.ui           | 1 +
 data/gui/service_registration_window.ui        | 1 +
 data/gui/subscription_request_window.ui        | 1 +
 data/gui/synchronise_select_account_dialog.ui  | 2 +-
 data/gui/synchronise_select_contacts_dialog.ui | 2 +-
 data/gui/vcard_information_window.ui           | 1 +
 data/gui/zeroconf_information_window.ui        | 1 +
 35 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/data/gui/account_creation_wizard_window.ui b/data/gui/account_creation_wizard_window.ui
index 7be526ec7..41b6a87a9 100644
--- a/data/gui/account_creation_wizard_window.ui
+++ b/data/gui/account_creation_wizard_window.ui
@@ -6,6 +6,7 @@
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Gajim: Account Creation Wizard</property>
     <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_wizard_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox77">
diff --git a/data/gui/accounts_window.ui b/data/gui/accounts_window.ui
index 7198ce1b4..4a1b0be37 100644
--- a/data/gui/accounts_window.ui
+++ b/data/gui/accounts_window.ui
@@ -18,6 +18,7 @@
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Accounts</property>
     <property name="default_width">800</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_accounts_window_destroy"/>
     <signal name="key_press_event" handler="on_accounts_window_key_press_event"/>
     <child>
diff --git a/data/gui/add_new_contact_window.ui b/data/gui/add_new_contact_window.ui
index 00dc0ee92..e9f713f1e 100644
--- a/data/gui/add_new_contact_window.ui
+++ b/data/gui/add_new_contact_window.ui
@@ -6,6 +6,7 @@
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Add New Contact</property>
     <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_add_new_contact_window_destroy"/>
     <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/>
     <child>
diff --git a/data/gui/adhoc_commands_window.ui b/data/gui/adhoc_commands_window.ui
index 0f0819dd5..9c51ceb2b 100644
--- a/data/gui/adhoc_commands_window.ui
+++ b/data/gui/adhoc_commands_window.ui
@@ -6,6 +6,7 @@
     <property name="visible">True</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Ad-hoc Commands - Gajim</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_adhoc_commands_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
diff --git a/data/gui/advanced_configuration_window.ui b/data/gui/advanced_configuration_window.ui
index 1286efe8e..db5b1e9cb 100644
--- a/data/gui/advanced_configuration_window.ui
+++ b/data/gui/advanced_configuration_window.ui
@@ -8,6 +8,7 @@
     <property name="role">ace</property>
     <property name="default_width">650</property>
     <property name="default_height">540</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_advanced_configuration_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox70">
diff --git a/data/gui/archiving_preferences_window.ui b/data/gui/archiving_preferences_window.ui
index 0c8db71e1..82f612d47 100644
--- a/data/gui/archiving_preferences_window.ui
+++ b/data/gui/archiving_preferences_window.ui
@@ -4,7 +4,7 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name item text -->
+      <!-- column-name item -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -18,7 +18,7 @@
   </object>
   <object class="GtkListStore" id="liststore2">
     <columns>
-      <!-- column-name item text -->
+      <!-- column-name item -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -35,7 +35,7 @@
   </object>
   <object class="GtkListStore" id="liststore3">
     <columns>
-      <!-- column-name item text -->
+      <!-- column-name item -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -52,7 +52,7 @@
   </object>
   <object class="GtkListStore" id="liststore4">
     <columns>
-      <!-- column-name item text -->
+      <!-- column-name item -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -69,6 +69,7 @@
   </object>
   <object class="GtkWindow" id="archiving_preferences_window">
     <property name="border_width">12</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_archiving_preferences_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
diff --git a/data/gui/blocked_contacts_window.ui b/data/gui/blocked_contacts_window.ui
index c2035ca83..2f9f37127 100644
--- a/data/gui/blocked_contacts_window.ui
+++ b/data/gui/blocked_contacts_window.ui
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="blocked_contacts_window">
     <property name="visible">True</property>
     <property name="title" translatable="yes">Blocked Contacts</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_blocked_contacts_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
diff --git a/data/gui/chat_to_muc_window.ui b/data/gui/chat_to_muc_window.ui
index 5fda89d8e..0c0c36e7e 100644
--- a/data/gui/chat_to_muc_window.ui
+++ b/data/gui/chat_to_muc_window.ui
@@ -6,6 +6,7 @@
     <property name="visible">True</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Invite Friends!</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_chat_to_muc_window_destroy"/>
     <signal name="key_press_event" handler="on_chat_to_muc_window_key_press_event"/>
     <child>
diff --git a/data/gui/data_form_window.ui b/data/gui/data_form_window.ui
index 55bf176e2..b94dc12d1 100644
--- a/data/gui/data_form_window.ui
+++ b/data/gui/data_form_window.ui
@@ -7,6 +7,7 @@
     <property name="title" translatable="yes">Room Configuration</property>
     <property name="default_width">650</property>
     <property name="default_height">450</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_data_form_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox68">
diff --git a/data/gui/edit_groups_dialog.ui b/data/gui/edit_groups_dialog.ui
index 0f61221fc..d53d5257b 100644
--- a/data/gui/edit_groups_dialog.ui
+++ b/data/gui/edit_groups_dialog.ui
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Edit Groups</property>
     <property name="modal">True</property>
     <property name="default_height">290</property>
-    <property name="type_hint">normal</property>
+    <property name="type_hint">dialog</property>
     <signal name="response" handler="on_edit_groups_dialog_response"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox6">
diff --git a/data/gui/features_window.ui b/data/gui/features_window.ui
index 1625564f6..e28309fda 100644
--- a/data/gui/features_window.ui
+++ b/data/gui/features_window.ui
@@ -8,6 +8,7 @@
     <property name="title" translatable="yes">Features</property>
     <property name="default_width">300</property>
     <property name="default_height">530</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
diff --git a/data/gui/filetransfers.ui b/data/gui/filetransfers.ui
index db2450cf2..52f404179 100644
--- a/data/gui/filetransfers.ui
+++ b/data/gui/filetransfers.ui
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="file_transfers_window">
     <property name="border_width">12</property>
     <property name="title" translatable="yes">File Transfers</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="accessible">
       <object class="AtkObject" id="file_transfers_window-atkobject">
         <property name="AtkObject::accessible-name" translatable="yes">File Transfers</property>
@@ -40,11 +41,11 @@
                   </object>
                 </child>
                 <signal name="button_press_event" handler="on_transfers_list_button_press_event"/>
-                <signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/>
+                <signal name="button_release_event" handler="on_transfers_list_button_release_event"/>
                 <signal name="key_press_event" handler="on_transfers_list_key_press_event"/>
                 <signal name="leave_notify_event" handler="on_transfers_list_leave_notify_event"/>
+                <signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/>
                 <signal name="row_activated" handler="on_transfers_list_row_activated"/>
-                <signal name="button_release_event" handler="on_transfers_list_button_release_event"/>
               </object>
             </child>
           </object>
diff --git a/data/gui/gajim_themes_window.ui b/data/gui/gajim_themes_window.ui
index 82062ca33..9b45b421e 100644
--- a/data/gui/gajim_themes_window.ui
+++ b/data/gui/gajim_themes_window.ui
@@ -4,7 +4,7 @@
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name item text -->
+      <!-- column-name item -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -25,6 +25,7 @@
   <object class="GtkWindow" id="gajim_themes_window">
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Gajim Themes Customization</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkVBox" id="vbox97">
         <property name="visible">True</property>
@@ -326,6 +327,7 @@
                 <property name="visible">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
diff --git a/data/gui/groups_post_window.ui b/data/gui/groups_post_window.ui
index 28fb44a21..85734ff12 100644
--- a/data/gui/groups_post_window.ui
+++ b/data/gui/groups_post_window.ui
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="groups_post_window">
     <property name="visible">True</property>
     <property name="title" translatable="yes">Create new post</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
diff --git a/data/gui/item_archiving_preferences_window.ui b/data/gui/item_archiving_preferences_window.ui
index 3e46b37a6..8e0a7b992 100644
--- a/data/gui/item_archiving_preferences_window.ui
+++ b/data/gui/item_archiving_preferences_window.ui
@@ -4,6 +4,7 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="item_archiving_preferences_window">
     <property name="border_width">12</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_item_archiving_preferences_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
@@ -180,7 +181,7 @@
   </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name item text -->
+      <!-- column-name item -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -200,7 +201,7 @@
   </object>
   <object class="GtkListStore" id="liststore2">
     <columns>
-      <!-- column-name item text -->
+      <!-- column-name item -->
       <column type="gchararray"/>
     </columns>
     <data>
diff --git a/data/gui/join_groupchat_window.ui b/data/gui/join_groupchat_window.ui
index 4ed740b24..c2db0bc17 100644
--- a/data/gui/join_groupchat_window.ui
+++ b/data/gui/join_groupchat_window.ui
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="join_groupchat_window">
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Join Group Chat</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_join_groupchat_window_destroy"/>
     <signal name="key_press_event" handler="on_join_groupchat_window_key_press_event"/>
     <child>
diff --git a/data/gui/manage_bookmarks_window.ui b/data/gui/manage_bookmarks_window.ui
index d2ae8679d..752aeaa30 100644
--- a/data/gui/manage_bookmarks_window.ui
+++ b/data/gui/manage_bookmarks_window.ui
@@ -13,6 +13,7 @@
     <property name="title" translatable="yes">Manage Bookmarks</property>
     <property name="default_width">550</property>
     <property name="default_height">300</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkVBox" id="vbox86">
         <property name="visible">True</property>
diff --git a/data/gui/manage_pep_services_window.ui b/data/gui/manage_pep_services_window.ui
index 34969b5d5..e73aaea32 100644
--- a/data/gui/manage_pep_services_window.ui
+++ b/data/gui/manage_pep_services_window.ui
@@ -7,6 +7,7 @@
     <property name="title" translatable="yes">PEP Service Configuration</property>
     <property name="default_width">350</property>
     <property name="default_height">150</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_manage_pep_services_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
diff --git a/data/gui/manage_proxies_window.ui b/data/gui/manage_proxies_window.ui
index 9804cbd6e..0fe8109e5 100644
--- a/data/gui/manage_proxies_window.ui
+++ b/data/gui/manage_proxies_window.ui
@@ -4,7 +4,7 @@
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name item text -->
+      <!-- column-name item -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -22,6 +22,7 @@
   <object class="GtkWindow" id="manage_proxies_window">
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Manage Proxy Profiles</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_manage_proxies_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox87">
@@ -49,8 +50,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="headers_visible">False</property>
-                        <signal name="key_press_event" handler="on_proxies_treeview_key_press_event"/>
                         <signal name="cursor_changed" handler="on_proxies_treeview_cursor_changed"/>
+                        <signal name="key_press_event" handler="on_proxies_treeview_key_press_event"/>
                       </object>
                     </child>
                   </object>
diff --git a/data/gui/manage_sounds_window.ui b/data/gui/manage_sounds_window.ui
index 2fc3a4f6f..710ac6606 100644
--- a/data/gui/manage_sounds_window.ui
+++ b/data/gui/manage_sounds_window.ui
@@ -6,6 +6,7 @@
     <property name="width_request">400</property>
     <property name="height_request">350</property>
     <property name="border_width">6</property>
+    <property name="type_hint">dialog</property>
     <signal name="delete_event" handler="on_manage_sounds_window_delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox1">
diff --git a/data/gui/plugins_window.ui b/data/gui/plugins_window.ui
index aadba19c7..b22be2724 100644
--- a/data/gui/plugins_window.ui
+++ b/data/gui/plugins_window.ui
@@ -9,6 +9,7 @@
     <property name="title" translatable="yes">Plugins</property>
     <property name="default_width">650</property>
     <property name="default_height">500</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_plugins_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
diff --git a/data/gui/preferences_window.ui b/data/gui/preferences_window.ui
index eeece3f08..3052a6688 100644
--- a/data/gui/preferences_window.ui
+++ b/data/gui/preferences_window.ui
@@ -128,6 +128,7 @@
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Preferences</property>
     <property name="role">preferences</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_preferences_window_destroy"/>
     <signal name="key_press_event" handler="on_preferences_window_key_press_event"/>
     <child>
@@ -1399,8 +1400,8 @@ $T will be replaced by auto-not-available timeout</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="headers_visible">False</property>
-                                    <signal name="key_press_event" handler="on_msg_treeview_key_press_event"/>
                                     <signal name="cursor_changed" handler="on_msg_treeview_cursor_changed"/>
+                                    <signal name="key_press_event" handler="on_msg_treeview_key_press_event"/>
                                   </object>
                                 </child>
                               </object>
diff --git a/data/gui/privacy_list_window.ui b/data/gui/privacy_list_window.ui
index 513c67f41..4bc0c4f29 100644
--- a/data/gui/privacy_list_window.ui
+++ b/data/gui/privacy_list_window.ui
@@ -6,6 +6,7 @@
     <property name="visible">True</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Privacy List</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_privacy_list_edit_window_destroy"/>
     <child>
       <object class="GtkVBox" id="main_vbox">
diff --git a/data/gui/privacy_lists_window.ui b/data/gui/privacy_lists_window.ui
index c1f9ba5e7..9d1d9927a 100644
--- a/data/gui/privacy_lists_window.ui
+++ b/data/gui/privacy_lists_window.ui
@@ -6,6 +6,7 @@
     <property name="visible">True</property>
     <property name="border_width">12</property>
     <property name="title" translatable="yes">window1</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_privacy_lists_first_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
@@ -167,7 +168,7 @@
   </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name item text -->
+      <!-- column-name item -->
       <column type="gchararray"/>
     </columns>
   </object>
diff --git a/data/gui/profile_window.ui b/data/gui/profile_window.ui
index c1e346b8c..593e5cf8f 100644
--- a/data/gui/profile_window.ui
+++ b/data/gui/profile_window.ui
@@ -4,6 +4,7 @@
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="profile_window">
     <property name="title" translatable="yes">Personal Information</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_profile_window_destroy"/>
     <signal name="key_press_event" handler="on_profile_window_key_press_event"/>
     <child>
diff --git a/data/gui/remove_account_window.ui b/data/gui/remove_account_window.ui
index f136c6b6d..a84a3012e 100644
--- a/data/gui/remove_account_window.ui
+++ b/data/gui/remove_account_window.ui
@@ -4,6 +4,7 @@
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="remove_account_window">
     <property name="border_width">6</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_remove_account_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox69">
diff --git a/data/gui/roster_item_exchange_window.ui b/data/gui/roster_item_exchange_window.ui
index 437ca3cab..4c0b5eb03 100644
--- a/data/gui/roster_item_exchange_window.ui
+++ b/data/gui/roster_item_exchange_window.ui
@@ -4,6 +4,7 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="roster_item_exchange_window">
     <property name="title" translatable="yes">Roster Item Exchange</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
diff --git a/data/gui/search_window.ui b/data/gui/search_window.ui
index 275d832c4..dc23bda21 100644
--- a/data/gui/search_window.ui
+++ b/data/gui/search_window.ui
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="search_window">
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Search</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_search_window_destroy"/>
     <signal name="key_press_event" handler="on_search_window_key_press_event"/>
     <child>
diff --git a/data/gui/service_discovery_window.ui b/data/gui/service_discovery_window.ui
index e5ef4a2e4..46c83e4d0 100644
--- a/data/gui/service_discovery_window.ui
+++ b/data/gui/service_discovery_window.ui
@@ -13,6 +13,7 @@
     <property name="role">Service Discovery</property>
     <property name="default_width">550</property>
     <property name="default_height">420</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_service_discovery_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox11">
diff --git a/data/gui/service_registration_window.ui b/data/gui/service_registration_window.ui
index fce939333..3c6d275dc 100644
--- a/data/gui/service_registration_window.ui
+++ b/data/gui/service_registration_window.ui
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="service_registration_window">
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Register to</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkVBox" id="vbox12">
         <property name="visible">True</property>
diff --git a/data/gui/subscription_request_window.ui b/data/gui/subscription_request_window.ui
index dfc9f4004..05856dca8 100644
--- a/data/gui/subscription_request_window.ui
+++ b/data/gui/subscription_request_window.ui
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="subscription_request_window">
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Subscription Request</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkVBox" id="vbox10">
         <property name="visible">True</property>
diff --git a/data/gui/synchronise_select_account_dialog.ui b/data/gui/synchronise_select_account_dialog.ui
index c94b724b9..d65e8b2d4 100644
--- a/data/gui/synchronise_select_account_dialog.ui
+++ b/data/gui/synchronise_select_account_dialog.ui
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Synchronise contacts</property>
     <property name="default_width">350</property>
     <property name="default_height">300</property>
-    <property name="type_hint">normal</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox7">
         <property name="visible">True</property>
diff --git a/data/gui/synchronise_select_contacts_dialog.ui b/data/gui/synchronise_select_contacts_dialog.ui
index 12bbd0af9..22e194ea4 100644
--- a/data/gui/synchronise_select_contacts_dialog.ui
+++ b/data/gui/synchronise_select_contacts_dialog.ui
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Synchronise : select contacts</property>
     <property name="default_width">400</property>
     <property name="default_height">300</property>
-    <property name="type_hint">normal</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox7">
         <property name="visible">True</property>
diff --git a/data/gui/vcard_information_window.ui b/data/gui/vcard_information_window.ui
index 942c1db74..3c9dfc9f7 100644
--- a/data/gui/vcard_information_window.ui
+++ b/data/gui/vcard_information_window.ui
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="vcard_information_window">
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Contact Information</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_vcard_information_window_destroy"/>
     <signal name="key_press_event" handler="on_vcard_information_window_key_press_event"/>
     <child>
diff --git a/data/gui/zeroconf_information_window.ui b/data/gui/zeroconf_information_window.ui
index 3996805a3..ac0927af2 100644
--- a/data/gui/zeroconf_information_window.ui
+++ b/data/gui/zeroconf_information_window.ui
@@ -6,6 +6,7 @@
     <property name="border_width">12</property>
     <property name="title">Contact Information</property>
     <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_zeroconf_information_window_destroy"/>
     <signal name="key_press_event" handler="on_zeroconf_information_window_key_press_event"/>
     <child>
-- 
2.11.4.GIT