aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiaxh <fiaxh@users.noreply.github.com>2017-05-09 21:10:10 +0200
committerGitHub <noreply@github.com>2017-05-09 21:10:10 +0200
commitb0ac73914f4b5ea79a8136f343db403f695319bb (patch)
tree48518f5c07c66e3be5769c8bbad02a7cb42b838c
parent9728e832b18e8bbfcc0e011b5b1da9afe6021bf3 (diff)
parente876f4b3166ed38f55d632c3f736d603d357464d (diff)
downloaddino-b0ac73914f4b5ea79a8136f343db403f695319bb.tar.gz
dino-b0ac73914f4b5ea79a8136f343db403f695319bb.zip
Merge pull request #93 from hrxi/pr_fix_warning
Fix a couple of warnings relating to parents of dialogs
-rw-r--r--main/data/conversation_selector/view.ui1
-rw-r--r--main/data/manage_accounts/dialog.ui1
-rw-r--r--main/data/settings_dialog.ui3
-rw-r--r--main/src/ui/conversation_list_titlebar.vala6
4 files changed, 4 insertions, 7 deletions
diff --git a/main/data/conversation_selector/view.ui b/main/data/conversation_selector/view.ui
index 72ef268b..5d8e2d69 100644
--- a/main/data/conversation_selector/view.ui
+++ b/main/data/conversation_selector/view.ui
@@ -4,7 +4,6 @@
<property name="can_focus">True</property>
<property name="expand">True</property>
<property name="orientation">vertical</property>
- <property name="visible">True</property>
<child>
<object class="GtkSearchBar" id="search_bar">
<property name="hexpand">True</property>
diff --git a/main/data/manage_accounts/dialog.ui b/main/data/manage_accounts/dialog.ui
index fcfe42ca..c8f2330e 100644
--- a/main/data/manage_accounts/dialog.ui
+++ b/main/data/manage_accounts/dialog.ui
@@ -3,7 +3,6 @@
<template class="DinoUiManageAccountsDialog">
<property name="width-request">700</property>
<property name="height-request">400</property>
- <property name="visible">True</property>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="title" translatable="yes">Accounts</property>
diff --git a/main/data/settings_dialog.ui b/main/data/settings_dialog.ui
index 7233e858..42448cc1 100644
--- a/main/data/settings_dialog.ui
+++ b/main/data/settings_dialog.ui
@@ -2,7 +2,6 @@
<interface>
<template class="DinoUiSettingsDialog">
<property name="modal">True</property>
- <property name="visible">True</property>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="title" translatable="yes">Preferences</property>
@@ -47,4 +46,4 @@
</object>
</child>
</template>
-</interface> \ No newline at end of file
+</interface>
diff --git a/main/src/ui/conversation_list_titlebar.vala b/main/src/ui/conversation_list_titlebar.vala
index 5ef824d5..c49b43c4 100644
--- a/main/src/ui/conversation_list_titlebar.vala
+++ b/main/src/ui/conversation_list_titlebar.vala
@@ -23,7 +23,7 @@ public class ConversationListTitlebar : Gtk.HeaderBar {
SimpleAction contacts_action = new SimpleAction("add_chat", null);
contacts_action.activate.connect(() => {
AddConversation.Chat.Dialog add_chat_dialog = new AddConversation.Chat.Dialog(stream_interactor);
- add_chat_dialog.set_transient_for((Window) get_toplevel());
+ add_chat_dialog.set_transient_for(window);
add_chat_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation));
add_chat_dialog.show();
});
@@ -32,7 +32,7 @@ public class ConversationListTitlebar : Gtk.HeaderBar {
SimpleAction conference_action = new SimpleAction("add_conference", null);
conference_action.activate.connect(() => {
AddConversation.Conference.Dialog add_conference_dialog = new AddConversation.Conference.Dialog(stream_interactor);
- add_conference_dialog.set_transient_for((Window) get_toplevel());
+ add_conference_dialog.set_transient_for(window);
add_conference_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation));
add_conference_dialog.show();
});
@@ -44,4 +44,4 @@ public class ConversationListTitlebar : Gtk.HeaderBar {
}
}
-} \ No newline at end of file
+}