pidgin/pidgin

a7acc7b00d79
Parents cdce45867b10
Children e353b2390ad8
Replace purple_str_has_{prefix,suffix} by g_str_has_{prefix,suffix}.
--- a/ChangeLog.API Mon Nov 04 02:22:52 2019 -0500
+++ b/ChangeLog.API Mon Nov 04 02:36:50 2019 -0500
@@ -499,6 +499,8 @@
* purple_strlcat
* purple_strlcpy
* purple_str_binary_to_ascii
+ * purple_str_has_prefix. Use g_str_has_prefix instead
+ * purple_str_has_suffix. Use g_str_has_suffix instead
* purple_str_size_to_units. Use g_format_size() instead.
* purple_timeout_*. Use g_timeout_* or g_idle_* instead.
* purple_txt_cancel
--- a/finch/gntrequest.c Mon Nov 04 02:22:52 2019 -0500
+++ b/finch/gntrequest.c Mon Nov 04 02:36:50 2019 -0500
@@ -433,9 +433,9 @@
purple_request_field_string_get_default_value(field));
gnt_entry_set_masked(GNT_ENTRY(entry),
purple_request_field_string_is_masked(field));
- if (hint && purple_str_has_prefix(hint, "screenname")) {
+ if (hint && g_str_has_prefix(hint, "screenname")) {
PurpleBlistNode *node = purple_blist_get_default_root();
- gboolean offline = purple_str_has_suffix(hint, "all");
+ gboolean offline = g_str_has_suffix(hint, "all");
for (; node; node = purple_blist_node_next(node, offline)) {
if (!PURPLE_IS_BUDDY(node))
continue;
--- a/libpurple/image-store.c Mon Nov 04 02:22:52 2019 -0500
+++ b/libpurple/image-store.c Mon Nov 04 02:36:50 2019 -0500
@@ -169,8 +169,9 @@
g_return_val_if_fail(uri != NULL, NULL);
- if (!purple_str_has_prefix(uri, PURPLE_IMAGE_STORE_PROTOCOL))
+ if (!g_str_has_prefix(uri, PURPLE_IMAGE_STORE_PROTOCOL)) {
return NULL;
+ }
uri += sizeof(PURPLE_IMAGE_STORE_PROTOCOL) - 1;
if (uri[0] == '-')
--- a/libpurple/keyring.c Mon Nov 04 02:22:52 2019 -0500
+++ b/libpurple/keyring.c Mon Nov 04 02:36:50 2019 -0500
@@ -1287,8 +1287,7 @@
GPluginPluginInfo *info =
GPLUGIN_PLUGIN_INFO(purple_plugin_get_info(plugin));
- if (!purple_str_has_prefix(gplugin_plugin_info_get_id(info),
- "keyring-")) {
+ if (!g_str_has_prefix(gplugin_plugin_info_get_id(info), "keyring-")) {
continue;
}
--- a/libpurple/log.c Mon Nov 04 02:22:52 2019 -0500
+++ b/libpurple/log.c Mon Nov 04 02:36:50 2019 -0500
@@ -927,9 +927,8 @@
while ((filename = g_dir_read_name(dir)))
{
- if (purple_str_has_suffix(filename, ext) &&
- strlen(filename) >= (17 + strlen(ext)))
- {
+ if (g_str_has_suffix(filename, ext) &&
+ strlen(filename) >= (17 + strlen(ext))) {
PurpleLog *log;
PurpleLogCommonLoggerData *data;
GDateTime *stamp = purple_str_to_date_time(purple_unescape_filename(filename), FALSE);
@@ -971,9 +970,8 @@
while ((filename = g_dir_read_name(dir)))
{
- if (purple_str_has_suffix(filename, ext) &&
- strlen(filename) >= (17 + strlen(ext)))
- {
+ if (g_str_has_suffix(filename, ext) &&
+ strlen(filename) >= (17 + strlen(ext))) {
char *tmp = g_build_filename(path, filename, NULL);
GStatBuf st;
if (g_stat(tmp, &st))
--- a/libpurple/plugins/log_reader.c Mon Nov 04 02:22:52 2019 -0500
+++ b/libpurple/plugins/log_reader.c Mon Nov 04 02:36:50 2019 -0500
@@ -100,9 +100,11 @@
const gchar *file;
while ((file = g_dir_read_name(dir))) {
- if (!purple_str_has_prefix(file, sn))
+ if (!g_str_has_prefix(file, sn)) {
continue;
- if (purple_str_has_suffix(file, ".html") || purple_str_has_suffix(file, ".AdiumHTMLLog")) {
+ }
+ if (g_str_has_suffix(file, ".html") ||
+ g_str_has_suffix(file, ".AdiumHTMLLog")) {
GDateTime *dt;
gint year, month, day, hour, minute, second;
const char *date = file;
@@ -165,7 +167,7 @@
list = g_list_prepend(list, log);
}
- } else if (purple_str_has_suffix(file, ".adiumLog")) {
+ } else if (g_str_has_suffix(file, ".adiumLog")) {
GDateTime *dt;
gint year, month, day, hour, minute, second;
const char *date = file;
@@ -269,8 +271,7 @@
/* This problem only seems to show up on Windows.
* The BOM is displaying as a space at the beginning of the log.
*/
- if (purple_str_has_prefix(read, "\xef\xbb\xbf"))
- {
+ if (g_str_has_prefix(read, "\xef\xbb\xbf")) {
/* FIXME: This feels so wrong... */
char *temp = g_strdup(&(read[3]));
g_free(read);
@@ -578,8 +579,9 @@
while ((name = g_dir_read_name(dir))) {
const char *c = name;
- if (!purple_str_has_prefix(c, username))
+ if (!g_str_has_prefix(c, username)) {
continue;
+ }
c += strlen(username);
while (*c) {
@@ -631,8 +633,9 @@
const char *c = name;
gchar *full_path;
- if (!purple_str_has_prefix(c, username))
+ if (!g_str_has_prefix(c, username)) {
continue;
+ }
c += strlen(username);
while (*c) {
@@ -862,16 +865,18 @@
* friendly name or alias. For this test, "match" is defined as:
* ^(friendly_name|alias)([^a-zA-Z0-9].*)?$
*/
- from_name_matches = (purple_str_has_prefix(from_name, friendly_name) &&
- !isalnum(*(from_name + friendly_name_length))) ||
- (purple_str_has_prefix(from_name, alias) &&
- !isalnum(*(from_name + alias_length)));
-
- to_name_matches = to_name != NULL && (
- (purple_str_has_prefix(to_name, friendly_name) &&
- !isalnum(*(to_name + friendly_name_length))) ||
- (purple_str_has_prefix(to_name, alias) &&
- !isalnum(*(to_name + alias_length))));
+ from_name_matches =
+ (g_str_has_prefix(from_name, friendly_name) &&
+ !isalnum(*(from_name + friendly_name_length))) ||
+ (g_str_has_prefix(from_name, alias) &&
+ !isalnum(*(from_name + alias_length)));
+
+ to_name_matches =
+ to_name != NULL &&
+ ((g_str_has_prefix(to_name, friendly_name) &&
+ !isalnum(*(to_name + friendly_name_length))) ||
+ (g_str_has_prefix(to_name, alias) &&
+ !isalnum(*(to_name + alias_length))));
if (from_name_matches) {
if (!to_name_matches) {
@@ -901,15 +906,13 @@
* matches their alias. For this test, "match" is
* defined as: ^alias([^a-zA-Z0-9].*)?$
*/
- from_name_matches = (purple_str_has_prefix(
- from_name, alias) &&
- !isalnum(*(from_name +
- alias_length)));
-
- to_name_matches = to_name && (purple_str_has_prefix(
- to_name, alias) &&
- !isalnum(*(to_name +
- alias_length)));
+ from_name_matches =
+ (g_str_has_prefix(from_name, alias) &&
+ !isalnum(*(from_name + alias_length)));
+
+ to_name_matches = to_name &&
+ (g_str_has_prefix(to_name, alias) &&
+ !isalnum(*(to_name + alias_length)));
g_free(alias);
@@ -929,17 +932,17 @@
* this test, "match" is defined as:
* ^friendly_name([^a-zA-Z0-9].*)?$
*/
- from_name_matches = (purple_str_has_prefix(
- from_name,
- server_alias) &&
- !isalnum(*(from_name +
- friendly_name_length)));
-
- to_name_matches = to_name && (
- (purple_str_has_prefix(
- to_name, server_alias) &&
- !isalnum(*(to_name +
- friendly_name_length))));
+ from_name_matches =
+ (g_str_has_prefix(from_name,
+ server_alias) &&
+ !isalnum(*(from_name +
+ friendly_name_length)));
+
+ to_name_matches =
+ to_name &&
+ ((g_str_has_prefix(to_name, server_alias) &&
+ !isalnum(*(to_name +
+ friendly_name_length))));
if (from_name_matches) {
if (!to_name_matches) {
@@ -1142,7 +1145,7 @@
}
*c = '\0';
- if (purple_str_has_prefix(line, "Session Close ")) {
+ if (g_str_has_prefix(line, "Session Close ")) {
if (data && !data->length) {
if (!(data->length = last_line_offset - data->offset)) {
/* This log had no data, so we remove it. */
@@ -1156,7 +1159,7 @@
}
}
} else if (line[0] && line[1] && line[2] &&
- purple_str_has_prefix(&line[3], "sion Start ")) {
+ g_str_has_prefix(&line[3], "sion Start ")) {
/* The conditional is to make sure we're not reading off
* the end of the string. We don't want strlen(), as that'd
* have to count the whole string needlessly.
@@ -1418,17 +1421,18 @@
line++;
}
- if (purple_str_has_prefix(line, "*** ")) {
+ if (g_str_has_prefix(line, "*** ")) {
line += (sizeof("*** ") - 1);
g_string_append(formatted, "<b>");
footer = "</b>";
- if (purple_str_has_prefix(line, "NOTE: This user is offline.")) {
+ if (g_str_has_prefix(line, "NOTE: This user is offline.")) {
line = _("User is offline.");
- } else if (purple_str_has_prefix(line,
- "NOTE: Your status is currently set to ")) {
+ } else if (g_str_has_prefix(
+ line,
+ "NOTE: Your status is currently set to ")) {
line += (sizeof("NOTE: ") - 1);
- } else if (purple_str_has_prefix(line, "Auto-response sent to ")) {
+ } else if (g_str_has_prefix(line, "Auto-response sent to ")) {
g_string_append(formatted, _("Auto-response sent:"));
while (*line && *line != ':')
line++;
@@ -1462,8 +1466,8 @@
g_string_append(formatted, log->name);
line = " logged in.";
- } else if (purple_str_has_prefix(line,
- "One or more messages may have been undeliverable.")) {
+ } else if (g_str_has_prefix(line, "One or more messages may "
+ "have been undeliverable.")) {
g_string_append(formatted,
"<span style=\"color: #ff0000;\">");
@@ -1472,8 +1476,8 @@
"undeliverable."));
line = "";
footer = "</span></b>";
- } else if (purple_str_has_prefix(line,
- "You have been disconnected.")) {
+ } else if (g_str_has_prefix(line,
+ "You have been disconnected.")) {
g_string_append(formatted,
"<span style=\"color: #ff0000;\">");
@@ -1481,8 +1485,8 @@
_("You were disconnected from the server."));
line = "";
footer = "</span></b>";
- } else if (purple_str_has_prefix(line,
- "You are currently disconnected.")) {
+ } else if (g_str_has_prefix(
+ line, "You are currently disconnected.")) {
g_string_append(formatted,
"<span style=\"color: #ff0000;\">");
@@ -1490,15 +1494,16 @@
"will not be received unless you are "
"logged in.");
footer = "</span></b>";
- } else if (purple_str_has_prefix(line,
- "Your previous message has not been sent.")) {
+ } else if (g_str_has_prefix(line, "Your previous message has "
+ "not been sent.")) {
g_string_append(formatted,
"<span style=\"color: #ff0000;\">");
- if (purple_str_has_prefix(line,
- "Your previous message has not been sent. "
- "Reason: Maximum length exceeded.")) {
+ if (g_str_has_prefix(
+ line,
+ "Your previous message has not been sent. "
+ "Reason: Maximum length exceeded.")) {
g_string_append(formatted,
_("Message could not be sent because "
@@ -1514,7 +1519,7 @@
footer = "</span></b>";
}
- } else if (purple_str_has_prefix(line, data->their_nickname)) {
+ } else if (g_str_has_prefix(line, data->their_nickname)) {
if (buddy != NULL) {
const char *alias = purple_buddy_get_alias(buddy);
@@ -1684,8 +1689,8 @@
gboolean add_new_log = FALSE;
if (c && *c) {
- if (purple_str_has_prefix(c, QIP_LOG_IN_MESSAGE) ||
- purple_str_has_prefix(c, QIP_LOG_OUT_MESSAGE)) {
+ if (g_str_has_prefix(c, QIP_LOG_IN_MESSAGE) ||
+ g_str_has_prefix(c, QIP_LOG_OUT_MESSAGE)) {
char *tmp;
@@ -1841,12 +1846,12 @@
while (c && *c) {
gboolean is_in_message = FALSE;
- if (purple_str_has_prefix(line, QIP_LOG_IN_MESSAGE_ESC) ||
- purple_str_has_prefix(line, QIP_LOG_OUT_MESSAGE_ESC)) {
+ if (g_str_has_prefix(line, QIP_LOG_IN_MESSAGE_ESC) ||
+ g_str_has_prefix(line, QIP_LOG_OUT_MESSAGE_ESC)) {
char *tmp;
- is_in_message = purple_str_has_prefix(line, QIP_LOG_IN_MESSAGE_ESC);
+ is_in_message = g_str_has_prefix(line, QIP_LOG_IN_MESSAGE_ESC);
/* find EOL */
c = strchr(c, '\n');
@@ -2010,7 +2015,7 @@
gint year, month, day, hour, minute, second;
GDateTime *dt;
while (c && *c) {
- if (purple_str_has_prefix(c, AMSN_LOG_CONV_START)) {
+ if (g_str_has_prefix(c, AMSN_LOG_CONV_START)) {
char month_str[4];
if (sscanf(c + strlen(AMSN_LOG_CONV_START),
"%u %3s %u %u:%u:%u",
@@ -2027,7 +2032,7 @@
offset = c - contents;
start_log = c;
}
- } else if (purple_str_has_prefix(c, AMSN_LOG_CONV_END) && found_start) {
+ } else if (g_str_has_prefix(c, AMSN_LOG_CONV_END) && found_start) {
data = g_new0(struct amsn_logger_data, 1);
data->path = g_strdup(filename);
data->offset = offset;
@@ -2215,7 +2220,7 @@
if (!end)
break;
*end = '\0';
- if (purple_str_has_prefix(start, AMSN_LOG_FORMAT_TAG) && in_span) {
+ if (g_str_has_prefix(start, AMSN_LOG_FORMAT_TAG) && in_span) {
/* New format for this line */
g_string_append(formatted, "</span><br>");
in_span = FALSE;
@@ -2244,19 +2249,19 @@
old_tag = tag + 7; /* C + xxxxxx */
} else {
/* |"Lxxx is a 3-digit colour code */
- if (purple_str_has_prefix(tag, "RED")) {