changeset
Merged in default (pull request #552)
Tue, 17 Sep 2019 02:20:47 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Tue, 17 Sep 2019 02:20:47 +0000
- changeset 39838
- c4be688a6878
- parent 39833
- cd90938cd6f7 (diff)
- parent 39837
- 4cd31f854f9a (current diff)
- child 39841
- 3a9a01fa8681
Merged in default (pull request #552)
Remove redundant purple_plugin_info_get_* wrappers.
Approved-by: Gary Kramlich
| ChangeLog.API | file | annotate | diff | comparison | revisions | |
| pidgin/gtkconv.c | file | annotate | diff | comparison | revisions |
--- a/ChangeLog.API Sun Sep 15 03:54:08 2019 -0400 +++ b/ChangeLog.API Tue Sep 17 02:20:47 2019 +0000 @@ -504,6 +504,7 @@ * purple_status_type_set_primary_attr * purple_strlcat * purple_strlcpy + * purple_str_size_to_units. Use g_format_size() instead. * purple_timeout_*. Use g_timeout_* or g_idle_* instead. * purple_txt_cancel * purple_txt_resolve_account
--- a/finch/gntlog.c Sun Sep 15 03:54:08 2019 -0400 +++ b/finch/gntlog.c Tue Sep 17 02:20:47 2019 +0000 @@ -344,7 +344,7 @@ gnt_box_add_widget(GNT_BOX(vbox), hbox); /* Log size ************/ if (log_size) { - char *sz_txt = purple_str_size_to_units(log_size); + char *sz_txt = g_format_size(log_size); text = g_strdup_printf("%s %s", _("Total log size:"), sz_txt); size_label = gnt_label_new(text); gnt_box_add_widget(GNT_BOX(hbox), size_label);
--- a/finch/gntxfer.c Sun Sep 15 03:54:08 2019 -0400 +++ b/finch/gntxfer.c Tue Sep 17 02:20:47 2019 +0000 @@ -303,8 +303,8 @@ type = purple_xfer_get_xfer_type(xfer); - size_str = purple_str_size_to_units(purple_xfer_get_size(xfer)); - remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer)); + size_str = g_format_size(purple_xfer_get_size(xfer)); + remaining_str = g_format_size(purple_xfer_get_bytes_remaining(xfer)); lfilename = g_path_get_basename(purple_xfer_get_local_filename(xfer)); utf8 = g_filename_to_utf8(lfilename, -1, NULL, NULL, NULL); @@ -394,16 +394,20 @@ char prog_str[5]; double kb_sent; double kbps = 0.0; - time_t elapsed, now; + gint64 now; + gint64 elapsed = 0; char *kbsec; gboolean send; - if ((now = purple_xfer_get_end_time(xfer)) == 0) - now = time(NULL); + if (purple_xfer_get_start_time(xfer) > 0) { + if ((now = purple_xfer_get_end_time(xfer)) == 0) { + now = g_get_monotonic_time(); + } + elapsed = now - purple_xfer_get_start_time(xfer); + } - kb_sent = purple_xfer_get_bytes_sent(xfer) / 1024.0; - elapsed = (purple_xfer_get_start_time(xfer) > 0 ? now - purple_xfer_get_start_time(xfer) : 0); - kbps = (elapsed > 0 ? (kb_sent / elapsed) : 0); + kb_sent = purple_xfer_get_bytes_sent(xfer) / 1000.0; + kbps = (elapsed > 0 ? (kb_sent * G_USEC_PER_SEC) / elapsed : 0); g_return_if_fail(xfer_dialog != NULL); g_return_if_fail(xfer != NULL); @@ -423,9 +427,9 @@ data->last_updated_time = current_time; send = (purple_xfer_get_xfer_type(xfer) == PURPLE_XFER_TYPE_SEND); - size_str = purple_str_size_to_units(purple_xfer_get_size(xfer)); - remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer)); - kbsec = g_strdup_printf(_("%.2f KiB/s"), kbps); + size_str = g_format_size(purple_xfer_get_size(xfer)); + remaining_str = g_format_size(purple_xfer_get_bytes_remaining(xfer)); + kbsec = g_strdup_printf(_("%.2f KB/s"), kbps); gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_PROGRESS, g_ascii_dtostr(prog_str, sizeof(prog_str), purple_xfer_get_progress(xfer) * 100.));
--- a/libpurple/buddylist.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/buddylist.c Tue Sep 17 02:20:47 2019 +0000 @@ -2071,6 +2071,15 @@ { PurpleBuddyListClass *klass = NULL; + /* XXX: There's a chicken and egg problem with the accounts api, where + * it'll call this function before purple_blist_init is called, this will + * cause the following g_return_if_fail to fail, and muck up the logs. We + * need to find a better fix for this, but this gets rid of it for now. + */ + if(G_UNLIKELY(list == NULL && purplebuddylist == NULL)) { + return; + } + g_return_if_fail(PURPLE_IS_BUDDY_LIST(list)); klass = PURPLE_BUDDY_LIST_GET_CLASS(list);
--- a/libpurple/protocols/bonjour/bonjour.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/bonjour/bonjour.h Tue Sep 17 02:20:47 2019 +0000 @@ -23,8 +23,8 @@ * */ -#ifndef _BONJOUR_H_ -#define _BONJOUR_H_ +#ifndef PURPLE_BONJOUR_BONJOUR_H +#define PURPLE_BONJOUR_BONJOUR_H #include <gmodule.h> @@ -79,4 +79,4 @@ */ const char *bonjour_get_jid(PurpleAccount *account); -#endif /* _BONJOUR_H_ */ +#endif /* PURPLE_BONJOUR_BONJOUR_H */
--- a/libpurple/protocols/bonjour/bonjour_ft.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/bonjour/bonjour_ft.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _BONJOUR_FT_H_ -#define _BONJOUR_FT_H_ +#ifndef PURPLE_BONJOUR_BONJOUR_FT_H +#define PURPLE_BONJOUR_BONJOUR_FT_H + #include "network.h" #include "proxy.h" @@ -59,4 +60,4 @@ G_END_DECLS -#endif +#endif /* PURPLE_BONJOUR_BONJOUR_FT_H */
--- a/libpurple/protocols/bonjour/buddy.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/bonjour/buddy.h Tue Sep 17 02:20:47 2019 +0000 @@ -14,8 +14,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ -#ifndef _BONJOUR_BUDDY -#define _BONJOUR_BUDDY +#ifndef PURPLE_BONJOUR_BUDDY_H +#define PURPLE_BONJOUR_BUDDY_H #include <glib.h> @@ -111,4 +111,4 @@ */ void bonjour_buddy_delete(BonjourBuddy *buddy); -#endif +#endif /* PURPLE_BONJOUR_BUDDY_H */
--- a/libpurple/protocols/bonjour/dns_sd_proxy.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/bonjour/dns_sd_proxy.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ -#ifndef _DNS_SD_PROXY -#define _DNS_SD_PROXY +#ifndef PURPLE_BONJOUR_DNS_SD_PROXY_H +#define PURPLE_BONJOUR_DNS_SD_PROXY_H #include <config.h> @@ -196,4 +196,4 @@ #define TXTRecordSetValue(txtRecord, key, valueSize, value) \ _wpurple_TXTRecordSetValue(txtRecord, key, valueSize, value) -#endif +#endif /* PURPLE_BONJOUR_DNS_SD_PROXY_H */
--- a/libpurple/protocols/bonjour/jabber.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/bonjour/jabber.h Tue Sep 17 02:20:47 2019 +0000 @@ -23,8 +23,8 @@ * */ -#ifndef _BONJOUR_JABBER_H_ -#define _BONJOUR_JABBER_H_ +#ifndef PURPLE_BONJOUR_JABBER_H +#define PURPLE_BONJOUR_JABBER_H #include <libxml/parser.h> @@ -112,4 +112,4 @@ void append_iface_if_linklocal(char *ip, guint32 interface_param); -#endif /* _BONJOUR_JABBER_H_ */ +#endif /* PURPLE_BONJOUR_JABBER_H */
--- a/libpurple/protocols/bonjour/mdns_common.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/bonjour/mdns_common.h Tue Sep 17 02:20:47 2019 +0000 @@ -14,8 +14,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ -#ifndef _BONJOUR_MDNS_COMMON -#define _BONJOUR_MDNS_COMMON +#ifndef PURPLE_BONJOUR_MDNS_COMMON_H +#define PURPLE_BONJOUR_MDNS_COMMON_H #include "mdns_types.h" @@ -59,4 +59,4 @@ void bonjour_dns_sd_set_jid(PurpleAccount *account, const char *hostname); -#endif +#endif /* PURPLE_BONJOUR_MDNS_COMMON_H */
--- a/libpurple/protocols/bonjour/mdns_interface.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/bonjour/mdns_interface.h Tue Sep 17 02:20:47 2019 +0000 @@ -14,8 +14,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ -#ifndef _BONJOUR_MDNS_INTERFACE -#define _BONJOUR_MDNS_INTERFACE +#ifndef PURPLE_BONJOUR_MDNS_INTERFACE_H +#define PURPLE_BONJOUR_MDNS_INTERFACE_H #include "mdns_types.h" #include "buddy.h" @@ -36,4 +36,4 @@ void _mdns_retrieve_buddy_icon(BonjourBuddy* buddy); -#endif +#endif /* PURPLE_BONJOUR_MDNS_INTERFACE_H */
--- a/libpurple/protocols/bonjour/mdns_types.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/bonjour/mdns_types.h Tue Sep 17 02:20:47 2019 +0000 @@ -14,8 +14,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ -#ifndef _BONJOUR_MDNS_TYPES -#define _BONJOUR_MDNS_TYPES +#ifndef PURPLE_BONJOUR_MDNS_TYPES_H +#define PURPLE_BONJOUR_MDNS_TYPES_H #include <glib.h> #include "account.h" @@ -42,4 +42,4 @@ PUBLISH_UPDATE } PublishType; -#endif +#endif /* PURPLE_BONJOUR_MDNS_TYPES_H */
--- a/libpurple/protocols/bonjour/parser.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/bonjour/parser.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PURPLE_BONJOUR_PARSER_H_ -#define _PURPLE_BONJOUR_PARSER_H_ + +#ifndef PURPLE_BONJOUR_PARSER_H +#define PURPLE_BONJOUR_PARSER_H #include "buddy.h" #include "jabber.h" @@ -30,4 +31,4 @@ void bonjour_parser_setup(BonjourJabberConversation *bconv); void bonjour_parser_process(BonjourJabberConversation *bconv, const char *buf, int len); -#endif /* _PURPLE_BONJOUR_PARSER_H_ */ +#endif /* PURPLE_BONJOUR_PARSER_H */
--- a/libpurple/protocols/facebook/api.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/facebook/api.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _FACEBOOK_API_H_ -#define _FACEBOOK_API_H_ +#ifndef PURPLE_FACEBOOK_API_H +#define PURPLE_FACEBOOK_API_H /** * SECTION:api @@ -971,4 +971,4 @@ void fb_api_user_free(FbApiUser *user); -#endif /* _FACEBOOK_API_H_ */ +#endif /* PURPLE_FACEBOOK_API_H */
--- a/libpurple/protocols/facebook/data.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/facebook/data.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _FACEBOOK_DATA_H_ -#define _FACEBOOK_DATA_H_ +#ifndef PURPLE_FACEBOOK_DATA_H +#define PURPLE_FACEBOOK_DATA_H /** * SECTION:data @@ -336,4 +336,4 @@ void fb_data_image_queue(FbData *fata); -#endif /* _FACEBOOK_DATA_H_ */ +#endif /* PURPLE_FACEBOOK_DATA_H */
--- a/libpurple/protocols/facebook/facebook.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/facebook/facebook.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _FACEBOOK_H_ -#define _FACEBOOK_H_ +#ifndef PURPLE_FACEBOOK_FACEBOOK_H +#define PURPLE_FACEBOOK_FACEBOOK_H /** * SECTION:facebook @@ -81,4 +81,4 @@ G_MODULE_EXPORT GType facebook_protocol_get_type(void); -#endif /* _FACEBOOK_H_ */ +#endif /* PURPLE_FACEBOOK_FACEBOOK_H */
--- a/libpurple/protocols/facebook/http.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/facebook/http.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _FACEBOOK_HTTP_H_ -#define _FACEBOOK_HTTP_H_ +#ifndef PURPLE_FACEBOOK_HTTP_H +#define PURPLE_FACEBOOK_HTTP_H /** * SECTION:http @@ -368,4 +368,4 @@ gboolean fb_http_urlcmp(const gchar *url1, const gchar *url2, gboolean protocol); -#endif /* _FACEBOOK_HTTP_H_ */ +#endif /* PURPLE_FACEBOOK_HTTP_H */
--- a/libpurple/protocols/facebook/id.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/facebook/id.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _FACEBOOK_ID_H_ -#define _FACEBOOK_ID_H_ +#ifndef PURPLE_FACEBOOK_ID_H +#define PURPLE_FACEBOOK_ID_H /** * SECTION:id @@ -128,4 +128,4 @@ */ typedef gint64 FbId; -#endif /* _FACEBOOK_ID_H_ */ +#endif /* PURPLE_FACEBOOK_ID_H */
--- a/libpurple/protocols/facebook/json.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/facebook/json.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _FACEBOOK_JSON_H_ -#define _FACEBOOK_JSON_H_ +#ifndef PURPLE_FACEBOOK_JSON_H +#define PURPLE_FACEBOOK_JSON_H /** * SECTION:json @@ -482,4 +482,4 @@ gchar * fb_json_values_next_str_dup(FbJsonValues *values, const gchar *defval); -#endif /* _FACEBOOK_JSON_H_ */ +#endif /* PURPLE_FACEBOOK_JSON_H */
--- a/libpurple/protocols/facebook/mqtt.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/facebook/mqtt.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _FACEBOOK_MQTT_H_ -#define _FACEBOOK_MQTT_H_ +#ifndef PURPLE_FACEBOOK_MQTT_H +#define PURPLE_FACEBOOK_MQTT_H /** * SECTION:mqtt @@ -541,4 +541,4 @@ void fb_mqtt_message_write_str(FbMqttMessage *msg, const gchar *value); -#endif /* _FACEBOOK_MQTT_H_ */ +#endif /* PURPLE_FACEBOOK_MQTT_H */
--- a/libpurple/protocols/facebook/thrift.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/facebook/thrift.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _FACEBOOK_THRIFT_H_ -#define _FACEBOOK_THRIFT_H_ +#ifndef PURPLE_FACEBOOK_THRIFT_H +#define PURPLE_FACEBOOK_THRIFT_H /** * SECTION:thrift @@ -568,4 +568,4 @@ FbThriftType fb_thrift_ct2t(guint8 type); -#endif /* _FACEBOOK_THRIFT_H_ */ +#endif /* PURPLE_FACEBOOK_THRIFT_H */
--- a/libpurple/protocols/facebook/util.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/facebook/util.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _FACEBOOK_UTIL_H_ -#define _FACEBOOK_UTIL_H_ +#ifndef PURPLE_FACEBOOK_UTIL_H +#define PURPLE_FACEBOOK_UTIL_H /** * SECTION:util @@ -347,4 +347,4 @@ GByteArray * fb_util_zlib_inflate(const GByteArray *bytes, GError **error); -#endif /* _FACEBOOK_UTIL_H_ */ +#endif /* PURPLE_FACEBOOK_UTIL_H */
--- a/libpurple/protocols/gg/account.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/account.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_ACCOUNT_H -#define _GGP_ACCOUNT_H +#ifndef PURPLE_GG_ACCOUNT_H +#define PURPLE_GG_ACCOUNT_H #error "This file is outdated" @@ -59,4 +59,4 @@ void ggp_account_chpass(PurpleConnection *gc); -#endif /* _GGP_ACCOUNT_H */ +#endif /* PURPLE_GG_ACCOUNT_H */
--- a/libpurple/protocols/gg/avatar.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/avatar.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_AVATAR_H -#define _GGP_AVATAR_H +#ifndef PURPLE_GG_AVATAR_H +#define PURPLE_GG_AVATAR_H #include <internal.h> #include <libgadu.h> @@ -50,4 +50,4 @@ void ggp_avatar_own_set(PurpleConnection *gc, PurpleImage *img); -#endif /* _GGP_AVATAR_H */ +#endif /* PURPLE_GG_AVATAR_H */
--- a/libpurple/protocols/gg/blist.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/blist.h Tue Sep 17 02:20:47 2019 +0000 @@ -20,9 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ - -#ifndef _PURPLE_GG_BLIST_H -#define _PURPLE_GG_BLIST_H +#ifndef PURPLE_GG_BLIST_H +#define PURPLE_GG_BLIST_H #include "connection.h" @@ -60,7 +59,6 @@ */ const char * ggp_buddylist_get_buddy_name(PurpleConnection *gc, const uin_t uin); -#endif /* _PURPLE_GG_BLIST_H */ - +#endif /* PURPLE_GG_BLIST_H */ /* vim: set ts=8 sts=0 sw=8 noet: */
--- a/libpurple/protocols/gg/chat.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/chat.h Tue Sep 17 02:20:47 2019 +0000 @@ -25,8 +25,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_CHAT_H -#define _GGP_CHAT_H + +#ifndef PURPLE_GG_CHAT_H +#define PURPLE_GG_CHAT_H #include <internal.h> #include <libgadu.h> @@ -55,4 +56,4 @@ PurpleRoomlist * ggp_chat_roomlist_get_list(PurpleConnection *gc); -#endif /* _GGP_CHAT_H */ +#endif /* PURPLE_GG_CHAT_H */
--- a/libpurple/protocols/gg/edisc.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/edisc.h Tue Sep 17 02:20:47 2019 +0000 @@ -25,8 +25,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_EDISC_H -#define _GGP_EDISC_H + +#ifndef PURPLE_GG_EDISC_H +#define PURPLE_GG_EDISC_H #include <internal.h> @@ -55,4 +56,4 @@ G_END_DECLS -#endif /* _GGP_EDISC_H */ +#endif /* PURPLE_GG_EDISC_H */
--- a/libpurple/protocols/gg/gg.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/gg.c Tue Sep 17 02:20:47 2019 +0000 @@ -594,9 +594,9 @@ } static gint -gg_uri_handler_find_account(gconstpointer a, gconstpointer b) +gg_uri_handler_find_account(PurpleAccount *account, + G_GNUC_UNUSED gconstpointer data) { - PurpleAccount *account = PURPLE_ACCOUNT(a); const gchar *protocol_id; protocol_id = purple_account_get_protocol_id(account); @@ -630,8 +630,8 @@ /* Find online Gadu-Gadu account */ accounts = purple_accounts_get_all(); - account_node = g_list_find_custom(accounts, NULL, - gg_uri_handler_find_account); + account_node = g_list_find_custom( + accounts, NULL, (GCompareFunc)gg_uri_handler_find_account); if (account_node == NULL) { return FALSE;
--- a/libpurple/protocols/gg/gg.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/gg.h Tue Sep 17 02:20:47 2019 +0000 @@ -20,9 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ - -#ifndef _PURPLE_GG_H -#define _PURPLE_GG_H +#ifndef PURPLE_GG_GG_H +#define PURPLE_GG_GG_H #define GGP_UIN_LEN_MAX 10 @@ -92,4 +91,4 @@ void ggp_async_login_handler(gpointer _gc, gint fd, PurpleInputCondition cond); -#endif /* _PURPLE_GG_H */ +#endif /* PURPLE_GG_GG_H */
--- a/libpurple/protocols/gg/html.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/html.h Tue Sep 17 02:20:47 2019 +0000 @@ -25,8 +25,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_HTML_H -#define _GGP_HTML_H + +#ifndef PURPLE_GG_HTML_H +#define PURPLE_GG_HTML_H #include <internal.h> @@ -55,5 +56,4 @@ int ggp_html_decode_color(const gchar *str); ggp_html_tag ggp_html_parse_tag(const gchar *tag_str); - -#endif /* _GGP_HTML_H */ +#endif /* PURPLE_GG_HTML_H */
--- a/libpurple/protocols/gg/image-prpl.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/image-prpl.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_IMAGE_H -#define _GGP_IMAGE_H +#ifndef PURPLE_GG_IMAGE_PRPL_H +#define PURPLE_GG_IMAGE_PRPL_H #include <internal.h> #include <libgadu.h> @@ -65,4 +65,4 @@ PurpleImage * ggp_image_request(PurpleConnection *gc, uin_t uin, uint64_t id); -#endif /* _GGP_IMAGE_H */ +#endif /* PURPLE_GG_IMAGE_PRPL_H */
--- a/libpurple/protocols/gg/keymapper.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/keymapper.h Tue Sep 17 02:20:47 2019 +0000 @@ -25,8 +25,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_KEYMAPPER_H -#define _GGP_KEYMAPPER_H + +#ifndef PURPLE_GG_KEYMAPPER_H +#define PURPLE_GG_KEYMAPPER_H typedef struct _ggp_keymapper ggp_keymapper; @@ -45,4 +46,4 @@ guint64 ggp_keymapper_from_key(ggp_keymapper *km, gpointer key); -#endif /* _GGP_KEYMAPPER_H */ +#endif /* PURPLE_GG_KEYMAPPER_H */
--- a/libpurple/protocols/gg/libgadu-events.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/libgadu-events.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_LIBGADU_EVENTS_H -#define _GGP_LIBGADU_EVENTS_H +#ifndef PURPLE_GG_LIBGADU_EVENTS_H +#define PURPLE_GG_LIBGADU_EVENTS_H #include <internal.h> #include <libgadu.h> @@ -40,4 +40,4 @@ void ggp_events_json(PurpleConnection *gc, struct gg_event_json_event *ev); -#endif /* _GGP_LIBGADU_EVENTS_H */ +#endif /* PURPLE_GG_LIBGADU_EVENTS_H */
--- a/libpurple/protocols/gg/libgaduw.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/libgaduw.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_LIBGADUW_H -#define _GGP_LIBGADUW_H +#ifndef PURPLE_GG_LIBGADUW_H +#define PURPLE_GG_LIBGADUW_H #include <internal.h> #include <libgadu.h> @@ -59,4 +59,4 @@ gboolean show_processing); void ggp_libgaduw_http_cancel(ggp_libgaduw_http_req *req); -#endif /* _GGP_LIBGADUW_H */ +#endif /* PURPLE_GG_LIBGADUW_H */
--- a/libpurple/protocols/gg/message-prpl.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/message-prpl.h Tue Sep 17 02:20:47 2019 +0000 @@ -25,8 +25,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_MESSAGE_PRPL_H -#define _GGP_MESSAGE_PRPL_H + +#ifndef PURPLE_GG_MESSAGE_PRPL_H +#define PURPLE_GG_MESSAGE_PRPL_H #include <internal.h> #include <libgadu.h> @@ -45,4 +46,4 @@ int ggp_message_send_im(PurpleConnection *gc, PurpleMessage *msg); gchar * ggp_message_format_to_gg(PurpleConversation *conv, const gchar *text); -#endif /* _GGP_MESSAGE_PRPL_H */ +#endif /* PURPLE_GG_MESSAGE_PRPL_H */
--- a/libpurple/protocols/gg/multilogon.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/multilogon.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_MULTILOGON_H -#define _GGP_MULTILOGON_H +#ifndef PURPLE_GG_MULTILOGON_H +#define PURPLE_GG_MULTILOGON_H #include <internal.h> #include <libgadu.h> @@ -43,4 +43,4 @@ void ggp_multilogon_dialog(PurpleConnection *gc); -#endif /* _GGP_MULTILOGON_H */ +#endif /* PURPLE_GG_MULTILOGON_H */
--- a/libpurple/protocols/gg/pubdir-prpl.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/pubdir-prpl.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_PUBDIR_PROTOCOL_H -#define _GGP_PUBDIR_PROTOCOL_H +#ifndef PURPLE_GG_PUBDIR_PRPL_H +#define PURPLE_GG_PUBDIR_PRPL_H #include <internal.h> #include <libgadu.h> @@ -70,4 +70,4 @@ void ggp_pubdir_set_info(PurpleConnection *gc); -#endif /* _GGP_PUBDIR_PROTOCOL_H */ +#endif /* PURPLE_GG_PUBDIR_PRPL_H */
--- a/libpurple/protocols/gg/purplew.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/purplew.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_PURPLEW_H -#define _GGP_PURPLEW_H +#ifndef PURPLE_GG_PURPLEW_H +#define PURPLE_GG_PURPLEW_H #include <internal.h> #include <libgadu.h> @@ -73,4 +73,4 @@ /* you must g_free returned list */ GList * ggp_purplew_account_get_groups(PurpleAccount *account, gboolean exclusive); -#endif /* _GGP_PURPLEW_H */ +#endif /* PURPLE_GG_PURPLEW_H */
--- a/libpurple/protocols/gg/resolver-purple.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/resolver-purple.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,12 +27,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_RESOLVER_PURPLE_H -#define _GGP_RESOLVER_PURPLE_H +#ifndef PURPLE_GG_RESOLVER_PURPLE_H +#define PURPLE_GG_RESOLVER_PURPLE_H /** * Registers custom resolver for libgadu, that uses libpurple for DNS queries. */ void ggp_resolver_purple_setup(void); -#endif /* _GGP_RESOLVER_PURPLE_H */ +#endif /* PURPLE_GG_RESOLVER_PURPLE_H */
--- a/libpurple/protocols/gg/roster.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/roster.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_ROSTER_H -#define _GGP_ROSTER_H +#ifndef PURPLE_GG_ROSTER_H +#define PURPLE_GG_ROSTER_H #include <internal.h> #include <libgadu.h> @@ -70,4 +70,4 @@ void ggp_roster_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group); -#endif /* _GGP_ROSTER_H */ +#endif /* PURPLE_GG_ROSTER_H */
--- a/libpurple/protocols/gg/servconn.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/servconn.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_SERVCONN_H -#define _GGP_SERVCONN_H +#ifndef PURPLE_GG_SERVCONN_H +#define PURPLE_GG_SERVCONN_H #include <internal.h> #include <accountopt.h> @@ -40,4 +40,4 @@ GSList * ggp_servconn_get_servers(void); void ggp_servconn_remote_disconnect(PurpleConnection *gc); -#endif /* _GGP_SERVCONN_H */ +#endif /* PURPLE_GG_SERVCONN_H */
--- a/libpurple/protocols/gg/status.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/status.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_STATUS_H -#define _GGP_STATUS_H +#ifndef PURPLE_GG_STATUS_H +#define PURPLE_GG_STATUS_H #include <internal.h> #include <libgadu.h> @@ -62,4 +62,4 @@ void ggp_status_got_others(PurpleConnection *gc, struct gg_event *ev); char * ggp_status_buddy_text(PurpleBuddy *buddy); -#endif /* _GGP_STATUS_H */ +#endif /* PURPLE_GG_STATUS_H */
--- a/libpurple/protocols/gg/tcpsocket.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/tcpsocket.h Tue Sep 17 02:20:47 2019 +0000 @@ -25,8 +25,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_TCPSOCKET_H -#define _GGP_TCPSOCKET_H + +#ifndef PURPLE_GG_TCPSOCKET_H +#define PURPLE_GG_TCPSOCKET_H #include <internal.h> #include <libgadu.h> @@ -37,4 +38,4 @@ PurpleInputCondition ggp_tcpsocket_inputcond_gg_to_purple(enum gg_check_t check); -#endif /* _GGP_TCPSOCKET_H */ +#endif /* PURPLE_GG_TCPSOCKET_H */
--- a/libpurple/protocols/gg/utils.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/utils.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_UTILS_H -#define _GGP_UTILS_H +#ifndef PURPLE_GG_UTILS_H +#define PURPLE_GG_UTILS_H #include <internal.h> #include <libgadu.h> @@ -108,4 +108,4 @@ JsonParser * ggp_json_parse(const gchar *data); -#endif /* _GGP_UTILS_H */ +#endif /* PURPLE_GG_UTILS_H */
--- a/libpurple/protocols/gg/validator.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/validator.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_VALIDATOR_H -#define _GGP_VALIDATOR_H +#ifndef PURPLE_GG_VALIDATOR_H +#define PURPLE_GG_VALIDATOR_H #include <internal.h> #include <request.h> @@ -39,4 +39,4 @@ gboolean ggp_validator_password_equal(PurpleRequestField *field, gchar **errmsg, void *field2); -#endif /* _GGP_VALIDATOR_H */ +#endif /* PURPLE_GG_VALIDATOR_H */
--- a/libpurple/protocols/gg/xml.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/gg/xml.h Tue Sep 17 02:20:47 2019 +0000 @@ -27,8 +27,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _GGP_XML_H -#define _GGP_XML_H +#ifndef PURPLE_GG_XML_H +#define PURPLE_GG_XML_H #include <internal.h> #include <xmlnode.h> @@ -45,4 +45,4 @@ unsigned int ggp_xml_child_count(PurpleXmlNode *xml, const gchar *childName); -#endif /* _GGP_XML_H */ +#endif /* PURPLE_GG_XML_H */
--- a/libpurple/protocols/irc/irc.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/irc/irc.c Tue Sep 17 02:20:47 2019 +0000 @@ -63,10 +63,8 @@ PurpleProtocol *_irc_protocol = NULL; static gint -irc_uri_handler_match_server(gconstpointer a, gconstpointer b) +irc_uri_handler_match_server(PurpleAccount *account, const gchar *match_server) { - PurpleAccount *account = PURPLE_ACCOUNT(a); - const gchar *match_server = b; const gchar *protocol_id; const gchar *username; gchar *server; @@ -132,8 +130,8 @@ /* Find account with correct server */ accounts = purple_accounts_get_all(); - account_node = g_list_find_custom(accounts, server, - irc_uri_handler_match_server); + account_node = g_list_find_custom( + accounts, server, (GCompareFunc)irc_uri_handler_match_server); if (account_node == NULL) { purple_debug_warning("irc",
--- a/libpurple/protocols/irc/irc.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/irc/irc.h Tue Sep 17 02:20:47 2019 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PURPLE_IRC_H -#define _PURPLE_IRC_H +#ifndef PURPLE_IRC_IRC_H +#define PURPLE_IRC_IRC_H #include <glib.h> #include <gmodule.h> @@ -246,4 +246,5 @@ PurpleXfer *irc_dccsend_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who); void irc_dccsend_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file); void irc_dccsend_recv(struct irc_conn *irc, const char *from, const char *msg); -#endif /* _PURPLE_IRC_H */ + +#endif /* PURPLE_IRC_IRC_H */
--- a/libpurple/protocols/jabber/adhoccommands.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/adhoccommands.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef PURPLE_JABBER_ADHOCCOMMANDS_H_ -#define PURPLE_JABBER_ADHOCCOMMANDS_H_ +#ifndef PURPLE_JABBER_ADHOCCOMMANDS_H +#define PURPLE_JABBER_ADHOCCOMMANDS_H #include "jabber.h" @@ -42,4 +42,4 @@ void jabber_adhoc_init_server_commands(JabberStream *js, GList **m); -#endif /* PURPLE_JABBER_ADHOCCOMMANDS_H_ */ +#endif /* PURPLE_JABBER_ADHOCCOMMANDS_H */
--- a/libpurple/protocols/jabber/auth.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/auth.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_AUTH_H_ -#define PURPLE_JABBER_AUTH_H_ + +#ifndef PURPLE_JABBER_AUTH_H +#define PURPLE_JABBER_AUTH_H typedef struct _JabberSaslMech JabberSaslMech; @@ -65,4 +66,4 @@ void jabber_auth_init(void); void jabber_auth_uninit(void); -#endif /* PURPLE_JABBER_AUTH_H_ */ +#endif /* PURPLE_JABBER_AUTH_H */
--- a/libpurple/protocols/jabber/auth_digest_md5.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/auth_digest_md5.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_AUTH_DIGEST_MD5_H_ -#define PURPLE_JABBER_AUTH_DIGEST_MD5_H_ + +#ifndef PURPLE_JABBER_AUTH_DIGEST_MD5_H +#define PURPLE_JABBER_AUTH_DIGEST_MD5_H #include "internal.h" @@ -36,4 +37,4 @@ */ GHashTable *jabber_auth_digest_md5_parse(const char *challenge); -#endif /* PURPLE_JABBER_AUTH_DIGEST_MD5_H_ */ +#endif /* PURPLE_JABBER_AUTH_DIGEST_MD5_H */
--- a/libpurple/protocols/jabber/auth_scram.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/auth_scram.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_AUTH_SCRAM_H_ -#define PURPLE_JABBER_AUTH_SCRAM_H_ + +#ifndef PURPLE_JABBER_AUTH_SCRAM_H +#define PURPLE_JABBER_AUTH_SCRAM_H /* * Every function in this file is ONLY exposed for tests. @@ -91,4 +92,4 @@ */ void jabber_scram_data_destroy(JabberScramData *data); -#endif /* PURPLE_JABBER_AUTH_SCRAM_H_ */ +#endif /* PURPLE_JABBER_AUTH_SCRAM_H */
--- a/libpurple/protocols/jabber/bosh.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/bosh.h Tue Sep 17 02:20:47 2019 +0000 @@ -22,8 +22,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_BOSH_H_ -#define PURPLE_JABBER_BOSH_H_ + +#ifndef PURPLE_JABBER_BOSH_H +#define PURPLE_JABBER_BOSH_H typedef struct _PurpleJabberBOSHConnection PurpleJabberBOSHConnection; @@ -51,4 +52,4 @@ void jabber_bosh_connection_send_keepalive(PurpleJabberBOSHConnection *conn); -#endif /* PURPLE_JABBER_BOSH_H_ */ +#endif /* PURPLE_JABBER_BOSH_H */
--- a/libpurple/protocols/jabber/buddy.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/buddy.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_BUDDY_H_ -#define PURPLE_JABBER_BUDDY_H_ + +#ifndef PURPLE_JABBER_BUDDY_H +#define PURPLE_JABBER_BUDDY_H typedef struct _JabberBuddy JabberBuddy; @@ -124,4 +125,4 @@ jabber_resource_get_identity_category_type(const JabberBuddyResource *jbr, const gchar *category); -#endif /* PURPLE_JABBER_BUDDY_H_ */ +#endif /* PURPLE_JABBER_BUDDY_H */
--- a/libpurple/protocols/jabber/caps.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/caps.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef PURPLE_JABBER_CAPS_H_ -#define PURPLE_JABBER_CAPS_H_ +#ifndef PURPLE_JABBER_CAPS_H +#define PURPLE_JABBER_CAPS_H typedef struct _JabberCapsClientInfo JabberCapsClientInfo; @@ -127,4 +127,4 @@ */ JabberCapsClientInfo *jabber_caps_parse_client_info(PurpleXmlNode *query); -#endif /* PURPLE_JABBER_CAPS_H_ */ +#endif /* PURPLE_JABBER_CAPS_H */
--- a/libpurple/protocols/jabber/chat.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/chat.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_CHAT_H_ -#define PURPLE_JABBER_CHAT_H_ + +#ifndef PURPLE_JABBER_CHAT_H +#define PURPLE_JABBER_CHAT_H #include "internal.h" #include "connection.h" @@ -115,4 +116,4 @@ const gchar *cap); guint jabber_chat_get_num_participants(const JabberChat *chat); -#endif /* PURPLE_JABBER_CHAT_H_ */ +#endif /* PURPLE_JABBER_CHAT_H */
--- a/libpurple/protocols/jabber/disco.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/disco.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_DISCO_H_ -#define PURPLE_JABBER_DISCO_H_ + +#ifndef PURPLE_JABBER_DISCO_H +#define PURPLE_JABBER_DISCO_H #include "jabber.h" @@ -48,4 +49,4 @@ void jabber_disco_info_do(JabberStream *js, const char *who, JabberDiscoInfoCallback *callback, gpointer data); -#endif /* PURPLE_JABBER_DISCO_H_ */ +#endif /* PURPLE_JABBER_DISCO_H */
--- a/libpurple/protocols/jabber/gtalk.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/gtalk.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ -#ifndef _GTALK_H_ -#define _GTALK_H_ + +#ifndef PURPLE_JABBER_GTALK_H +#define PURPLE_JABBER_GTALK_H #include "jabber.h" @@ -51,4 +52,4 @@ */ G_MODULE_EXPORT GType gtalk_protocol_get_type(void); -#endif /* _GTALK_H_ */ +#endif /* PURPLE_JABBER_GTALK_H */
--- a/libpurple/protocols/jabber/ibb.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/ibb.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef PURPLE_JABBER_IBB_H_ -#define PURPLE_JABBER_IBB_H_ +#ifndef PURPLE_JABBER_IBB_H +#define PURPLE_JABBER_IBB_H #include "jabber.h" #include "iq.h" @@ -127,4 +127,4 @@ void jabber_ibb_init(void); void jabber_ibb_uninit(void); -#endif /* PURPLE_JABBER_IBB_H_ */ +#endif /* PURPLE_JABBER_IBB_H */
--- a/libpurple/protocols/jabber/iq.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/iq.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_IQ_H_ -#define PURPLE_JABBER_IQ_H_ + +#ifndef PURPLE_JABBER_IQ_H +#define PURPLE_JABBER_IQ_H typedef enum { JABBER_IQ_SET, @@ -115,4 +116,4 @@ void jabber_iq_signal_register(const gchar *node, const gchar *xmlns); void jabber_iq_signal_unregister(const gchar *node, const gchar *xmlns); -#endif /* PURPLE_JABBER_IQ_H_ */ +#endif /* PURPLE_JABBER_IQ_H */
--- a/libpurple/protocols/jabber/jabber.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/jabber.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_H_ -#define PURPLE_JABBER_H_ + +#ifndef PURPLE_JABBER_JABBER_H +#define PURPLE_JABBER_JABBER_H typedef enum { JABBER_CAP_NONE = 0, @@ -429,4 +430,4 @@ PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who); gboolean jabber_can_receive_file(PurpleProtocolXfer *xfer, PurpleConnection *gc, const gchar *who); -#endif /* PURPLE_JABBER_H_ */ +#endif /* PURPLE_JABBER_JABBER_H */
--- a/libpurple/protocols/jabber/jutil.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/jutil.c Tue Sep 17 02:20:47 2019 +0000 @@ -601,8 +601,9 @@ static char buf[3072]; /* maximum legal length of a jabber jid */ JabberID *jid; - if (account) - gc = purple_account_get_connection(account); + if (account) { + gc = purple_account_get_connection((PurpleAccount *)account); + } if (gc) js = purple_connection_get_protocol_data(gc);
--- a/libpurple/protocols/jabber/jutil.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/jutil.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_JUTIL_H_ -#define PURPLE_JABBER_JUTIL_H_ + +#ifndef PURPLE_JABBER_JUTIL_H +#define PURPLE_JABBER_JUTIL_H typedef struct { char *node; @@ -94,4 +95,4 @@ /* show attr (presence stanza) -> state */ JabberBuddyState jabber_buddy_show_get_state(const char *id); -#endif /* PURPLE_JABBER_JUTIL_H_ */ +#endif /* PURPLE_JABBER_JUTIL_H */
--- a/libpurple/protocols/jabber/message.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/message.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_MESSAGE_H_ -#define PURPLE_JABBER_MESSAGE_H_ + +#ifndef PURPLE_JABBER_MESSAGE_H +#define PURPLE_JABBER_MESSAGE_H #include "buddy.h" #include "jabber.h" @@ -78,4 +79,4 @@ gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *namespace); -#endif /* PURPLE_JABBER_MESSAGE_H_ */ +#endif /* PURPLE_JABBER_MESSAGE_H */
--- a/libpurple/protocols/jabber/namespaces.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/namespaces.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef PURPLE_JABBER_NAMESPACES_H_ -#define PURPLE_JABBER_NAMESPACES_H_ +#ifndef PURPLE_JABBER_NAMESPACES_H +#define PURPLE_JABBER_NAMESPACES_H #define NS_XMPP_BIND "urn:ietf:params:xml:ns:xmpp-bind" #define NS_XMPP_CLIENT "jabber:client" @@ -114,4 +114,4 @@ /* Apple extension(s) */ #define NS_APPLE_IDLE "http://www.apple.com/xmpp/idle" -#endif /* PURPLE_JABBER_NAMESPACES_H_ */ +#endif /* PURPLE_JABBER_NAMESPACES_H */
--- a/libpurple/protocols/jabber/oob.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/oob.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_OOB_H_ -#define PURPLE_JABBER_OOB_H_ + +#ifndef PURPLE_JABBER_OOB_H +#define PURPLE_JABBER_OOB_H #include "jabber.h" @@ -38,4 +39,4 @@ G_END_DECLS -#endif /* PURPLE_JABBER_OOB_H_ */ +#endif /* PURPLE_JABBER_OOB_H */
--- a/libpurple/protocols/jabber/parser.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/parser.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_PARSER_H_ -#define PURPLE_JABBER_PARSER_H_ + +#ifndef PURPLE_JABBER_PARSER_H +#define PURPLE_JABBER_PARSER_H #include "jabber.h" @@ -30,4 +31,4 @@ void jabber_parser_free(JabberStream *js); void jabber_parser_process(JabberStream *js, const char *buf, int len); -#endif /* PURPLE_JABBER_PARSER_H_ */ +#endif /* PURPLE_JABBER_PARSER_H */
--- a/libpurple/protocols/jabber/pep.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/pep.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef PURPLE_JABBER_PEP_H_ -#define PURPLE_JABBER_PEP_H_ +#ifndef PURPLE_JABBER_PEP_H +#define PURPLE_JABBER_PEP_H #include "jabber.h" #include "message.h" @@ -88,4 +88,4 @@ */ void jabber_pep_publish(JabberStream *js, PurpleXmlNode *publish); -#endif /* PURPLE_JABBER_PEP_H_ */ +#endif /* PURPLE_JABBER_PEP_H */
--- a/libpurple/protocols/jabber/ping.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/ping.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_PING_H_ -#define PURPLE_JABBER_PING_H_ + +#ifndef PURPLE_JABBER_PING_H +#define PURPLE_JABBER_PING_H #include "jabber.h" #include "iq.h" @@ -33,4 +34,4 @@ gboolean jabber_ping_jid(JabberStream *js, const char *jid); void jabber_keepalive_ping(JabberStream *js); -#endif /* PURPLE_JABBER_PING_H_ */ +#endif /* PURPLE_JABBER_PING_H */
--- a/libpurple/protocols/jabber/presence.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/presence.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_PRESENCE_H_ -#define PURPLE_JABBER_PRESENCE_H_ + +#ifndef PURPLE_JABBER_PRESENCE_H +#define PURPLE_JABBER_PRESENCE_H typedef enum { JABBER_PRESENCE_ERROR = -2, @@ -100,4 +101,4 @@ void jabber_presence_fake_to_self(JabberStream *js, PurpleStatus *status); void purple_status_to_jabber(PurpleStatus *status, JabberBuddyState *state, char **msg, int *priority); -#endif /* PURPLE_JABBER_PRESENCE_H_ */ +#endif /* PURPLE_JABBER_PRESENCE_H */
--- a/libpurple/protocols/jabber/roster.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/roster.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_ROSTER_H_ -#define PURPLE_JABBER_ROSTER_H_ + +#ifndef PURPLE_JABBER_ROSTER_H +#define PURPLE_JABBER_ROSTER_H /* it must *not* be localized */ #define JABBER_ROSTER_DEFAULT_GROUP "Buddies" @@ -48,4 +49,4 @@ const gchar * jabber_roster_group_get_global_name(PurpleGroup *group); -#endif /* PURPLE_JABBER_ROSTER_H_ */ +#endif /* PURPLE_JABBER_ROSTER_H */
--- a/libpurple/protocols/jabber/si.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/si.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_SI_H_ -#define PURPLE_JABBER_SI_H_ + +#ifndef PURPLE_JABBER_SI_H +#define PURPLE_JABBER_SI_H #include "xfer.h" @@ -47,4 +48,4 @@ G_END_DECLS -#endif /* PURPLE_JABBER_SI_H_ */ +#endif /* PURPLE_JABBER_SI_H */
--- a/libpurple/protocols/jabber/useravatar.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/useravatar.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef _PURPLE_JABBER_USERAVATAR_H_ -#define _PURPLE_JABBER_USERAVATAR_H_ +#ifndef PURPLE_JABBER_USERAVATAR_H +#define PURPLE_JABBER_USERAVATAR_H #include "jabber.h" #include "image.h" @@ -34,4 +34,4 @@ void jabber_avatar_fetch_mine(JabberStream *js); -#endif /* _PURPLE_JABBER_USERAVATAR_H_ */ +#endif /* PURPLE_JABBER_USERAVATAR_H */
--- a/libpurple/protocols/jabber/usermood.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/usermood.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef PURPLE_JABBER_USERMOOD_H_ -#define PURPLE_JABBER_USERMOOD_H_ +#ifndef PURPLE_JABBER_USERMOOD_H +#define PURPLE_JABBER_USERMOOD_H #include "jabber.h" @@ -47,4 +47,4 @@ PurpleMood *jabber_get_moods(PurpleAccount *account); -#endif /* PURPLE_JABBER_USERMOOD_H_ */ +#endif /* PURPLE_JABBER_USERMOOD_H */
--- a/libpurple/protocols/jabber/usernick.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/usernick.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef PURPLE_JABBER_USERNICK_H_ -#define PURPLE_JABBER_USERNICK_H_ +#ifndef PURPLE_JABBER_USERNICK_H +#define PURPLE_JABBER_USERNICK_H #include "jabber.h" @@ -31,4 +31,4 @@ void jabber_nick_init(void); void jabber_nick_init_action(GList **m); -#endif /* PURPLE_JABBER_USERNICK_H_ */ +#endif /* PURPLE_JABBER_USERNICK_H */
--- a/libpurple/protocols/jabber/usertune.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/usertune.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef PURPLE_JABBER_USERTUNE_H_ -#define PURPLE_JABBER_USERTUNE_H_ +#ifndef PURPLE_JABBER_USERTUNE_H +#define PURPLE_JABBER_USERTUNE_H #include "jabber.h" @@ -42,4 +42,4 @@ void jabber_tune_set(PurpleConnection *gc, const PurpleJabberTuneInfo *tuneinfo); -#endif /* PURPLE_JABBER_USERTUNE_H_ */ +#endif /* PURPLE_JABBER_USERTUNE_H */
--- a/libpurple/protocols/jabber/xdata.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/xdata.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef PURPLE_JABBER_XDATA_H_ -#define PURPLE_JABBER_XDATA_H_ + +#ifndef PURPLE_JABBER_XDATA_H +#define PURPLE_JABBER_XDATA_H #include "jabber.h" #include "xmlnode.h" @@ -52,4 +53,4 @@ */ gchar *jabber_x_data_get_formtype(const PurpleXmlNode *form); -#endif /* PURPLE_JABBER_XDATA_H_ */ +#endif /* PURPLE_JABBER_XDATA_H */
--- a/libpurple/protocols/jabber/xmpp.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/jabber/xmpp.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ -#ifndef _XMPP_H_ -#define _XMPP_H_ + +#ifndef PURPLE_JABBER_XMPP_H +#define PURPLE_JABBER_XMPP_H #include "jabber.h" @@ -51,4 +52,4 @@ */ G_MODULE_EXPORT GType xmpp_protocol_get_type(void); -#endif /* _XMPP_H_ */ +#endif /* PURPLE_JABBER_XMPP_H */
--- a/libpurple/protocols/novell/nmconference.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmconference.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef __NM_CONFERENCE_H__ -#define __NM_CONFERENCE_H__ +#ifndef PURPLE_NOVELL_NMCONFERENCE_H +#define PURPLE_NOVELL_NMCONFERENCE_H typedef struct _NMConference NMConference; @@ -164,4 +164,4 @@ */ gpointer nm_conference_get_data(NMConference * conference); -#endif +#endif /* PURPLE_NOVELL_NMCONFERENCE_H */
--- a/libpurple/protocols/novell/nmconn.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmconn.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef __NM_CONN_H__ -#define __NM_CONN_H__ +#ifndef PURPLE_NOVELL_NMCONN_H +#define PURPLE_NOVELL_NMCONN_H typedef struct _NMConn NMConn; typedef struct _NMSSLConn NMSSLConn; @@ -243,4 +243,4 @@ */ int nm_conn_get_port(NMConn * conn); -#endif +#endif /* PURPLE_NOVELL_NMCONN_H */
--- a/libpurple/protocols/novell/nmcontact.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmcontact.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef __NM_CONTACT_H__ -#define __NM_CONTACT_H__ +#ifndef PURPLE_NOVELL_NMCONTACT_H +#define PURPLE_NOVELL_NMCONTACT_H #include <glib.h> @@ -422,4 +422,4 @@ */ NMField *nm_folder_to_fields(NMFolder * folder); -#endif +#endif /* PURPLE_NOVELL_NMCONTACT_H */
--- a/libpurple/protocols/novell/nmevent.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmevent.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef __NM_EVENT_H__ -#define __NM_EVENT_H__ +#ifndef PURPLE_NOVELL_NMEVENT_H +#define PURPLE_NOVELL_NMEVENT_H typedef struct _NMEvent NMEvent; @@ -175,4 +175,4 @@ */ time_t nm_event_get_gmt(NMEvent * event); -#endif +#endif /* PURPLE_NOVELL_NMEVENT_H */
--- a/libpurple/protocols/novell/nmfield.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmfield.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef NMFIELD_H -#define NMFIELD_H +#ifndef PURPLE_NOVELL_NMFIELD_H +#define PURPLE_NOVELL_NMFIELD_H #include <glib.h> @@ -221,4 +221,4 @@ /* Print a field array (for debugging purposes) */ void nm_print_fields(NMField * fields); -#endif +#endif /* PURPLE_NOVELL_NMFIELD_H */
--- a/libpurple/protocols/novell/nmmessage.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmmessage.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef __NM_MESSAGE_H__ -#define __NM_MESSAGE_H__ +#ifndef PURPLE_NOVELL_NMMESSAGE_H +#define PURPLE_NOVELL_NMMESSAGE_H typedef struct _NMMessage NMMessage; @@ -80,4 +80,4 @@ */ NMConference *nm_message_get_conference(NMMessage * msg); -#endif +#endif /* PURPLE_NOVELL_NMMESSAGE_H */
--- a/libpurple/protocols/novell/nmrequest.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmrequest.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef __NM_REQUEST_H__ -#define __NM_REQUEST_H__ +#ifndef PURPLE_NOVELL_NMREQUEST_H +#define PURPLE_NOVELL_NMREQUEST_H typedef struct _NMRequest NMRequest; @@ -147,4 +147,4 @@ */ NMERR_T nm_request_get_ret_code(NMRequest * req); -#endif +#endif /* PURPLE_NOVELL_NMREQUEST_H */
--- a/libpurple/protocols/novell/nmrtf.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmrtf.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef __NMRTF_H__ -#define __NMRTF_H__ +#ifndef PURPLE_NOVELL_NMRTF_H +#define PURPLE_NOVELL_NMRTF_H typedef struct _NMRtfContext NMRtfContext; @@ -27,4 +27,4 @@ char *nm_rtf_strip_formatting(NMRtfContext *ctx, const char *input); void nm_rtf_deinit(NMRtfContext *ctx); -#endif +#endif /* PURPLE_NOVELL_NMRTF_H */
--- a/libpurple/protocols/novell/nmuser.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmuser.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef __NM_USER_H__ -#define __NM_USER_H__ +#ifndef PURPLE_NOVELL_NMUSER_H +#define PURPLE_NOVELL_NMUSER_H #include <glib.h> #include <stdio.h> @@ -677,4 +677,4 @@ */ const char *nm_error_to_string (NMERR_T err); -#endif +#endif /* PURPLE_NOVELL_NMUSER_H */
--- a/libpurple/protocols/novell/nmuserrecord.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/nmuserrecord.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * */ -#ifndef __NM_USER_RECORD_H__ -#define __NM_USER_RECORD_H__ +#ifndef PURPLE_NOVELL_NMUSERRECORD_H +#define PURPLE_NOVELL_NMUSERRECORD_H #include <glib.h> @@ -270,4 +270,4 @@ */ void nm_user_record_copy(NMUserRecord * dest, NMUserRecord * src); -#endif +#endif /* PURPLE_NOVELL_NMUSERRECORD_H */
--- a/libpurple/protocols/novell/novell.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/novell/novell.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ -#ifndef _NOVELL_H_ -#define _NOVELL_H_ + +#ifndef PURPLE_NOVELL_NOVELL_H +#define PURPLE_NOVELL_NOVELL_H #include <gmodule.h> @@ -48,4 +49,4 @@ */ G_MODULE_EXPORT GType novell_protocol_get_type(void); -#endif /* _NOVELL_H_ */ +#endif /* PURPLE_NOVELL_NOVELL_H */
--- a/libpurple/protocols/null/nullprpl.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/null/nullprpl.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ -#ifndef _NULL_H_ -#define _NULL_H_ + +#ifndef PURPLE_NULL_NULLPRPL_H +#define PURPLE_NULL_NULLPRPL_H #include "protocol.h" @@ -46,4 +47,4 @@ */ G_MODULE_EXPORT GType null_protocol_get_type(void); -#endif /* _NULL_H_ */ +#endif /* PURPLE_NULL_NULLPRPL_H */
--- a/libpurple/protocols/oscar/aim.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/aim.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ -#ifndef _AIM_H_ -#define _AIM_H_ + +#ifndef PURPLE_OSCAR_AIM_H +#define PURPLE_OSCAR_AIM_H #include "oscar.h" @@ -51,4 +52,4 @@ */ G_MODULE_EXPORT GType aim_protocol_get_type(void); -#endif /* _AIM_H_ */ +#endif /* PURPLE_OSCAR_AIM_H */
--- a/libpurple/protocols/oscar/encoding.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/encoding.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _ENCODING_H_ -#define _ENCODING_H_ +#ifndef PURPLE_OSCAR_ENCODING_H +#define PURPLE_OSCAR_ENCODING_H #include "oscar.h" #include "oscarcommon.h" @@ -43,4 +43,4 @@ */ gchar * oscar_encode_im(const gchar *msg, gsize *result_len, guint16 *charset, gchar **charsetstr); -#endif \ No newline at end of file +#endif /* PURPLE_OSCAR_ENCODING_H */
--- a/libpurple/protocols/oscar/icq.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/icq.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ -#ifndef _ICQ_H_ -#define _ICQ_H_ + +#ifndef PURPLE_OSCAR_ICQ_H +#define PURPLE_OSCAR_ICQ_H #include "oscar.h" @@ -51,4 +52,4 @@ */ G_MODULE_EXPORT GType icq_protocol_get_type(void); -#endif /* _ICQ_H_ */ +#endif /* PURPLE_OSCAR_ICQ_H */
--- a/libpurple/protocols/oscar/odc.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/odc.c Tue Sep 17 02:20:47 2019 +0000 @@ -595,8 +595,8 @@ PurpleAccount *account; PurpleIMConversation *im; - size1 = purple_str_size_to_units(frame->payload.len); - size2 = purple_str_size_to_units(DIRECTIM_MAX_FILESIZE); + size1 = g_format_size(frame->payload.len); + size2 = g_format_size(DIRECTIM_MAX_FILESIZE); tmp = g_strdup_printf(_("%s tried to send you a %s file, but we only allow files up to %s over Direct IM. Try using file transfer instead.\n"), conn->bn, size1, size2); g_free(size1); g_free(size2);
--- a/libpurple/protocols/oscar/oft.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/oft.c Tue Sep 17 02:20:47 2019 +0000 @@ -661,8 +661,8 @@ if (size > G_MAXUINT32) { gchar *tmp, *size1, *size2; - size1 = purple_str_size_to_units(size); - size2 = purple_str_size_to_units(G_MAXUINT32); + size1 = g_format_size(size); + size2 = g_format_size(G_MAXUINT32); tmp = g_strdup_printf(_("File %s is %s, which is larger than " "the maximum size of %s."), purple_xfer_get_local_filename(xfer), size1, size2);
--- a/libpurple/protocols/oscar/oscar.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/oscar.h Tue Sep 17 02:20:47 2019 +0000 @@ -26,8 +26,8 @@ * */ -#ifndef _OSCAR_H_ -#define _OSCAR_H_ +#ifndef PURPLE_OSCAR_OSCAR_H +#define PURPLE_OSCAR_OSCAR_H #include "internal.h" #include "circularbuffer.h" @@ -1375,4 +1375,4 @@ G_END_DECLS -#endif /* _OSCAR_H_ */ +#endif /* PURPLE_OSCAR_OSCAR_H */
--- a/libpurple/protocols/oscar/oscarcommon.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/oscarcommon.h Tue Sep 17 02:20:47 2019 +0000 @@ -24,6 +24,9 @@ * and libicq.c */ +#ifndef PURPLE_OSCAR_OSCARCOMMON_H +#define PURPLE_OSCAR_OSCARCOMMON_H + #include "internal.h" #include "accountopt.h" @@ -124,3 +127,5 @@ GList *oscar_get_actions(PurpleConnection *gc); const gchar *oscar_get_login_server(gboolean is_icq, gboolean use_ssl); gboolean oscar_uri_handler(const char *proto, const char *cmd, GHashTable *params); + +#endif /* PURPLE_OSCAR_OSCARCOMMON_H */
--- a/libpurple/protocols/oscar/peer.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/peer.h Tue Sep 17 02:20:47 2019 +0000 @@ -22,8 +22,8 @@ * OFT and ODC Services */ -#ifndef _PEER_H_ -#define _PEER_H_ +#ifndef PURPLE_OSCAR_PEER_H +#define PURPLE_OSCAR_PEER_H #include "xfer.h" #include "network.h" @@ -292,4 +292,4 @@ void oscar_xfer_register(GTypeModule *module); PeerConnection *oscar_xfer_get_peer_connection(OscarXfer *xfer); -#endif /* _PEER_H_ */ +#endif /* PURPLE_OSCAR_PEER_H */
--- a/libpurple/protocols/oscar/snactypes.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/snactypes.h Tue Sep 17 02:20:47 2019 +0000 @@ -22,8 +22,9 @@ * AIM Callback Types * */ -#ifndef _SNACTYPES_H_ -#define _SNACTYPES_H_ + +#ifndef PURPLE_OSCAR_SNACTYPES_H +#define PURPLE_OSCAR_SNACTYPES_H /* * SNAC Families. @@ -284,4 +285,4 @@ /* SNAC flags */ #define AIM_SNACFLAGS_DESTRUCTOR 0x0001 -#endif /* _SNACTYPES_H_ */ +#endif /* PURPLE_OSCAR_SNACTYPES_H */
--- a/libpurple/protocols/oscar/visibility.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/oscar/visibility.h Tue Sep 17 02:20:47 2019 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _VISIBILITY_H_ -#define _VISIBILITY_H_ +#ifndef PURPLE_OSCAR_VISIBILITY_H +#define PURPLE_OSCAR_VISIBILITY_H #include "oscar.h" #include "plugins.h" @@ -29,4 +29,4 @@ void oscar_show_visible_list(PurpleProtocolAction *action); void oscar_show_invisible_list(PurpleProtocolAction *action); -#endif +#endif /* PURPLE_OSCAR_VISIBILITY_H */
--- a/libpurple/protocols/sametime/im_mime.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/sametime/im_mime.h Tue Sep 17 02:20:47 2019 +0000 @@ -21,8 +21,8 @@ * */ -#ifndef SAMETIME_IM_MIME_H -#define SAMETIME_IM_MIME_H +#ifndef PURPLE_SAMETIME_IM_MIME_H +#define PURPLE_SAMETIME_IM_MIME_H #include <glib.h> @@ -36,4 +36,4 @@ */ gchar *im_mime_generate(const char *message); -#endif /* SAMETIME_IM_MIME_H */ +#endif /* PURPLE_SAMETIME_IM_MIME_H */
--- a/libpurple/protocols/sametime/sametime.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/sametime/sametime.h Tue Sep 17 02:20:47 2019 +0000 @@ -1,5 +1,5 @@ -#ifndef _SAMETIME_H_ -#define _SAMETIME_H_ +#ifndef PURPLE_SAMETIME_SAMETIME_H +#define PURPLE_SAMETIME_SAMETIME_H #include <gmodule.h> @@ -52,4 +52,4 @@ */ G_MODULE_EXPORT GType mw_protocol_get_type(void); -#endif /* _SAMETIME_H_ */ +#endif /* PURPLE_SAMETIME_SAMETIME_H */
--- a/libpurple/protocols/silc/silcpurple.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/silc/silcpurple.h Tue Sep 17 02:20:47 2019 +0000 @@ -17,8 +17,8 @@ */ -#ifndef SILCPURPLE_H -#define SILCPURPLE_H +#ifndef PURPLE_SILC_SILCPURPLE_H +#define PURPLE_SILC_SILCPURPLE_H #include <gmodule.h> @@ -193,4 +193,4 @@ int geteuid(void); #endif -#endif /* SILCPURPLE_H */ +#endif /* PURPLE_SILC_SILCPURPLE_H */
--- a/libpurple/protocols/silc/wb.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/silc/wb.h Tue Sep 17 02:20:47 2019 +0000 @@ -17,8 +17,8 @@ */ -#ifndef SILCPURPLE_WB_H -#define SILCPURPLE_WB_H +#ifndef PURPLE_SILC_WB_H +#define PURPLE_SILC_WB_H #include "silcpurple.h" #include "whiteboard.h" @@ -46,4 +46,4 @@ void silcpurple_wb_send(PurpleWhiteboard *wb, GList *draw_list); void silcpurple_wb_clear(PurpleWhiteboard *wb); -#endif /* SILCPURPLE_WB_H */ +#endif /* PURPLE_SILC_WB_H */
--- a/libpurple/protocols/simple/ntlm.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/simple/ntlm.h Tue Sep 17 02:20:47 2019 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PURPLE_NTLM_H -#define _PURPLE_NTLM_H +#ifndef PURPLE_SIMPLE_NTLM_H +#define PURPLE_SIMPLE_NTLM_H G_BEGIN_DECLS @@ -55,4 +55,4 @@ G_END_DECLS -#endif /* _PURPLE_NTLM_H */ +#endif /* PURPLE_SIMPLE_NTLM_H */
--- a/libpurple/protocols/simple/simple.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/simple/simple.c Tue Sep 17 02:20:47 2019 +0000 @@ -67,9 +67,9 @@ } static gint -simple_uri_handler_find_account(gconstpointer a, gconstpointer b) +simple_uri_handler_find_account(PurpleAccount *account, + G_GNUC_UNUSED gconstpointer data) { - PurpleAccount *account = PURPLE_ACCOUNT(a); const gchar *protocol_id; protocol_id = purple_account_get_protocol_id(account); @@ -104,8 +104,8 @@ /* Find online SIMPLE account */ accounts = purple_accounts_get_all(); - account_node = g_list_find_custom(accounts, NULL, - simple_uri_handler_find_account); + account_node = g_list_find_custom( + accounts, NULL, (GCompareFunc)simple_uri_handler_find_account); if (account_node == NULL) { return FALSE;
--- a/libpurple/protocols/simple/simple.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/simple/simple.h Tue Sep 17 02:20:47 2019 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PURPLE_SIMPLE_H -#define _PURPLE_SIMPLE_H +#ifndef PURPLE_SIMPLE_SIMPLE_H +#define PURPLE_SIMPLE_SIMPLE_H #include <glib.h> #include <gmodule.h> @@ -154,4 +154,4 @@ G_MODULE_EXPORT GType simple_protocol_get_type(void); -#endif /* _PURPLE_SIMPLE_H */ +#endif /* PURPLE_SIMPLE_SIMPLE_H */
--- a/libpurple/protocols/simple/sipmsg.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/simple/sipmsg.h Tue Sep 17 02:20:47 2019 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PURPLE_SIPMSG_H -#define _PURPLE_SIPMSG_H +#ifndef PURPLE_SIMPLE_SIPMSG_H +#define PURPLE_SIMPLE_SIPMSG_H #include <glib.h> @@ -47,4 +47,5 @@ void sipmsg_remove_header(struct sipmsg *msg, const gchar *name); void sipmsg_print(const struct sipmsg *msg); char *sipmsg_to_string(const struct sipmsg *msg); -#endif /* _PURPLE_SIMPLE_H */ + +#endif /* PURPLE_SIMPLE_SIPMSG_H */
--- a/libpurple/protocols/zephyr/ZCkIfNot.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/ZCkIfNot.c Tue Sep 17 02:20:47 2019 +0000 @@ -13,7 +13,7 @@ Code_t ZCheckIfNotice(notice, from, predicate, args) ZNotice_t *notice; struct sockaddr_in *from; - register int (*predicate) __P((ZNotice_t *, void *)); + register int (*predicate)(ZNotice_t *, void *); void *args; { ZNotice_t tmpnotice;
--- a/libpurple/protocols/zephyr/ZGetLocs.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/ZGetLocs.c Tue Sep 17 02:20:47 2019 +0000 @@ -10,28 +10,30 @@ #include "internal.h" -#define min(a,b) ((a)<(b)?(a):(b)) - /* Prototype for -Wmissing-prototypes */ Code_t ZGetLocations(ZLocations_t *location, int *numlocs); Code_t ZGetLocations(ZLocations_t *location, int *numlocs) { - int i; + int i; - if (!__locate_list) - return (ZERR_NOLOCATIONS); + if (!__locate_list) { + return (ZERR_NOLOCATIONS); + } - if (__locate_next == __locate_num) - return (ZERR_NOMORELOCS); + if (__locate_next == __locate_num) { + return (ZERR_NOMORELOCS); + } - for (i=0;i<min(*numlocs, __locate_num-__locate_next);i++) - location[i] = __locate_list[i+__locate_next]; + for (i = 0; i < MIN(*numlocs, __locate_num - __locate_next); i++) { + location[i] = __locate_list[i + __locate_next]; + } - if (__locate_num-__locate_next < *numlocs) - *numlocs = __locate_num-__locate_next; + if (__locate_num - __locate_next < *numlocs) { + *numlocs = __locate_num - __locate_next; + } - __locate_next += *numlocs; + __locate_next += *numlocs; - return (ZERR_NONE); + return ZERR_NONE; }
--- a/libpurple/protocols/zephyr/ZGetSubs.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/ZGetSubs.c Tue Sep 17 02:20:47 2019 +0000 @@ -10,28 +10,31 @@ #include "internal.h" -#define min(a,b) ((a)<(b)?(a):(b)) - /* Prototype for -Wmissing-prototypes */ Code_t ZGetSubscriptions(ZSubscription_t *subscription, int *numsubs); Code_t ZGetSubscriptions(ZSubscription_t *subscription, int *numsubs) { - int i; + int i; - if (!__subscriptions_list) - return (ZERR_NOSUBSCRIPTIONS); + if (!__subscriptions_list) { + return (ZERR_NOSUBSCRIPTIONS); + } - if (__subscriptions_next == __subscriptions_num) - return (ZERR_NOMORESUBSCRIPTIONS); + if (__subscriptions_next == __subscriptions_num) { + return (ZERR_NOMORESUBSCRIPTIONS); + } - for (i=0;i<min(*numsubs, __subscriptions_num-__subscriptions_next);i++) - subscription[i] = __subscriptions_list[i+__subscriptions_next]; + for (i = 0; i < MIN(*numsubs, __subscriptions_num - __subscriptions_next); + i++) { + subscription[i] = __subscriptions_list[i + __subscriptions_next]; + } - if (__subscriptions_num-__subscriptions_next < *numsubs) - *numsubs = __subscriptions_num-__subscriptions_next; + if (__subscriptions_num - __subscriptions_next < *numsubs) { + *numsubs = __subscriptions_num - __subscriptions_next; + } - __subscriptions_next += *numsubs; + __subscriptions_next += *numsubs; - return (ZERR_NONE); + return ZERR_NONE; }
--- a/libpurple/protocols/zephyr/ZIfNotice.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/ZIfNotice.c Tue Sep 17 02:20:47 2019 +0000 @@ -13,7 +13,7 @@ Code_t ZIfNotice(notice, from, predicate, args) ZNotice_t *notice; struct sockaddr_in *from; - int (*predicate) __P((ZNotice_t *, void *)); + int (*predicate)(ZNotice_t *, void *); void *args; { ZNotice_t tmpnotice;
--- a/libpurple/protocols/zephyr/ZRetSubs.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/ZRetSubs.c Tue Sep 17 02:20:47 2019 +0000 @@ -14,14 +14,7 @@ static Code_t Z_RetSubs(ZNotice_t *notice, int *nsubs, Z_AuthProc auth_routine); -/* Need STDC definition when possible for unsigned short argument. */ -#ifdef __STDC__ Code_t ZRetrieveSubscriptions(unsigned short port, int *nsubs) -#else -Code_t ZRetrieveSubscriptions(port,nsubs) - unsigned short port; - int *nsubs; -#endif { int retval; ZNotice_t notice;
--- a/libpurple/protocols/zephyr/ZSubs.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/ZSubs.c Tue Sep 17 02:20:47 2019 +0000 @@ -11,11 +11,10 @@ #include "internal.h" -static Code_t Z_Subscriptions __P((register ZSubscription_t *sublist, - int nitems, unsigned int port, - char *opcode, int authit)); -static Code_t subscr_sendoff __P((ZNotice_t *notice, char **lyst, int num, - int authit)); +static Code_t Z_Subscriptions(register ZSubscription_t *sublist, int nitems, + unsigned int port, char *opcode, int authit); +static Code_t subscr_sendoff(ZNotice_t *notice, char **lyst, int num, + int authit); Code_t ZSubscribeTo(sublist, nitems, port) ZSubscription_t *sublist;
--- a/libpurple/protocols/zephyr/ZVariables.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/ZVariables.c Tue Sep 17 02:20:47 2019 +0000 @@ -18,14 +18,15 @@ #include <pwd.h> #endif -static char *get_localvarfile __P((void)); -static char *get_varval __P((char *fn, char *val)); -static int varline __P((char *bfr, char *var)); +static char *get_localvarfile(void); +static const gchar *get_varval(const gchar *fn, const gchar *val); +static int varline(const gchar *bfr, const gchar *var); -char *ZGetVariable(var) - char *var; +const gchar * +ZGetVariable(const gchar *var) { - char *varfile, *ret; + gchar *varfile; + const gchar *ret; if ((varfile = get_localvarfile()) == NULL) return ((char *)0); @@ -162,12 +163,11 @@ return g_strconcat(base, "/.zephyr.vars", NULL); } -static char *get_varval(fn, var) - char *fn; - char *var; +static const gchar * +get_varval(const gchar *fn, const gchar *var) { FILE *fp; - static char varbfr[512]; + static gchar varbfr[512]; int i; fp = fopen(fn, "r"); @@ -188,34 +188,35 @@ /* If the variable in the line bfr[] is the same as var, return index to the variable value, else return 0. */ -static int varline(bfr, var) - char *bfr; - char *var; +static int +varline(const gchar *bfr, const gchar *var) { - register char *cp; - + register const gchar *cp; - if (!bfr[0] || bfr[0] == '#') /* comment or null line */ - return (0); + if (!bfr[0] || bfr[0] == '#') { + /* comment or null line */ + return (0); + } - cp = bfr; - while (*cp && !isspace(*cp) && (*cp != '=')) - cp++; + cp = bfr; + while (*cp && !isspace(*cp) && (*cp != '=')) { + cp++; + } -#ifndef WIN32 -#define max(a,b) ((a > b) ? (a) : (b)) -#endif - - if (g_ascii_strncasecmp(bfr, var, max(strlen(var), (gsize)(cp - bfr)))) - return(0); /* var is not the var in - bfr ==> no match */ + if (g_ascii_strncasecmp(bfr, var, MAX(strlen(var), (gsize)(cp - bfr)))) { + /* var is not the var in bfr ==> no match */ + return 0; + } - cp = strchr(bfr, '='); - if (!cp) - return(0); - cp++; - while (*cp && isspace(*cp)) /* space up to variable value */ + cp = strchr(bfr, '='); + if (!cp) { + return (0); + } cp++; + while (*cp && isspace(*cp)) { + /* space up to variable value */ + cp++; + } - return (cp - bfr); /* return index */ + return (cp - bfr); /* return index */ }
--- a/libpurple/protocols/zephyr/ZWait4Not.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/ZWait4Not.c Tue Sep 17 02:20:47 2019 +0000 @@ -32,7 +32,7 @@ Code_t Z_WaitForNotice (notice, pred, arg, timeout) ZNotice_t *notice; - int (*pred) __P((ZNotice_t *, void *)); + int (*pred)(ZNotice_t *, void *); void *arg; int timeout; {
--- a/libpurple/protocols/zephyr/Zinternal.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/Zinternal.c Tue Sep 17 02:20:47 2019 +0000 @@ -57,14 +57,12 @@ char __Zephyr_realm[REALM_SZ]; #ifdef Z_DEBUG -void (*__Z_debug_print) __P((const char *fmt, va_list args, void *closure)); +void (*__Z_debug_print)(const char *fmt, va_list args, void *closure); void *__Z_debug_print_closure; #endif -#define min(a,b) ((a)<(b)?(a):(b)) - -static int Z_AddField __P((char **ptr, const char *field, char *end)); -static int find_or_insert_uid __P((ZUnique_Id_t *uid, ZNotice_Kind_t kind)); +static int Z_AddField(char **ptr, const char *field, char *end); +static int find_or_insert_uid(ZUnique_Id_t *uid, ZNotice_Kind_t kind); /* Find or insert uid in the old uids buffer. The buffer is a sorted * circular queue. We make the assumption that most packets arrive in @@ -890,7 +888,7 @@ (void) memcpy((char *)&partnotice.z_uid.zuid_addr, &__My_addr, sizeof(__My_addr)); } - message_len = min(notice->z_message_len-offset, fragsize); + message_len = MIN(notice->z_message_len - offset, fragsize); partnotice.z_message = (char*)notice->z_message+offset; partnotice.z_message_len = message_len; if ((retval = Z_FormatAuthHeader(&partnotice, buffer, Z_MAXHEADERLEN, @@ -964,7 +962,7 @@ #undef ZSetDebug void ZSetDebug(proc, arg) - void (*proc) __P((const char *, va_list, void *)); + void (*proc)(const char *, va_list, void *); char *arg; { __Z_debug_print = proc;
--- a/libpurple/protocols/zephyr/com_err.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/com_err.h Tue Sep 17 02:20:47 2019 +0000 @@ -8,31 +8,19 @@ * with this package. */ -#ifndef __COM_ERR_H -#define __COM_ERR_H +#ifndef PURPLE_ZEPHYR_COM_ERR_H +#define PURPLE_ZEPHYR_COM_ERR_H #define COM_ERR_BUF_LEN 25 -/* Use __STDC__ to guess whether we can use stdarg, prototypes, and const. - * This is a public header file, so autoconf can't help us here. */ -#ifdef __STDC__ -# include <stdarg.h> -# define ETP(x) x -# define ETCONST const -#else -# define ETP(x) () -# define ETCONST -#endif +#include <stdarg.h> -typedef void (*error_handler_t) ETP((ETCONST char *, long, ETCONST char *, - va_list)); +typedef void (*error_handler_t)(const char *, long, const char *, va_list); extern error_handler_t com_err_hook; -void com_err ETP((ETCONST char *, long, ETCONST char *, ...)); -ETCONST char *error_message ETP((long)); -ETCONST char *error_message_r ETP((long, char *)); -error_handler_t set_com_err_hook ETP((error_handler_t)); -error_handler_t reset_com_err_hook ETP((void)); +void com_err(const char *, long, const char *, ...); +const char *error_message(long); +const char *error_message_r(long, char *); +error_handler_t set_com_err_hook(error_handler_t); +error_handler_t reset_com_err_hook(void); -#undef ETP - -#endif /* ! defined(__COM_ERR_H) */ +#endif /* PURPLE_ZEPHYR_COM_ERR_H */
--- a/libpurple/protocols/zephyr/error_message.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/error_message.c Tue Sep 17 02:20:47 2019 +0000 @@ -9,7 +9,7 @@ #include "com_err.h" #include <sysdep.h> -char *error_table_name_r __P((int, char *)); +char *error_table_name_r(int, char *); struct et_list * _et_list = (struct et_list *) NULL;
--- a/libpurple/protocols/zephyr/error_table.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/error_table.h Tue Sep 17 02:20:47 2019 +0000 @@ -5,7 +5,9 @@ * For copyright info, see mit-sipb-copyright.h. */ -#ifndef _ET_H +#ifndef PURPLE_ZEPHYR_ERROR_TABLE_H +#define PURPLE_ZEPHYR_ERROR_TABLE_H + struct error_table { char const * const * msgs; long base; @@ -21,5 +23,5 @@ #define BITS_PER_CHAR 6 /* # bits to shift per character in name */ const char *error_table_name(void); -#define _ET_H -#endif + +#endif /* PURPLE_ZEPHYR_ERROR_TABLE_H */
--- a/libpurple/protocols/zephyr/internal.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/internal.h Tue Sep 17 02:20:47 2019 +0000 @@ -1,5 +1,5 @@ -#ifndef __INTERNAL_H__ -#define __INTERNAL_H__ +#ifndef PURPLE_ZEPHYR_INTERNAL_H +#define PURPLE_ZEPHYR_INTERNAL_H #include <sysdep.h> @@ -96,27 +96,23 @@ extern int __Zephyr_port; /* Port number */ extern struct in_addr __My_addr; -typedef Code_t (*Z_SendProc) __P((ZNotice_t *, char *, int, int)); +typedef Code_t (*Z_SendProc)(ZNotice_t *, char *, int, int); -struct _Z_InputQ *Z_GetFirstComplete __P((void)); -struct _Z_InputQ *Z_GetNextComplete __P((struct _Z_InputQ *)); -Code_t Z_XmitFragment __P((ZNotice_t*, char *,int,int)); -void Z_RemQueue __P((struct _Z_InputQ *)); -Code_t Z_AddNoticeToEntry __P((struct _Z_InputQ*, ZNotice_t*, int)); -Code_t Z_FormatAuthHeader __P((ZNotice_t *, char *, int, int *, Z_AuthProc)); -Code_t Z_FormatHeader __P((ZNotice_t *, char *, int, int *, Z_AuthProc)); -Code_t Z_FormatRawHeader __P((ZNotice_t *, char*, gsize, - int*, char **, char **)); -Code_t Z_ReadEnqueue __P((void)); -Code_t Z_ReadWait __P((void)); -Code_t Z_SendLocation __P((char*, char*, Z_AuthProc, char*)); -Code_t Z_SendFragmentedNotice __P((ZNotice_t *notice, int len, - Z_AuthProc cert_func, - Z_SendProc send_func)); -Code_t Z_WaitForComplete __P((void)); -Code_t Z_WaitForNotice __P((ZNotice_t *notice, - int (*pred) __P((ZNotice_t *, void *)), void *arg, - int timeout)); +struct _Z_InputQ *Z_GetFirstComplete(void); +struct _Z_InputQ *Z_GetNextComplete(struct _Z_InputQ *); +Code_t Z_XmitFragment(ZNotice_t *, char *, int, int); +void Z_RemQueue(struct _Z_InputQ *); +Code_t Z_AddNoticeToEntry(struct _Z_InputQ *, ZNotice_t *, int); +Code_t Z_FormatAuthHeader(ZNotice_t *, char *, int, int *, Z_AuthProc); +Code_t Z_FormatHeader(ZNotice_t *, char *, int, int *, Z_AuthProc); +Code_t Z_FormatRawHeader(ZNotice_t *, char *, gsize, int *, char **, char **); +Code_t Z_ReadEnqueue(void); +Code_t Z_ReadWait(void); +Code_t Z_SendLocation(char *, char *, Z_AuthProc, char *); +Code_t Z_SendFragmentedNotice(ZNotice_t *notice, int len, Z_AuthProc cert_func, + Z_SendProc send_func); +Code_t Z_WaitForComplete(void); +Code_t Z_WaitForNotice(ZNotice_t *notice, int (*pred)(ZNotice_t *, void *), + void *arg, int timeout); -#endif /* __INTERNAL_H__ */ - +#endif /* PURPLE_ZEPHYR_INTERNAL_H */
--- a/libpurple/protocols/zephyr/sysdep.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/sysdep.h Tue Sep 17 02:20:47 2019 +0000 @@ -8,8 +8,8 @@ * "mit-copyright.h". */ -#ifndef __SYSDEP_H__ -#define __SYSDEP_H__ +#ifndef PURPLE_ZEPHYR_SYSDEP_H +#define PURPLE_ZEPHYR_SYSDEP_H #include <config.h> #include <stdio.h> @@ -35,55 +35,17 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif #ifdef HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif -/* Because we have public header files (and our prototypes need to agree with - * those header files, use __STDC__ to guess whether the compiler can handle - * stdarg, const, and prototypes. */ -#ifdef __STDC__ -# include <stdarg.h> -# define VA_START(ap, last) va_start(ap, last) -# ifndef __P -# define __P(x) x -# endif -#else -# include <varargs.h> -# define VA_START(ap, last) va_start(ap) -# define const -# ifndef __P -# define __P(x) () -# endif -#endif - -/* openlog(). */ -#ifdef LOG_AUTH -/* A decent syslog */ -#define OPENLOG(str, opts, facility) openlog(str, opts, facility) -#else -/* Probably a 4.2-type syslog */ -#define OPENLOG(str, opts, facility) openlog(str, opts) -#endif +#include <stdarg.h> #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif -#ifdef HAVE_PATHS_H -# include <paths.h> -# define TEMP_DIRECTORY _PATH_VARTMP -#else -# define TEMP_DIRECTORY FOUND_TMP -#endif - #ifdef HAVE_UNISTD_H # include <unistd.h> #else @@ -92,15 +54,6 @@ # endif uid_t getuid(void); char *ttyname(void); -#ifdef HAVE_GETHOSTID -ZEPHYR_INT32 gethostid(void); -#endif -#endif - -#ifndef STDIN_FILENO -#define STDIN_FILENO 0 -#define STDOUT_FILENO 1 -#define STDERR_FILENO 2 #endif #ifdef HAVE_TERMIOS_H @@ -121,30 +74,18 @@ /* Kerberos compatibility. */ #ifdef ZEPHYR_USES_KERBEROS # include <krb.h> -#ifdef WIN32 - -#else -# include <krb_err.h> -#endif /* WIN32 */ +# ifndef WIN32 +# include <krb_err.h> +# ifndef HAVE_KRB_GET_ERR_TEXT +# define krb_get_err_text(n) krb_err_txt[n] +# endif +# endif /* WIN32 */ # include <des.h> -#ifndef WIN32 -# ifndef HAVE_KRB_GET_ERR_TEXT -# define krb_get_err_text(n) krb_err_txt[n] -# endif -#endif /* WIN32 */ # ifndef HAVE_KRB_LOG # define krb_log log # endif #endif /* ZEPHYR_USES_KERBEROS */ -#ifdef HAVE_SYS_UIO_H -# include <sys/uio.h> -#endif - -#ifdef HAVE_SYS_UTSNAME_H -# include <sys/utsname.h> -#endif - #ifdef HAVE_SYS_SELECT_H # include <sys/select.h> #endif @@ -153,9 +94,4 @@ #include <sys/msgbuf.h> #endif -#ifndef MSG_BSIZE -#define MSG_BSIZE BUFSIZ -#endif - -#endif /* __SYSDEP_H__ */ - +#endif /* PURPLE_ZEPHYR_SYSDEP_H */
--- a/libpurple/protocols/zephyr/zephyr.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/zephyr.c Tue Sep 17 02:20:47 2019 +0000 @@ -1368,10 +1368,11 @@ #endif /* WIN32 */ -static char *get_exposure_level(void) +static const gchar * +get_exposure_level(void) { /* XXX add real error reporting */ - char *exposure = ZGetVariable("exposure"); + const gchar *exposure = ZGetVariable("exposure"); if (!exposure) return EXPOSE_REALMVIS; @@ -1551,22 +1552,20 @@ g_free(filename); } -static char* normalize_zephyr_exposure(const char* exposure) { - char *exp2 = g_strstrip(g_ascii_strup(exposure,-1)); - - if (!exp2) - return EXPOSE_REALMVIS; - if (!g_ascii_strcasecmp(exp2, EXPOSE_NONE)) - return EXPOSE_NONE; - if (!g_ascii_strcasecmp(exp2, EXPOSE_OPSTAFF)) - return EXPOSE_OPSTAFF; - if (!g_ascii_strcasecmp(exp2, EXPOSE_REALMANN)) - return EXPOSE_REALMANN; - if (!g_ascii_strcasecmp(exp2, EXPOSE_NETVIS)) - return EXPOSE_NETVIS; - if (!g_ascii_strcasecmp(exp2, EXPOSE_NETANN)) - return EXPOSE_NETANN; - return EXPOSE_REALMVIS; +static gchar * +normalize_zephyr_exposure(const gchar *exposure) +{ + gchar *exp2 = g_strstrip(g_ascii_strup(exposure, -1)); + + if (!exp2) { + return g_strdup(EXPOSE_REALMVIS); + } + if (g_str_equal(exp2, EXPOSE_NONE) || g_str_equal(exp2, EXPOSE_OPSTAFF) || + g_str_equal(exp2, EXPOSE_REALMANN) || + g_str_equal(exp2, EXPOSE_NETVIS) || g_str_equal(exp2, EXPOSE_NETANN)) { + return exp2; + } + return g_strdup(EXPOSE_REALMVIS); } static void zephyr_login(PurpleAccount * account) @@ -1594,7 +1593,7 @@ zephyr->account = account; /* Make sure that the exposure (visibility) is set to a sane value */ - zephyr->exposure=g_strdup(normalize_zephyr_exposure(exposure)); + zephyr->exposure = normalize_zephyr_exposure(exposure); if (purple_account_get_bool(purple_connection_get_account(gc),"use_tzc",0)) { zephyr->connection_type = PURPLE_ZEPHYR_TZC; @@ -2263,7 +2262,7 @@ return who; } - gc = purple_account_get_connection(account); + gc = purple_account_get_connection((PurpleAccount *)account); if (gc == NULL) return NULL; @@ -2915,7 +2914,7 @@ zephyr_protocol_init(PurpleProtocol *protocol) { PurpleAccountOption *option; - char *tmp = get_exposure_level(); + const gchar *tmp = get_exposure_level(); protocol->id = "prpl-zephyr"; protocol->name = "Zephyr";
--- a/libpurple/protocols/zephyr/zephyr.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/zephyr.h Tue Sep 17 02:20:47 2019 +0000 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ -#ifndef _ZEPHYR_H_ -#define _ZEPHYR_H_ + +#ifndef PURPLE_ZEPHYR_ZEPHYR_H +#define PURPLE_ZEPHYR_ZEPHYR_H #include <gmodule.h> @@ -48,4 +49,4 @@ */ G_MODULE_EXPORT GType zephyr_protocol_get_type(void); -#endif /* _ZEPHYR_H_ */ +#endif /* PURPLE_ZEPHYR_ZEPHYR_H */
--- a/libpurple/protocols/zephyr/zephyr_err.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/zephyr_err.c Tue Sep 17 02:20:47 2019 +0000 @@ -1,12 +1,5 @@ #include "zephyr_err.h" -#ifdef __STDC__ -#define NOARGS void -#else -#define NOARGS -#define const -#endif - static const char * const text[] = { "Packet too long or buffer too small", "Notice header too large", @@ -49,7 +42,9 @@ static struct et_list link = { 0, 0 }; -void initialize_zeph_error_table (NOARGS) { +void +initialize_zeph_error_table(void) +{ if (!link.table) { link.next = _et_list; link.table = &et;
--- a/libpurple/protocols/zephyr/zephyr_internal.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/protocols/zephyr/zephyr_internal.h Tue Sep 17 02:20:47 2019 +0000 @@ -8,8 +8,8 @@ * file "mit-copyright.h". */ -#ifndef __ZEPHYR_H__ -#define __ZEPHYR_H__ +#ifndef PURPLE_ZEPHYR_ZEPHYR_INTERNAL_H +#define PURPLE_ZEPHYR_ZEPHYR_INTERNAL_H #include <config.h> @@ -26,16 +26,7 @@ #endif #endif -/* Use __STDC__ to guess whether we can use stdarg, prototypes, and const. - * This is a public header file, so autoconf can't help us here. */ -#ifdef __STDC__ -# include <stdarg.h> -# define ZP(x) x -# define ZCONST const -#else -# define ZP(x) () -# define ZCONST -#endif +#include <stdarg.h> #ifdef WIN32 /* this really should be uint32_t */ @@ -74,7 +65,7 @@ typedef enum { UNSAFE, UNACKED, ACKED, HMACK, HMCTL, SERVACK, SERVNAK, CLIENTACK, STAT } ZNotice_Kind_t; -extern ZCONST char *ZNoticeKinds[9]; +extern const char *ZNoticeKinds[9]; /* Unique ID format */ typedef struct { @@ -138,90 +129,84 @@ /* for ZSetDebug */ #ifdef Z_DEBUG -void (*__Z_debug_print) ZP((ZCONST char *fmt, va_list args, void *closure)); +void (*__Z_debug_print)(const char *fmt, va_list args, void *closure); void *__Z_debug_print_closure; #endif -int ZCompareUIDPred ZP((ZNotice_t *, void *)); -int ZCompareMultiUIDPred ZP((ZNotice_t *, void *)); +int ZCompareUIDPred(ZNotice_t *, void *); +int ZCompareMultiUIDPred(ZNotice_t *, void *); /* Defines for ZFormatNotice, et al. */ -typedef Code_t (*Z_AuthProc) ZP((ZNotice_t*, char *, int, int *)); -Code_t ZMakeAuthentication ZP((ZNotice_t*, char *,int, int*)); +typedef Code_t (*Z_AuthProc)(ZNotice_t *, char *, int, int *); +Code_t ZMakeAuthentication(ZNotice_t *, char *, int, int *); -char *ZGetSender ZP((void)); -char *ZGetVariable ZP((char *)); -Code_t ZSetVariable ZP((char *var, char *value)); -Code_t ZUnsetVariable ZP((char *var)); -int ZGetWGPort ZP((void)); -Code_t ZSetDestAddr ZP((struct sockaddr_in *)); -Code_t ZFormatNoticeList ZP((ZNotice_t*, char**, int, - char **, int*, Z_AuthProc)); -Code_t ZParseNotice ZP((char*, int, ZNotice_t *)); -Code_t ZReadAscii ZP((char*, int, unsigned char*, int)); -Code_t ZReadAscii32 ZP((char *, int, unsigned long *)); -Code_t ZReadAscii16 ZP((char *, int, unsigned short *)); -Code_t ZSendPacket ZP((char*, int, int)); -Code_t ZSendList ZP((ZNotice_t*, char *[], int, Z_AuthProc)); -Code_t ZSrvSendList ZP((ZNotice_t*, char*[], int, Z_AuthProc, Code_t (*)())); -Code_t ZSendNotice ZP((ZNotice_t *, Z_AuthProc)); -Code_t ZSrvSendNotice ZP((ZNotice_t*, Z_AuthProc, Code_t (*)())); -Code_t ZFormatNotice ZP((ZNotice_t*, char**, int*, Z_AuthProc)); -Code_t ZFormatSmallNotice ZP((ZNotice_t*, ZPacket_t, int*, Z_AuthProc)); -Code_t ZFormatRawNoticeList ZP((ZNotice_t *notice, char *list[], int nitems, - char **buffer, int *ret_len)); -Code_t ZLocateUser ZP((char *, int *, Z_AuthProc)); -Code_t ZRequestLocations ZP((const char *, ZAsyncLocateData_t *, - ZNotice_Kind_t, Z_AuthProc)); -Code_t ZhmStat ZP((struct in_addr *, ZNotice_t *)); -Code_t ZInitialize ZP((void)); -Code_t ZSetServerState ZP((int)); -Code_t ZSetFD ZP((int)); -Code_t ZFormatSmallRawNotice ZP((ZNotice_t*, ZPacket_t, int*)); -int ZCompareUID ZP((ZUnique_Id_t*, ZUnique_Id_t*)); -Code_t ZMakeAscii ZP((char*, int, unsigned char*, int)); -Code_t ZMakeAscii32 ZP((char *, int, unsigned long)); -Code_t ZMakeAscii16 ZP((char *, int, unsigned int)); -Code_t ZReceivePacket ZP((ZPacket_t, int*, struct sockaddr_in*)); -Code_t ZCheckAuthentication ZP((ZNotice_t*, struct sockaddr_in*)); -Code_t ZSetLocation ZP((char *exposure)); -Code_t ZUnsetLocation ZP((void)); -Code_t ZFlushMyLocations ZP((void)); -Code_t ZFormatRawNotice ZP((ZNotice_t *, char**, int *)); -Code_t ZRetrieveSubscriptions ZP((unsigned short, int*)); -Code_t ZOpenPort ZP((unsigned short *port)); -Code_t ZClosePort ZP((void)); -Code_t ZFlushLocations ZP((void)); -Code_t ZFlushSubscriptions ZP((void)); -Code_t ZFreeNotice ZP((ZNotice_t *notice)); -Code_t ZParseLocations ZP((register ZNotice_t *notice, - register ZAsyncLocateData_t *zald, int *nlocs, - char **user)); -int ZCompareALDPred ZP((ZNotice_t *notice, void *zald)); -void ZFreeALD ZP((register ZAsyncLocateData_t *zald)); -Code_t ZCheckIfNotice ZP((ZNotice_t *notice, struct sockaddr_in *from, - register int (*predicate) ZP((ZNotice_t *,void *)), - void *args)); -Code_t ZPeekPacket ZP((char **buffer, int *ret_len, - struct sockaddr_in *from)); -Code_t ZPeekNotice ZP((ZNotice_t *notice, struct sockaddr_in *from)); -Code_t ZIfNotice ZP((ZNotice_t *notice, struct sockaddr_in *from, - int (*predicate) ZP((ZNotice_t *, void *)), void *args)); -Code_t ZSubscribeTo ZP((ZSubscription_t *sublist, int nitems, - unsigned int port)); -Code_t ZSubscribeToSansDefaults ZP((ZSubscription_t *sublist, int nitems, - unsigned int port)); -Code_t ZUnsubscribeTo ZP((ZSubscription_t *sublist, int nitems, - unsigned int port)); -Code_t ZCancelSubscriptions ZP((unsigned int port)); -int ZPending ZP((void)); -Code_t ZReceiveNotice ZP((ZNotice_t *notice, struct sockaddr_in *from)); +char *ZGetSender(void); +const gchar *ZGetVariable(const gchar *); +Code_t ZSetVariable(char *var, char *value); +Code_t ZUnsetVariable(char *var); +int ZGetWGPort(void); +Code_t ZSetDestAddr(struct sockaddr_in *); +Code_t ZFormatNoticeList(ZNotice_t *, char **, int, char **, int *, Z_AuthProc); +Code_t ZParseNotice(char *, int, ZNotice_t *); +Code_t ZReadAscii(char *, int, unsigned char *, int); +Code_t ZReadAscii32(char *, int, unsigned long *); +Code_t ZReadAscii16(char *, int, unsigned short *); +Code_t ZSendPacket(char *, int, int); +Code_t ZSendList(ZNotice_t *, char *[], int, Z_AuthProc); +Code_t ZSrvSendList(ZNotice_t *, char *[], int, Z_AuthProc, Code_t (*)()); +Code_t ZSendNotice(ZNotice_t *, Z_AuthProc); +Code_t ZSrvSendNotice(ZNotice_t *, Z_AuthProc, Code_t (*)()); +Code_t ZFormatNotice(ZNotice_t *, char **, int *, Z_AuthProc); +Code_t ZFormatSmallNotice(ZNotice_t *, ZPacket_t, int *, Z_AuthProc); +Code_t ZFormatRawNoticeList(ZNotice_t *notice, char *list[], int nitems, + char **buffer, int *ret_len); +Code_t ZLocateUser(char *, int *, Z_AuthProc); +Code_t ZRequestLocations(const char *, ZAsyncLocateData_t *, ZNotice_Kind_t, + Z_AuthProc); +Code_t ZhmStat(struct in_addr *, ZNotice_t *); +Code_t ZInitialize(void); +Code_t ZSetServerState(int); +Code_t ZSetFD(int); +Code_t ZFormatSmallRawNotice(ZNotice_t *, ZPacket_t, int *); +int ZCompareUID(ZUnique_Id_t *, ZUnique_Id_t *); +Code_t ZMakeAscii(char *, int, unsigned char *, int); +Code_t ZMakeAscii32(char *, int, unsigned long); +Code_t ZMakeAscii16(char *, int, unsigned int); +Code_t ZReceivePacket(ZPacket_t, int *, struct sockaddr_in *); +Code_t ZCheckAuthentication(ZNotice_t *, struct sockaddr_in *); +Code_t ZSetLocation(char *exposure); +Code_t ZUnsetLocation(void); +Code_t ZFlushMyLocations(void); +Code_t ZFormatRawNotice(ZNotice_t *, char **, int *); +Code_t ZRetrieveSubscriptions(unsigned short, int *); +Code_t ZOpenPort(unsigned short *port); +Code_t ZClosePort(void); +Code_t ZFlushLocations(void); +Code_t ZFlushSubscriptions(void); +Code_t ZFreeNotice(ZNotice_t *notice); +Code_t ZParseLocations(register ZNotice_t *notice, + register ZAsyncLocateData_t *zald, int *nlocs, + char **user); +int ZCompareALDPred(ZNotice_t *notice, void *zald); +void ZFreeALD(register ZAsyncLocateData_t *zald); +Code_t ZCheckIfNotice(ZNotice_t *notice, struct sockaddr_in *from, + register int (*predicate)(ZNotice_t *, void *), + void *args); +Code_t ZPeekPacket(char **buffer, int *ret_len, struct sockaddr_in *from); +Code_t ZPeekNotice(ZNotice_t *notice, struct sockaddr_in *from); +Code_t ZIfNotice(ZNotice_t *notice, struct sockaddr_in *from, + int (*predicate)(ZNotice_t *, void *), void *args); +Code_t ZSubscribeTo(ZSubscription_t *sublist, int nitems, unsigned int port); +Code_t ZSubscribeToSansDefaults(ZSubscription_t *sublist, int nitems, + unsigned int port); +Code_t ZUnsubscribeTo(ZSubscription_t *sublist, int nitems, unsigned int port); +Code_t ZCancelSubscriptions(unsigned int port); +int ZPending(void); +Code_t ZReceiveNotice(ZNotice_t *notice, struct sockaddr_in *from); #ifdef Z_DEBUG -void Z_debug ZP((ZCONST char *, ...)); +void Z_debug(const char *, ...); #endif -#undef ZP - /* Compatibility */ #define ZNewLocateUser ZLocateUser @@ -236,7 +221,7 @@ #define ZGetRealm() __Zephyr_realm #ifdef Z_DEBUG -void ZSetDebug ZP((void (*)(ZCONST char *, va_list, void *), void *)); +void ZSetDebug(void (*)(const char *, va_list, void *), void *); #define ZSetDebug(proc,closure) (__Z_debug_print=(proc), \ __Z_debug_print_closure=(closure), \ (void) 0) @@ -336,4 +321,4 @@ #define USER_STARTUP "STARTUP" /* Opcode: Come out of it */ #define USER_EXIT "EXIT" /* Opcode: Exit the client */ -#endif /* __ZEPHYR_H__ */ +#endif /* PURPLE_ZEPHYR_ZEPHYR_INTERNAL_H */
--- a/libpurple/stun.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/stun.c Tue Sep 17 02:20:47 2019 +0000 @@ -119,7 +119,7 @@ /* set unknown */ nattype.status = PURPLE_STUN_STATUS_UNKNOWN; - nattype.lookup_time = time(NULL); + nattype.lookup_time = g_get_monotonic_time(); /* callbacks */ do_callbacks(); @@ -217,7 +217,7 @@ purple_debug_info("stun", "got public ip %s\n", nattype.publicip); nattype.status = PURPLE_STUN_STATUS_DISCOVERED; nattype.type = PURPLE_STUN_NAT_TYPE_UNKNOWN_NAT; - nattype.lookup_time = time(NULL); + nattype.lookup_time = g_get_monotonic_time(); /* is it a NAT? */ @@ -269,7 +269,7 @@ if(fd < 0) { nattype.status = PURPLE_STUN_STATUS_UNKNOWN; - nattype.lookup_time = time(NULL); + nattype.lookup_time = g_get_monotonic_time(); do_callbacks(); g_resolver_free_addresses(ld->addresses); g_free(ld); @@ -306,7 +306,7 @@ (struct sockaddr *)&(sc->addr), sizeof(struct sockaddr_in)) < (gssize)sizeof(struct stun_header)) { nattype.status = PURPLE_STUN_STATUS_UNKNOWN; - nattype.lookup_time = time(NULL); + nattype.lookup_time = g_get_monotonic_time(); do_callbacks(); close_stun_conn(sc); return; @@ -328,7 +328,7 @@ res, &error); if(error != NULL) { nattype.status = PURPLE_STUN_STATUS_UNDISCOVERED; - nattype.lookup_time = time(NULL); + nattype.lookup_time = g_get_monotonic_time(); do_callbacks(); @@ -339,7 +339,7 @@ ld->port = GPOINTER_TO_INT(data); if (!purple_network_listen_range(12108, 12208, AF_UNSPEC, SOCK_DGRAM, TRUE, hbn_listen_cb, ld)) { nattype.status = PURPLE_STUN_STATUS_UNKNOWN; - nattype.lookup_time = time(NULL); + nattype.lookup_time = g_get_monotonic_time(); do_callbacks(); @@ -411,8 +411,9 @@ /* If we don't have a successful status and it has been 5 minutes since we last did a lookup, redo the lookup */ - if (nattype.status != PURPLE_STUN_STATUS_DISCOVERED - && (time(NULL) - nattype.lookup_time) > 300) { + if (nattype.status != PURPLE_STUN_STATUS_DISCOVERED && + (g_get_monotonic_time() - nattype.lookup_time) > + 300 * G_USEC_PER_SEC) { use_cached_result = FALSE; } @@ -425,7 +426,7 @@ if(!servername || (strlen(servername) < 2)) { nattype.status = PURPLE_STUN_STATUS_UNKNOWN; - nattype.lookup_time = time(NULL); + nattype.lookup_time = g_get_monotonic_time(); if(cb) g_timeout_add(10, call_callback, cb); return &nattype;
--- a/libpurple/stun.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/stun.h Tue Sep 17 02:20:47 2019 +0000 @@ -85,7 +85,7 @@ PurpleStunNatType type; char publicip[16]; char *servername; - time_t lookup_time; + gint64 lookup_time; }; typedef void (*PurpleStunCallback) (PurpleStunNatDiscovery *discovery);
--- a/libpurple/util.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/util.c Tue Sep 17 02:20:47 2019 +0000 @@ -3336,35 +3336,6 @@ } char * -purple_str_size_to_units(goffset size) -{ - static const char * const size_str[] = { "bytes", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB" }; - float size_mag; - gsize size_index = 0; - - if (size == -1) { - return g_strdup(_("Calculating...")); - } - else if (size == 0) { - return g_strdup(_("Unknown.")); - } - else { - size_mag = (float)size; - - while ((size_index < G_N_ELEMENTS(size_str) - 1) && (size_mag > 1024)) { - size_mag /= 1024; - size_index++; - } - - if (size_index == 0) { - return g_strdup_printf("%" G_GOFFSET_FORMAT " %s", size, _(size_str[size_index])); - } else { - return g_strdup_printf("%.2f %s", size_mag, _(size_str[size_index])); - } - } -} - -char * purple_str_seconds_to_string(guint secs) { char *ret = NULL;
--- a/libpurple/util.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/util.h Tue Sep 17 02:20:47 2019 +0000 @@ -1183,17 +1183,6 @@ const char *purple_strcasestr(const char *haystack, const char *needle); /** - * purple_str_size_to_units: - * @size: The size - * - * Returns a string representing a filesize in the appropriate - * units (MB, KB, GB, etc.) - * - * Returns: The string in units form. This must be freed. - */ -char *purple_str_size_to_units(goffset size); - -/** * purple_str_seconds_to_string: * @sec: The seconds. *
--- a/libpurple/xfer.c Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/xfer.c Tue Sep 17 02:20:47 2019 +0000 @@ -65,8 +65,8 @@ int watcher; /* Watcher. */ goffset bytes_sent; /* The number of bytes sent. */ - time_t start_time; /* When the transfer of data began. */ - time_t end_time; /* When the transfer of data ended. */ + gint64 start_time; /* When the transfer of data began. */ + gint64 end_time; /* When the transfer of data ended. */ size_t current_buffer_size; /* This gradually increases for fast network connections. */ @@ -455,7 +455,7 @@ if (purple_xfer_get_filename(xfer) != NULL) { size = purple_xfer_get_size(xfer); - size_buf = purple_str_size_to_units(size); + size_buf = g_format_size_full(size, G_FORMAT_SIZE_LONG_FORMAT); buf = g_strdup_printf(_("%s wants to send you %s (%s)"), buddy ? purple_buddy_get_alias(buddy) : priv->who, purple_xfer_get_filename(xfer), size_buf); @@ -883,7 +883,7 @@ return priv->remote_port; } -time_t +gint64 purple_xfer_get_start_time(PurpleXfer *xfer) { PurpleXferPrivate *priv = NULL; @@ -894,7 +894,7 @@ return priv->start_time; } -time_t +gint64 purple_xfer_get_end_time(PurpleXfer *xfer) { PurpleXferPrivate *priv = NULL; @@ -1514,7 +1514,7 @@ ); } - priv->start_time = time(NULL); + priv->start_time = g_get_monotonic_time(); g_object_notify_by_pspec(G_OBJECT(xfer), properties[PROP_START_TIME]); @@ -1664,7 +1664,7 @@ return; } - priv->end_time = time(NULL); + priv->end_time = g_get_monotonic_time(); g_object_notify_by_pspec(G_OBJECT(xfer), properties[PROP_END_TIME]); @@ -1736,7 +1736,7 @@ purple_request_close_with_handle(xfer); purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_LOCAL); - priv->end_time = time(NULL); + priv->end_time = g_get_monotonic_time(); g_object_notify_by_pspec(G_OBJECT(xfer), properties[PROP_END_TIME]); @@ -1803,7 +1803,7 @@ purple_request_close_with_handle(xfer); purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_REMOTE); - priv->end_time = time(NULL); + priv->end_time = g_get_monotonic_time(); g_object_notify_by_pspec(G_OBJECT(xfer), properties[PROP_END_TIME]); @@ -2093,22 +2093,10 @@ g_value_set_int64(value, purple_xfer_get_bytes_sent(xfer)); break; case PROP_START_TIME: -#if SIZEOF_TIME_T == 4 - g_value_set_int(value, purple_xfer_get_start_time(xfer)); -#elif SIZEOF_TIME_T == 8 g_value_set_int64(value, purple_xfer_get_start_time(xfer)); -#else -#error Unknown size of time_t -#endif break; case PROP_END_TIME: -#if SIZEOF_TIME_T == 4 - g_value_set_int(value, purple_xfer_get_end_time(xfer)); -#elif SIZEOF_TIME_T == 8 g_value_set_int64(value, purple_xfer_get_end_time(xfer)); -#else -#error Unknown size of time_t -#endif break; case PROP_STATUS: g_value_set_enum(value, purple_xfer_get_status(xfer)); @@ -2274,43 +2262,16 @@ G_MININT64, G_MAXINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - properties[PROP_START_TIME] = -#if SIZEOF_TIME_T == 4 - g_param_spec_int -#elif SIZEOF_TIME_T == 8 - g_param_spec_int64 -#else -#error Unknown size of time_t -#endif - ("start-time", "Start time", - "The time the transfer of a file started.", -#if SIZEOF_TIME_T == 4 - G_MININT, G_MAXINT, 0, -#elif SIZEOF_TIME_T == 8 - G_MININT64, G_MAXINT64, 0, -#else -#error Unknown size of time_t -#endif - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - - properties[PROP_END_TIME] = -#if SIZEOF_TIME_T == 4 - g_param_spec_int -#elif SIZEOF_TIME_T == 8 - g_param_spec_int64 -#else -#error Unknown size of time_t -#endif - ("end-time", "End time", - "The time the transfer of a file ended.", -#if SIZEOF_TIME_T == 4 - G_MININT, G_MAXINT, 0, -#elif SIZEOF_TIME_T == 8 - G_MININT64, G_MAXINT64, 0, -#else -#error Unknown size of time_t -#endif - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + properties[PROP_START_TIME] = g_param_spec_int64( + "start-time", "Start time", + "The monotonic time the transfer of a file started.", + G_MININT64, G_MAXINT64, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + + properties[PROP_END_TIME] = g_param_spec_int64( + "end-time", "End time", + "The monotonic time the transfer of a file ended.", G_MININT64, + G_MAXINT64, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); properties[PROP_STATUS] = g_param_spec_enum("status", "Status", "The current status for the file transfer.",
--- a/libpurple/xfer.h Sun Sep 15 03:54:08 2019 -0400 +++ b/libpurple/xfer.h Tue Sep 17 02:20:47 2019 +0000 @@ -448,9 +448,9 @@ * * Returns the time the transfer of a file started. * - * Returns: The time when the transfer started. + * Returns: The monotonic time when the transfer started. */ -time_t purple_xfer_get_start_time(PurpleXfer *xfer); +gint64 purple_xfer_get_start_time(PurpleXfer *xfer); /** * purple_xfer_get_end_time: @@ -458,9 +458,9 @@ * * Returns the time the transfer of a file ended. * - * Returns: The time when the transfer ended. + * Returns: The monotonic time when the transfer ended. */ -time_t purple_xfer_get_end_time(PurpleXfer *xfer); +gint64 purple_xfer_get_end_time(PurpleXfer *xfer); /** * purple_xfer_set_fd:
--- a/meson.build Sun Sep 15 03:54:08 2019 -0400 +++ b/meson.build Tue Sep 17 02:20:47 2019 +0000 @@ -901,11 +901,11 @@ #AC_MSG_CHECKING(for me pot o' gold) #AC_MSG_RESULT(no) -foreach func : ['gethostid', 'timegm'] +foreach func : ['timegm'] conf.set('HAVE_' + func.to_upper(), compiler.has_function(func)) endforeach -foreach header : 'paths.h sgtty.h sys/cdefs.h sys/file.h sys/filio.h sys/ioctl.h sys/msgbuf.h sys/select.h sys/uio.h sys/utsname.h sys/wait.h termios.h'.split() +foreach header : 'sgtty.h sys/cdefs.h sys/file.h sys/filio.h sys/ioctl.h sys/msgbuf.h sys/select.h sys/wait.h termios.h'.split() conf.set('HAVE_' + header.to_upper().underscorify(), compiler.has_header(header)) endforeach
--- a/pidgin/gtkconv.c Sun Sep 15 03:54:08 2019 -0400 +++ b/pidgin/gtkconv.c Tue Sep 17 02:20:47 2019 +0000 @@ -1810,6 +1810,7 @@ static gboolean refocus_entry_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { + GtkWidget *view = NULL; PidginConversation *gtkconv = data; /* If we have a valid key for the conversation display, then exit */ @@ -1841,8 +1842,9 @@ return FALSE; } - gtk_widget_grab_focus(gtkconv->entry); - gtk_widget_event(gtkconv->entry, (GdkEvent *)event); + view = talkatu_editor_get_view(TALKATU_EDITOR(gtkconv->editor)); + gtk_widget_grab_focus(view); + gtk_widget_event(view, (GdkEvent *)event); return TRUE; } @@ -4344,6 +4346,7 @@ gtkconv->history_buffer = talkatu_history_buffer_new(); gtkconv->history = talkatu_history_new(); gtk_text_view_set_buffer(GTK_TEXT_VIEW(gtkconv->history), gtkconv->history_buffer); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->history), GTK_WRAP_WORD); gtk_container_add(GTK_CONTAINER(sw), gtkconv->history); if (chat) { @@ -4541,7 +4544,7 @@ g_signal_connect_swapped(G_OBJECT(pane), "focus", G_CALLBACK(gtk_widget_grab_focus), - gtkconv->entry); + gtkconv->editor); if (hidden) pidgin_conv_window_add_gtkconv(hidden_convwin, gtkconv); @@ -6368,10 +6371,10 @@ /* Compare two PurpleMessages, according to time in ascending order. */ static int -message_compare(gconstpointer p1, gconstpointer p2) -{ - const PurpleMessage *m1 = p1, *m2 = p2; - return (purple_message_get_time(m1) > purple_message_get_time(m2)); +message_compare(PurpleMessage *m1, PurpleMessage *m2) +{ + guint64 t1 = purple_message_get_time(m1), t2 = purple_message_get_time(m2); + return (t1 > t2) - (t1 < t2); } /* Adds some message history to the gtkconv. This happens in a idle-callback. */ @@ -6418,7 +6421,7 @@ msgs = g_list_prepend(msgs, msg); } } - msgs = g_list_sort(msgs, message_compare); + msgs = g_list_sort(msgs, (GCompareFunc)message_compare); for (; msgs; msgs = g_list_delete_link(msgs, msgs)) { PurpleMessage *msg = msgs->data; /* XXX: see above - should it be active_conv? */ @@ -6485,7 +6488,7 @@ pidgin_conv_attach(convs->data); list = g_list_concat(list, g_list_copy(purple_conversation_get_message_history(convs->data))); } - list = g_list_sort(list, message_compare); + list = g_list_sort(list, (GCompareFunc)message_compare); gtkconv->attach_current = list; list = g_list_last(list); } else if (PURPLE_IS_CHAT_CONVERSATION(conv)) {
--- a/pidgin/gtkstatusbox.c Sun Sep 15 03:54:08 2019 -0400 +++ b/pidgin/gtkstatusbox.c Tue Sep 17 02:20:47 2019 +0000 @@ -713,7 +713,7 @@ } static PurpleStatusType * -find_status_type_by_index(const PurpleAccount *account, gint active) +find_status_type_by_index(PurpleAccount *account, gint active) { GList *l = purple_account_get_status_types(account); gint i;
--- a/pidgin/gtkutils.c Sun Sep 15 03:54:08 2019 -0400 +++ b/pidgin/gtkutils.c Tue Sep 17 02:20:47 2019 +0000 @@ -1950,7 +1950,7 @@ gdk_pixbuf_get_file_info(filename, &width, &height); basename = g_path_get_basename(filename); - size = purple_str_size_to_units(st.st_size); + size = g_format_size(st.st_size); markup = g_strdup_printf(_("<b>File:</b> %s\n" "<b>File size:</b> %s\n" "<b>Image size:</b> %dx%d"),
--- a/pidgin/gtkxfer.c Sun Sep 15 03:54:08 2019 -0400 +++ b/pidgin/gtkxfer.c Tue Sep 17 02:20:47 2019 +0000 @@ -114,23 +114,24 @@ { double kb_sent, kb_rem; double kbps = 0.0; - time_t elapsed, now; - - now = purple_xfer_get_end_time(xfer); - if (now == 0) - now = time(NULL); + gint64 now; + gint64 elapsed = 0; - kb_sent = purple_xfer_get_bytes_sent(xfer) / 1024.0; - kb_rem = purple_xfer_get_bytes_remaining(xfer) / 1024.0; elapsed = purple_xfer_get_start_time(xfer); - if (elapsed > 0) + if (elapsed > 0) { + now = purple_xfer_get_end_time(xfer); + if (now == 0) { + now = g_get_monotonic_time(); + } elapsed = now - elapsed; - else - elapsed = 0; - kbps = (elapsed > 0 ? (kb_sent / elapsed) : 0); + } + + kb_sent = purple_xfer_get_bytes_sent(xfer) / 1000.0; + kb_rem = purple_xfer_get_bytes_remaining(xfer) / 1000.0; + kbps = (elapsed > 0 ? (kb_sent * G_USEC_PER_SEC) / elapsed : 0); if (kbsec != NULL) { - *kbsec = g_strdup_printf(_("%.2f KiB/s"), kbps); + *kbsec = g_strdup_printf(_("%.2f KB/s"), kbps); } if (time_elapsed != NULL) @@ -138,18 +139,15 @@ int h, m, s; int secs_elapsed; - if (purple_xfer_get_start_time(xfer) > 0) - { - secs_elapsed = now - purple_xfer_get_start_time(xfer); + if (purple_xfer_get_start_time(xfer) > 0) { + secs_elapsed = elapsed / G_USEC_PER_SEC; h = secs_elapsed / 3600; m = (secs_elapsed % 3600) / 60; s = secs_elapsed % 60; *time_elapsed = g_strdup_printf("%d:%02d:%02d", h, m, s); - } - else - { + } else { *time_elapsed = g_strdup(_("Not started")); } } @@ -861,8 +859,8 @@ type = purple_xfer_get_xfer_type(xfer); - size_str = purple_str_size_to_units(purple_xfer_get_size(xfer)); - remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer)); + size_str = g_format_size(purple_xfer_get_size(xfer)); + remaining_str = g_format_size(purple_xfer_get_bytes_remaining(xfer)); icon_name = (type == PURPLE_XFER_TYPE_RECEIVE ? "go-down" : "go-up"); @@ -992,8 +990,8 @@ } data->last_updated_time = current_time; - size_str = purple_str_size_to_units(purple_xfer_get_size(xfer)); - remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer)); + size_str = g_format_size(purple_xfer_get_size(xfer)); + remaining_str = g_format_size(purple_xfer_get_bytes_remaining(xfer)); gtk_list_store_set(xfer_dialog->model, &data->iter, COLUMN_PROGRESS, (gint)(purple_xfer_get_progress(xfer) * 100),
--- a/pidgin/pidginlog.c Sun Sep 15 03:54:08 2019 -0400 +++ b/pidgin/pidginlog.c Tue Sep 17 02:20:47 2019 +0000 @@ -646,7 +646,7 @@ /* Log size ************/ if(log_size) { - char *sz_txt = purple_str_size_to_units(log_size); + char *sz_txt = g_format_size(log_size); char *text = g_strdup_printf("<span weight='bold'>%s</span> %s", _("Total log size:"), sz_txt); gtk_label_set_markup(GTK_LABEL(lv->size_label), text);
--- a/pidgin/pidginmessage.c Sun Sep 15 03:54:08 2019 -0400 +++ b/pidgin/pidginmessage.c Tue Sep 17 02:20:47 2019 +0000 @@ -53,7 +53,7 @@ g_object_freeze_notify(G_OBJECT(msg)); g_object_notify_by_pspec(G_OBJECT(msg), properties[PROP_MESSAGE]); - g_object_notify_by_pspec(G_OBJECT(msg), properties[PROP_TIMESTAMP]); + g_object_notify(G_OBJECT(msg), "timestamp"); g_object_thaw_notify(G_OBJECT(msg)); } }
