diff options
| -rw-r--r-- | libdino/src/service/connection_manager.vala | 2 | ||||
| -rw-r--r-- | libdino/src/service/stream_interactor.vala | 2 | ||||
| -rw-r--r-- | main/src/ui/conversation_selector/conversation_row.vala | 2 | ||||
| -rw-r--r-- | main/src/ui/unified_window.vala | 2 | ||||
| -rw-r--r-- | main/src/ui/util/helper.vala | 2 | ||||
| -rw-r--r-- | plugins/http-files/src/file_provider.vala | 2 | ||||
| -rw-r--r-- | plugins/omemo/src/file_provider.vala | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/libdino/src/service/connection_manager.vala b/libdino/src/service/connection_manager.vala index ad846ba2..464302cb 100644 --- a/libdino/src/service/connection_manager.vala +++ b/libdino/src/service/connection_manager.vala @@ -110,7 +110,7 @@ public class ConnectionManager : Object { return connection_todo; } - public XmppStream? connect(Account account) { + public XmppStream? connect_account(Account account) { if (!connection_todo.contains(account)) connection_todo.add(account); if (!connections.has_key(account)) { return connect_(account); diff --git a/libdino/src/service/stream_interactor.vala b/libdino/src/service/stream_interactor.vala index 55ab8984..2c8e1adc 100644 --- a/libdino/src/service/stream_interactor.vala +++ b/libdino/src/service/stream_interactor.vala @@ -26,7 +26,7 @@ public class StreamInteractor : Object { public void connect_account(Account account) { module_manager.initialize(account); account_added(account); - connection_manager.connect(account); + connection_manager.connect_account(account); } public void disconnect_account(Account account) { diff --git a/main/src/ui/conversation_selector/conversation_row.vala b/main/src/ui/conversation_selector/conversation_row.vala index 2d41d044..0d0db23a 100644 --- a/main/src/ui/conversation_selector/conversation_row.vala +++ b/main/src/ui/conversation_selector/conversation_row.vala @@ -136,7 +136,7 @@ public class ConversationRow : ListBoxRow { nick_label.label = last_message.direction == Message.DIRECTION_SENT ? _("Me") + ": " : ""; } - message_label.label = Markup.escape_text((new Regex("\\s+")).replace_literal(last_message.body, -1, 0, " ")); + message_label.label = Markup.escape_text((/\s+/).replace_literal(last_message.body, -1, 0, " ")); break; case FileItem.TYPE: FileItem file_item = last_content_item as FileItem; diff --git a/main/src/ui/unified_window.vala b/main/src/ui/unified_window.vala index 44107fb3..aa1aac60 100644 --- a/main/src/ui/unified_window.vala +++ b/main/src/ui/unified_window.vala @@ -28,7 +28,7 @@ public class UnifiedWindow : Gtk.Window { return Util.use_csd() ? conversation_titlebar_csd.subtitle : conversation_titlebar.subtitle; } set { - string? new_subtitle = value == null ? null : (new Regex("\\s+")).replace_literal(value, -1, 0, " "); + string? new_subtitle = value == null ? null : (/\s+/).replace_literal(value, -1, 0, " "); if (Util.use_csd()) { conversation_titlebar_csd.subtitle = new_subtitle; } else { diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala index de05d753..449936fc 100644 --- a/main/src/ui/util/helper.vala +++ b/main/src/ui/util/helper.vala @@ -169,7 +169,7 @@ public static string parse_add_markup(string s_, string? highlight_word, bool pa bool already_escaped = already_escaped_; if (parse_links) { - Regex url_regex = new Regex("""(?i)\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))"""); + Regex url_regex = /(?i)\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/; MatchInfo match_info; url_regex.match(s.down(), 0, out match_info); if (match_info.matches()) { diff --git a/plugins/http-files/src/file_provider.vala b/plugins/http-files/src/file_provider.vala index 80f99fa6..34106d42 100644 --- a/plugins/http-files/src/file_provider.vala +++ b/plugins/http-files/src/file_provider.vala @@ -16,7 +16,7 @@ public class FileProvider : Dino.FileProvider, Object { public FileProvider(StreamInteractor stream_interactor, Dino.Database dino_db) { this.stream_interactor = stream_interactor; this.dino_db = dino_db; - this.url_regex = new Regex("""^(?i)\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))$"""); + this.url_regex = /^(?i)\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))$/; stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(new ReceivedMessageListener(this)); } diff --git a/plugins/omemo/src/file_provider.vala b/plugins/omemo/src/file_provider.vala index bda73bfb..938ec0cf 100644 --- a/plugins/omemo/src/file_provider.vala +++ b/plugins/omemo/src/file_provider.vala @@ -17,7 +17,7 @@ public class FileProvider : Dino.FileProvider, Object { public FileProvider(StreamInteractor stream_interactor, Dino.Database dino_db) { this.stream_interactor = stream_interactor; this.dino_db = dino_db; - this.url_regex = new Regex("""^aesgcm://(.*)#(([A-Fa-f0-9]{2}){48}|([A-Fa-f0-9]{2}){44})$"""); + this.url_regex = /^aesgcm:\/\/(.*)#(([A-Fa-f0-9]{2}){48}|([A-Fa-f0-9]{2}){44})$/; stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(new ReceivedMessageListener(this)); } |