From a8aceb1e395e3d0d5a570f6570a1613e2f990d87 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 17 Aug 2017 21:24:01 +0200 Subject: [PATCH] README: Discussion MUC, change url --- README.md | 4 +- dino.spec | 191 ------------------ libdino/data/dino.gschema.xml | 2 +- libdino/src/settings.vala | 2 +- main/CMakeLists.txt | 2 +- .../chat/add_contact_dialog.vala | 4 +- .../conference/add_groupchat_dialog.vala | 2 +- .../conference_details_fragment.vala | 4 +- main/src/ui/add_conversation/list_row.vala | 4 +- .../add_conversation/select_jid_fragment.vala | 2 +- main/src/ui/application.vala | 4 +- main/src/ui/chat_input/edit_history.vala | 11 +- main/src/ui/chat_input/view.vala | 2 +- main/src/ui/contact_details/dialog.vala | 2 +- main/src/ui/conversation_list_titlebar.vala | 4 +- .../ui/conversation_selector/chat_row.vala | 4 +- .../conversation_row.vala | 2 +- .../groupchat_pm_row.vala | 4 +- main/src/ui/conversation_selector/view.vala | 4 +- .../ui/conversation_summary/message_item.vala | 2 +- main/src/ui/conversation_summary/view.vala | 2 +- .../encryption_entry.vala | 2 +- .../ui/conversation_titlebar/menu_entry.vala | 2 +- main/src/ui/manage_accounts/account_row.vala | 4 +- .../manage_accounts/add_account_dialog.vala | 2 +- main/src/ui/manage_accounts/dialog.vala | 2 +- main/src/ui/occupant_menu/list.vala | 2 +- main/src/ui/occupant_menu/list_row.vala | 4 +- main/src/ui/settings_dialog.vala | 4 +- main/src/ui/unified_window.vala | 2 +- plugins/openpgp/CMakeLists.txt | 2 +- .../openpgp/src/account_settings_widget.vala | 2 +- .../module/xep/0115_entitiy_capabilities.vala | 2 +- 33 files changed, 49 insertions(+), 239 deletions(-) delete mode 100644 dino.spec diff --git a/README.md b/README.md index b072186a..7953f8ef 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,9 @@ Build Resources --------- -Please refer to [the wiki](https://github.com/dino/dino/wiki) for further information. +Join our conference room at [chat@dino.im](xmpp:chat@dino.im?join) + +Please refer to [the wiki](https://github.com/dino/dino/wiki) for further information or check out our [website](https://dino.im). License ------- diff --git a/dino.spec b/dino.spec deleted file mode 100644 index 0ea7b676..00000000 --- a/dino.spec +++ /dev/null @@ -1,191 +0,0 @@ -# To build current git tree into RPM using tito: -# - Run `tito build --rpm --test` - -# To build latest tagged release from git into RPM using tito: -# - Run `tito build --rpm` - -# To build older tagged release from git into RPM using tito: -# - Run `tito build --rpm --tag=vVERSION` - -# To build a tagged release from git into RPM using rpmbuild: -# - Put version number into Version -# - Run `spectool -g -R dino.spec` -# - Run `rpmbuild -bb dino.spec` - -# To build a specific git commit into RPM using rpmbuild: -# - Put commit id into COMMIT_ID_HERE -# - Use second (currently commented) line for Release, Source0 and %setup -# - Run `spectool -g -R dino.spec` -# - Run `rpmbuild -bb dino.spec` - -%global commit COMMIT_ID_HERE -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: dino -Version: 0.0 -Release: 1%{?dist} -#Release: 1.git.%{shortcommit}%{?dist} -Summary: Modern Jabber/XMPP Client using GTK+/Vala -License: GPLv3 -URL: https://github.com/dino/dino -Source0: https://github.com/dino/dino/archive/v%{version}.zip -#Source0: https://github.com/dino/dino/archive/%{commit}.zip -BuildRequires: vala >= 0.30 -BuildRequires: vala-tools >= 0.30 -BuildRequires: cmake -BuildRequires: git -BuildRequires: ninja-build -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: pkgconfig(gthread-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.38 -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 -BuildRequires: pkgconfig(gee-0.8) >= 0.10 -BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libsoup-2.4) -BuildRequires: pkgconfig(sqlite3) -BuildRequires: libgcrypt-devel -BuildRequires: gpgme-devel -Requires: hicolor-icon-theme -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -# Technically these aren't requirements, we just want them always installed... -Requires: %{name}-plugin-omemo%{?_isa} = %{version}-%{release} -Requires: %{name}-plugin-openpgp%{?_isa} = %{version}-%{release} -Requires: %{name}-plugin-http-files%{?_isa} = %{version}-%{release} - -%description -Dino is an instant messaging client for the Jabber/XMPP network, -providing a unique and modern user experience based on the latest -technology from the GNOME project. Dino is still in early -development and has limited features, but already has basic support -for XMPP's latest encryption features. Future versions will provide -a plug-in API, so that developers can easily add new optional -features. - -%package libs -Summary: Libraries for %{name} - -%package libs-devel -Summary: Development files for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%package plugin-omemo -Summary: OMEMO plugin for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%package plugin-openpgp -Summary: OpenPGP plugin for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%package plugin-http-files -Summary: Http files plugin for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description libs -The %{name}-libs package contains libraries used and provided by %{name}. - -%description libs-devel -The %{name}-libs-devel package contains libraries and header files for -developing plugins for %{name}. - -%description plugin-omemo -The %{name}-plugin-omemo package contains a plugin that adds support for -OMEMO encryption to Dino. - -%description plugin-openpgp -The %{name}-plugin-openpgp package contains a plugin that adds support for -OpenPGP encryption to Dino. - -%description plugin-http-files -The %{name}-plugin-http-files package contains a plugin that adds support for -http file upload and download to Dino. - -%prep -%setup -n "dino-v%{version}" -#%setup -n "dino-%{commit}" - -%build -%configure -make - -%install -make install DESTDIR="%{buildroot}" -desktop-file-validate %{buildroot}%{_datadir}/applications/dino.desktop - -%post -update-desktop-database &>/dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || : - -%post libs -/sbin/ldconfig -if [ $1 -eq 0 ] ; then - glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi - -%postun libs -/sbin/ldconfig - -%posttrans libs -glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - -%files -%license LICENSE -%doc README.md -%{_bindir}/dino -%{_datadir}/applications/dino.desktop -%{_datadir}/icons/hicolor/*/apps/dino.* -%{_datadir}/icons/hicolor/*/apps/dino-* -%{_datadir}/icons/hicolor/*/status/dino-* -%{_datadir}/locale/*/LC_MESSAGES/dino.mo - -%files libs -%license LICENSE -%doc README.md -%{_datadir}/glib-2.0/schemas/dino.gschema.xml -%{_libdir}/libdino.so.* -%{_libdir}/libqlite.so.* -%{_libdir}/libxmpp-vala.so.* - -%files libs-devel -%license LICENSE -%doc README.md -%{_includedir}/* -%{_libdir}/libdino.so -%{_libdir}/libqlite.so -%{_libdir}/libxmpp-vala.so -%{_datadir}/vala/vapi - -%files plugin-omemo -%license LICENSE -%doc README.md -%{_libdir}/dino/plugins/omemo.so -%{_datadir}/locale/*/LC_MESSAGES/dino-omemo.mo - -%files plugin-openpgp -%license LICENSE -%doc README.md -%{_libdir}/dino/plugins/openpgp.so -%{_datadir}/locale/*/LC_MESSAGES/dino-openpgp.mo - -%files plugin-http-files -%license LICENSE -%doc README.md -%{_libdir}/dino/plugins/http-files.so - -%changelog -* Mon Apr 3 2017 - 0.0-1 -- Split packages - -* Fri Mar 24 2017 - 0.0-0 -- Initial version diff --git a/libdino/data/dino.gschema.xml b/libdino/data/dino.gschema.xml index 19cad0e4..7d1e82fd 100644 --- a/libdino/data/dino.gschema.xml +++ b/libdino/data/dino.gschema.xml @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/libdino/src/settings.vala b/libdino/src/settings.vala index 45d2192f..aac83917 100644 --- a/libdino/src/settings.vala +++ b/libdino/src/settings.vala @@ -35,4 +35,4 @@ public class Settings { } } -} \ No newline at end of file +} diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index e4030150..83c7a6d5 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -54,7 +54,7 @@ compile_gresources( TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c TYPE EMBED_C RESOURCES ${RESOURCE_LIST} - PREFIX /org/dino-im + PREFIX /im/dino SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data ) diff --git a/main/src/ui/add_conversation/chat/add_contact_dialog.vala b/main/src/ui/add_conversation/chat/add_contact_dialog.vala index f07f9659..9c14883a 100644 --- a/main/src/ui/add_conversation/chat/add_contact_dialog.vala +++ b/main/src/ui/add_conversation/chat/add_contact_dialog.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation.Chat { -[GtkTemplate (ui = "/org/dino-im/add_conversation/add_contact_dialog.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/add_contact_dialog.ui")] protected class AddContactDialog : Gtk.Dialog { public Account? account { @@ -55,4 +55,4 @@ protected class AddContactDialog : Gtk.Dialog { } } -} \ No newline at end of file +} diff --git a/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala b/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala index 602fe63f..dc0cfd6d 100644 --- a/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala +++ b/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation.Conference { -[GtkTemplate (ui = "/org/dino-im/add_conversation/add_groupchat_dialog.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/add_groupchat_dialog.ui")] protected class AddGroupchatDialog : Gtk.Dialog { [GtkChild] private Stack accounts_stack; diff --git a/main/src/ui/add_conversation/conference/conference_details_fragment.vala b/main/src/ui/add_conversation/conference/conference_details_fragment.vala index dcb69cff..d99681a1 100644 --- a/main/src/ui/add_conversation/conference/conference_details_fragment.vala +++ b/main/src/ui/add_conversation/conference/conference_details_fragment.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation.Conference { -[GtkTemplate (ui = "/org/dino-im/add_conversation/conference_details_fragment.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/conference_details_fragment.ui")] protected class ConferenceDetailsFragment : Box { public bool done { @@ -140,4 +140,4 @@ protected class ConferenceDetailsFragment : Box { } -} \ No newline at end of file +} diff --git a/main/src/ui/add_conversation/list_row.vala b/main/src/ui/add_conversation/list_row.vala index c68fde7b..5b600786 100644 --- a/main/src/ui/add_conversation/list_row.vala +++ b/main/src/ui/add_conversation/list_row.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation { -[GtkTemplate (ui = "/org/dino-im/add_conversation/list_row.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/list_row.ui")] public class ListRow : ListBoxRow { [GtkChild] public Image image; @@ -36,4 +36,4 @@ public class ListRow : ListBoxRow { } } -} \ No newline at end of file +} diff --git a/main/src/ui/add_conversation/select_jid_fragment.vala b/main/src/ui/add_conversation/select_jid_fragment.vala index 9e0c4067..98ceb2fa 100644 --- a/main/src/ui/add_conversation/select_jid_fragment.vala +++ b/main/src/ui/add_conversation/select_jid_fragment.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation { -[GtkTemplate (ui = "/org/dino-im/add_conversation/select_jid_fragment.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/select_jid_fragment.ui")] public class SelectJidFragment : Gtk.Box { public signal void add_jid(); diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala index 75b82352..f91e951d 100644 --- a/main/src/ui/application.vala +++ b/main/src/ui/application.vala @@ -17,7 +17,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application { Notify.init("dino"); Environment.set_application_name("Dino"); Gtk.Window.set_default_icon_name("dino"); - IconTheme.get_default().add_resource_path("/org/dino-im/icons"); + IconTheme.get_default().add_resource_path("/im/dino/icons"); activate.connect(() => { create_set_app_menu(); @@ -57,7 +57,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application { add_action(quit_action); add_accelerator("Q", "app.quit", null); - Builder builder = new Builder.from_resource("/org/dino-im/menu_app.ui"); + Builder builder = new Builder.from_resource("/im/dino/menu_app.ui"); MenuModel menu = builder.get_object("menu_app") as MenuModel; set_app_menu(menu); diff --git a/main/src/ui/chat_input/edit_history.vala b/main/src/ui/chat_input/edit_history.vala index 78a0f41e..22032a0b 100644 --- a/main/src/ui/chat_input/edit_history.vala +++ b/main/src/ui/chat_input/edit_history.vala @@ -30,12 +30,11 @@ class EditHistory { } public bool on_text_input_key_press(EventKey event) { - if ((event.state & ModifierType.CONTROL_MASK) > 0) { - if (event.keyval == Key.z) { - undo(); - } else if (event.keyval == Key.Z) { - redo(); - } + bool ctrl_pressed = (event.state & ModifierType.CONTROL_MASK) > 0; + if (ctrl_pressed && event.keyval == Key.z) { + undo(); + } else if (ctrl_pressed && (event.keyval in new uint[]{ Key.Z, Key.y } )) { + redo(); } else if (event.keyval in new uint[]{ Key.space, Key.Tab, Key.ISO_Left_Tab }) { if (indices[conversation] < histories[conversation].size - 1) { histories[conversation] = histories[conversation].slice(0, indices[conversation] + 1); diff --git a/main/src/ui/chat_input/view.vala b/main/src/ui/chat_input/view.vala index a7c3099c..3684e27c 100644 --- a/main/src/ui/chat_input/view.vala +++ b/main/src/ui/chat_input/view.vala @@ -7,7 +7,7 @@ using Xmpp; namespace Dino.Ui.ChatInput { -[GtkTemplate (ui = "/org/dino-im/chat_input.ui")] +[GtkTemplate (ui = "/im/dino/chat_input.ui")] public class View : Box { [GtkChild] private ScrolledWindow scrolled; diff --git a/main/src/ui/contact_details/dialog.vala b/main/src/ui/contact_details/dialog.vala index 4e61a3f5..147811f9 100644 --- a/main/src/ui/contact_details/dialog.vala +++ b/main/src/ui/contact_details/dialog.vala @@ -7,7 +7,7 @@ using Dino.Entities; namespace Dino.Ui.ContactDetails { -[GtkTemplate (ui = "/org/dino-im/contact_details_dialog.ui")] +[GtkTemplate (ui = "/im/dino/contact_details_dialog.ui")] public class Dialog : Gtk.Dialog { [GtkChild] public Image avatar; diff --git a/main/src/ui/conversation_list_titlebar.vala b/main/src/ui/conversation_list_titlebar.vala index e2d7fa26..b9a902c8 100644 --- a/main/src/ui/conversation_list_titlebar.vala +++ b/main/src/ui/conversation_list_titlebar.vala @@ -4,7 +4,7 @@ using Dino.Entities; namespace Dino.Ui { -[GtkTemplate (ui = "/org/dino-im/conversation_list_titlebar.ui")] +[GtkTemplate (ui = "/im/dino/conversation_list_titlebar.ui")] public class ConversationListTitlebar : Gtk.HeaderBar { public signal void conversation_opened(Conversation conversation); @@ -44,7 +44,7 @@ public class ConversationListTitlebar : Gtk.HeaderBar { }); GLib.Application.get_default().add_action(conference_action); - Builder builder = new Builder.from_resource("/org/dino-im/menu_add.ui"); + Builder builder = new Builder.from_resource("/im/dino/menu_add.ui"); MenuModel menu = builder.get_object("menu_add") as MenuModel; add_button.set_menu_model(menu); } diff --git a/main/src/ui/conversation_selector/chat_row.vala b/main/src/ui/conversation_selector/chat_row.vala index 83ad3a11..0a8737f1 100644 --- a/main/src/ui/conversation_selector/chat_row.vala +++ b/main/src/ui/conversation_selector/chat_row.vala @@ -47,7 +47,7 @@ public class ChatRow : ConversationRow { } private Widget generate_tooltip() { - Builder builder = new Builder.from_resource("/org/dino-im/conversation_selector/chat_row_tooltip.ui"); + Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui"); Box main_box = builder.get_object("main_box") as Box; Box inner_box = builder.get_object("inner_box") as Box; Label jid_label = builder.get_object("jid_label") as Label; @@ -64,4 +64,4 @@ public class ChatRow : ConversationRow { } } -} \ No newline at end of file +} diff --git a/main/src/ui/conversation_selector/conversation_row.vala b/main/src/ui/conversation_selector/conversation_row.vala index 2aa913b5..ecad3467 100644 --- a/main/src/ui/conversation_selector/conversation_row.vala +++ b/main/src/ui/conversation_selector/conversation_row.vala @@ -8,7 +8,7 @@ using Dino.Entities; namespace Dino.Ui.ConversationSelector { -[GtkTemplate (ui = "/org/dino-im/conversation_selector/conversation_row.ui")] +[GtkTemplate (ui = "/im/dino/conversation_selector/conversation_row.ui")] public abstract class ConversationRow : ListBoxRow { public signal void closed(); diff --git a/main/src/ui/conversation_selector/groupchat_pm_row.vala b/main/src/ui/conversation_selector/groupchat_pm_row.vala index c5cbcc09..b502501d 100644 --- a/main/src/ui/conversation_selector/groupchat_pm_row.vala +++ b/main/src/ui/conversation_selector/groupchat_pm_row.vala @@ -39,7 +39,7 @@ public class GroupchatPmRow : ConversationRow { } private Widget generate_tooltip() { - Builder builder = new Builder.from_resource("/org/dino-im/conversation_selector/chat_row_tooltip.ui"); + Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui"); Box main_box = builder.get_object("main_box") as Box; Box inner_box = builder.get_object("inner_box") as Box; Label jid_label = builder.get_object("jid_label") as Label; @@ -51,4 +51,4 @@ public class GroupchatPmRow : ConversationRow { } } -} \ No newline at end of file +} diff --git a/main/src/ui/conversation_selector/view.vala b/main/src/ui/conversation_selector/view.vala index 304c6bbe..3ea3148d 100644 --- a/main/src/ui/conversation_selector/view.vala +++ b/main/src/ui/conversation_selector/view.vala @@ -6,7 +6,7 @@ using Dino.Entities; namespace Dino.Ui.ConversationSelector { -[GtkTemplate (ui = "/org/dino-im/conversation_selector/view.ui")] +[GtkTemplate (ui = "/im/dino/conversation_selector/view.ui")] public class View : Box { public List conversation_list; @@ -49,4 +49,4 @@ public class View : Box { } } -} \ No newline at end of file +} diff --git a/main/src/ui/conversation_summary/message_item.vala b/main/src/ui/conversation_summary/message_item.vala index b03202f5..f669c021 100644 --- a/main/src/ui/conversation_summary/message_item.vala +++ b/main/src/ui/conversation_summary/message_item.vala @@ -7,7 +7,7 @@ using Dino.Entities; namespace Dino.Ui.ConversationSummary { -[GtkTemplate (ui = "/org/dino-im/conversation_summary/message_item.ui")] +[GtkTemplate (ui = "/im/dino/conversation_summary/message_item.ui")] public class MessageItem : Grid, ConversationItem { [GtkChild] private Image image; diff --git a/main/src/ui/conversation_summary/view.vala b/main/src/ui/conversation_summary/view.vala index c0cf772d..5b49f97e 100644 --- a/main/src/ui/conversation_summary/view.vala +++ b/main/src/ui/conversation_summary/view.vala @@ -7,7 +7,7 @@ using Xmpp; namespace Dino.Ui.ConversationSummary { -[GtkTemplate (ui = "/org/dino-im/conversation_summary/view.ui")] +[GtkTemplate (ui = "/im/dino/conversation_summary/view.ui")] public class View : Box { public Conversation? conversation { get; private set; } diff --git a/main/src/ui/conversation_titlebar/encryption_entry.vala b/main/src/ui/conversation_titlebar/encryption_entry.vala index 12b73409..16cc5fdd 100644 --- a/main/src/ui/conversation_titlebar/encryption_entry.vala +++ b/main/src/ui/conversation_titlebar/encryption_entry.vala @@ -24,7 +24,7 @@ class EncryptionWidget : MenuButton, Plugins.ConversationTitlebarWidget { private Map encryption_radios = new HashMap(); public EncryptionWidget() { - Builder builder = new Builder.from_resource("/org/dino-im/menu_encryption.ui"); + Builder builder = new Builder.from_resource("/im/dino/menu_encryption.ui"); PopoverMenu menu = builder.get_object("menu_encryption") as PopoverMenu; Box encryption_box = builder.get_object("encryption_box") as Box; button_unencrypted = builder.get_object("button_unencrypted") as RadioButton; diff --git a/main/src/ui/conversation_titlebar/menu_entry.vala b/main/src/ui/conversation_titlebar/menu_entry.vala index 6cdd11c2..e6e5e1b4 100644 --- a/main/src/ui/conversation_titlebar/menu_entry.vala +++ b/main/src/ui/conversation_titlebar/menu_entry.vala @@ -29,7 +29,7 @@ class MenuWidget : MenuButton, Plugins.ConversationTitlebarWidget { public MenuWidget(StreamInteractor stream_interactor) { image = new Image.from_icon_name("open-menu-symbolic", IconSize.MENU); - Builder builder = new Builder.from_resource("/org/dino-im/menu_conversation.ui"); + Builder builder = new Builder.from_resource("/im/dino/menu_conversation.ui"); MenuModel menu = builder.get_object("menu_conversation") as MenuModel; set_menu_model(menu); diff --git a/main/src/ui/manage_accounts/account_row.vala b/main/src/ui/manage_accounts/account_row.vala index f08faa78..911d48f4 100644 --- a/main/src/ui/manage_accounts/account_row.vala +++ b/main/src/ui/manage_accounts/account_row.vala @@ -4,7 +4,7 @@ using Dino.Entities; namespace Dino.Ui.ManageAccounts { -[GtkTemplate (ui = "/org/dino-im/manage_accounts/account_row.ui")] +[GtkTemplate (ui = "/im/dino/manage_accounts/account_row.ui")] public class AccountRow : Gtk.ListBoxRow { [GtkChild] public Image image; @@ -40,4 +40,4 @@ public class AccountRow : Gtk.ListBoxRow { } } -} \ No newline at end of file +} diff --git a/main/src/ui/manage_accounts/add_account_dialog.vala b/main/src/ui/manage_accounts/add_account_dialog.vala index 74754b79..5e3f3859 100644 --- a/main/src/ui/manage_accounts/add_account_dialog.vala +++ b/main/src/ui/manage_accounts/add_account_dialog.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.ManageAccounts { -[GtkTemplate (ui = "/org/dino-im/manage_accounts/add_account_dialog.ui")] +[GtkTemplate (ui = "/im/dino/manage_accounts/add_account_dialog.ui")] public class AddAccountDialog : Gtk.Dialog { public signal void added(Account account); diff --git a/main/src/ui/manage_accounts/dialog.vala b/main/src/ui/manage_accounts/dialog.vala index dae2fa73..7fc926dc 100644 --- a/main/src/ui/manage_accounts/dialog.vala +++ b/main/src/ui/manage_accounts/dialog.vala @@ -7,7 +7,7 @@ using Dino.Entities; namespace Dino.Ui.ManageAccounts { -[GtkTemplate (ui = "/org/dino-im/manage_accounts/dialog.ui")] +[GtkTemplate (ui = "/im/dino/manage_accounts/dialog.ui")] public class Dialog : Gtk.Dialog { public signal void account_enabled(Account account); diff --git a/main/src/ui/occupant_menu/list.vala b/main/src/ui/occupant_menu/list.vala index aeea7c26..3477885f 100644 --- a/main/src/ui/occupant_menu/list.vala +++ b/main/src/ui/occupant_menu/list.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.OccupantMenu{ -[GtkTemplate (ui = "/org/dino-im/occupant_list.ui")] +[GtkTemplate (ui = "/im/dino/occupant_list.ui")] public class List : Box { public signal void conversation_selected(Conversation? conversation); diff --git a/main/src/ui/occupant_menu/list_row.vala b/main/src/ui/occupant_menu/list_row.vala index f5776b4b..c7536f9c 100644 --- a/main/src/ui/occupant_menu/list_row.vala +++ b/main/src/ui/occupant_menu/list_row.vala @@ -5,7 +5,7 @@ using Xmpp; namespace Dino.Ui.OccupantMenu { -[GtkTemplate (ui = "/org/dino-im/occupant_list_item.ui")] +[GtkTemplate (ui = "/im/dino/occupant_list_item.ui")] public class ListRow : ListBoxRow { [GtkChild] private Image image; @@ -28,4 +28,4 @@ public class ListRow : ListBoxRow { } } -} \ No newline at end of file +} diff --git a/main/src/ui/settings_dialog.vala b/main/src/ui/settings_dialog.vala index 44596217..6d4daf3b 100644 --- a/main/src/ui/settings_dialog.vala +++ b/main/src/ui/settings_dialog.vala @@ -2,7 +2,7 @@ using Gtk; namespace Dino.Ui { -[GtkTemplate (ui = "/org/dino-im/settings_dialog.ui")] +[GtkTemplate (ui = "/im/dino/settings_dialog.ui")] class SettingsDialog : Dialog { [GtkChild] private CheckButton typing_checkbutton; @@ -27,4 +27,4 @@ class SettingsDialog : Dialog { } } -} \ No newline at end of file +} diff --git a/main/src/ui/unified_window.vala b/main/src/ui/unified_window.vala index 1ae13245..e9c1a8e6 100644 --- a/main/src/ui/unified_window.vala +++ b/main/src/ui/unified_window.vala @@ -151,7 +151,7 @@ public class NoConversationsPlaceholder : UnifiedWindowPlaceholder { } } -[GtkTemplate (ui = "/org/dino-im/unified_window_placeholder.ui")] +[GtkTemplate (ui = "/im/dino/unified_window_placeholder.ui")] public class UnifiedWindowPlaceholder : Box { [GtkChild] public Label label; [GtkChild] public Button primary_button; diff --git a/plugins/openpgp/CMakeLists.txt b/plugins/openpgp/CMakeLists.txt index 7bd98475..32c9ab75 100644 --- a/plugins/openpgp/CMakeLists.txt +++ b/plugins/openpgp/CMakeLists.txt @@ -22,7 +22,7 @@ compile_gresources( TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c TYPE EMBED_C RESOURCES ${RESOURCE_LIST} - PREFIX /org/dino-im + PREFIX /im/dino SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data ) diff --git a/plugins/openpgp/src/account_settings_widget.vala b/plugins/openpgp/src/account_settings_widget.vala index 35548c0e..a7ea2887 100644 --- a/plugins/openpgp/src/account_settings_widget.vala +++ b/plugins/openpgp/src/account_settings_widget.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Plugins.OpenPgp { -[GtkTemplate (ui = "/org/dino-im/account_settings_item.ui")] +[GtkTemplate (ui = "/im/dino/account_settings_item.ui")] private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget { [GtkChild] private Label label; diff --git a/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala b/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala index f19d1481..9f57a14b 100644 --- a/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala +++ b/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala @@ -40,7 +40,7 @@ namespace Xmpp.Xep.EntityCapabilities { if (presence.type_ == Presence.Stanza.TYPE_AVAILABLE) { presence.stanza.put_node(new StanzaNode.build("c", NS_URI).add_self_xmlns() .put_attribute("hash", "sha-1") - .put_attribute("node", "http://dino-im.org") + .put_attribute("node", "https://dino.im") .put_attribute("ver", get_own_hash(stream))); } }