diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common.c | 45 | ||||
| -rw-r--r-- | src/omemo/omemo.c | 2 | ||||
| -rw-r--r-- | src/ui/console.c | 8 | ||||
| -rw-r--r-- | src/xmpp/connection.c | 21 |
4 files changed, 30 insertions, 46 deletions
diff --git a/src/common.c b/src/common.c index 7888a1dc..eabb45f3 100644 --- a/src/common.c +++ b/src/common.c @@ -355,33 +355,32 @@ prof_occurrences(const char* const needle, const char* const haystack, int offse return *result; } - gchar* haystack_curr = g_utf8_offset_to_pointer(haystack, offset); - if (g_str_has_prefix(haystack_curr, needle)) { - if (whole_word) { - gunichar before = 0; - gchar* haystack_before_ch = g_utf8_find_prev_char(haystack, haystack_curr); - if (haystack_before_ch) { - before = g_utf8_get_char(haystack_before_ch); - } - - gunichar after = 0; - gchar* haystack_after_ch = haystack_curr + strlen(needle); - if (haystack_after_ch[0] != '\0') { - after = g_utf8_get_char(haystack_after_ch); - } - - if (!g_unichar_isalnum(before) && !g_unichar_isalnum(after)) { + do { + gchar* haystack_curr = g_utf8_offset_to_pointer(haystack, offset); + if (g_str_has_prefix(haystack_curr, needle)) { + if (whole_word) { + gunichar before = 0; + gchar* haystack_before_ch = g_utf8_find_prev_char(haystack, haystack_curr); + if (haystack_before_ch) { + before = g_utf8_get_char(haystack_before_ch); + } + + gunichar after = 0; + gchar* haystack_after_ch = haystack_curr + strlen(needle); + if (haystack_after_ch[0] != '\0') { + after = g_utf8_get_char(haystack_after_ch); + } + + if (!g_unichar_isalnum(before) && !g_unichar_isalnum(after)) { + *result = g_slist_append(*result, GINT_TO_POINTER(offset)); + } + } else { *result = g_slist_append(*result, GINT_TO_POINTER(offset)); } - } else { - *result = g_slist_append(*result, GINT_TO_POINTER(offset)); } - } - offset++; - if (g_strcmp0(g_utf8_offset_to_pointer(haystack, offset), "\0") != 0) { - *result = prof_occurrences(needle, haystack, offset, whole_word, result); - } + offset++; + } while (g_strcmp0(g_utf8_offset_to_pointer(haystack, offset), "\0") != 0); return *result; } diff --git a/src/omemo/omemo.c b/src/omemo/omemo.c index f654f33b..9104a8cb 100644 --- a/src/omemo/omemo.c +++ b/src/omemo/omemo.c @@ -1920,7 +1920,7 @@ char* omemo_qrcode_str() { char* mybarejid = connection_get_barejid(); - char* fingerprint = omemo_own_fingerprint(TRUE); + char* fingerprint = omemo_own_fingerprint(FALSE); uint32_t sid = omemo_device_id(); char* qrstr = g_strdup_printf("xmpp:%s?omemo-sid-%d=%s", mybarejid, sid, fingerprint); diff --git a/src/ui/console.c b/src/ui/console.c index b1720415..bab8e17c 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -915,10 +915,12 @@ cons_show_qrcode(const char* const text) strcat(pad, "\u2588\u2588"); } - win_println(console, THEME_DEFAULT, "", pad); + win_println(console, THEME_DEFAULT, "", ""); + win_println(console, THEME_DEFAULT, "", ""); + win_println(console, THEME_DEFAULT, "", "%s", pad); for (size_t y = 0; y < width; y += ZOOM_SIZE) { for (size_t x = 0; x < width; x += ZOOM_SIZE) { - strcat(buf, !(*data & 1) ? "\u2588\u2588" : "\u2800\u2800"); + strcat(buf, !(*data & 1) ? "\u2588\u2588" : " "); data++; } @@ -929,6 +931,8 @@ cons_show_qrcode(const char* const text) buf[0] = '\0'; } win_println(console, THEME_DEFAULT, "", "%s", pad); + win_println(console, THEME_DEFAULT, "", ""); + win_println(console, THEME_DEFAULT, "", ""); free(pad); free(buf); diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 3165a18e..3eca29c4 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -847,8 +847,6 @@ connection_set_priority(const int priority) conn.priority = priority; } -#if defined(LIBXMPP_VERSION_MAJOR) && defined(LIBXMPP_VERSION_MINOR) \ - && ((LIBXMPP_VERSION_MAJOR > 0) || (LIBXMPP_VERSION_MINOR >= 12)) static xmpp_stanza_t* _get_soh_error(xmpp_stanza_t* error_stanza) { @@ -857,19 +855,6 @@ _get_soh_error(xmpp_stanza_t* error_stanza) XMPP_STANZA_NAME_IN_NS("see-other-host", STANZA_NS_XMPP_STREAMS), NULL); } -#else -static xmpp_stanza_t* -_get_soh_error(xmpp_stanza_t* error_stanza) -{ - const char* name = xmpp_stanza_get_name(error_stanza); - const char* ns = xmpp_stanza_get_ns(error_stanza); - if (!name || !ns || strcmp(name, "error") || strcmp(ns, STANZA_NS_STREAMS)) { - log_debug("_get_soh_error: could not find error stanza"); - return NULL; - } - return xmpp_stanza_get_child_by_name_and_ns(error_stanza, "see-other-host", STANZA_NS_XMPP_STREAMS); -} -#endif #if GLIB_CHECK_VERSION(2, 66, 0) static gboolean @@ -878,12 +863,8 @@ _split_url(const char* alturi, gchar** host, gint* port) /* Construct a valid URI with `schema://` as `g_uri_split_network()` * requires this to be there. */ - const char* xmpp = "xmpp://"; - char* xmpp_uri = _xmalloc(strlen(xmpp) + strlen(alturi) + 1, NULL); - memcpy(xmpp_uri, xmpp, strlen(xmpp)); - memcpy(xmpp_uri + strlen(xmpp), alturi, strlen(alturi) + 1); + auto_gchar gchar* xmpp_uri = g_strdup_printf("xmpp://%s", alturi); gboolean ret = g_uri_split_network(xmpp_uri, 0, NULL, host, port, NULL); - free(xmpp_uri); /* fix-up `port` as g_uri_split_network() sets port to `-1` if it's missing * in the passed-in URI, but libstrophe expects a "missing port" * to be passed as `0` (which then results in connecting to the standard port). |