Merged in default (pull request #690)
internal.h cleanups
Approved-by: Elliott Sales de Andrade
--- a/doc/reference/libpurple/meson.build Sun Jun 07 07:38:48 2020 +0000
+++ b/doc/reference/libpurple/meson.build Mon Jun 08 23:12:55 2020 +0000
@@ -9,6 +9,7 @@
# Extra options to supply to gtkdoc-scan.
--- a/finch/finch.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/finch.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/finch/gntaccount.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntaccount.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -36,8 +38,6 @@
--- a/finch/gntblist.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntblist.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,11 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/finch/gntconn.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntconn.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,9 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/finch/gntconv.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntconv.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,11 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/finch/gntdebug.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntdebug.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include <glib/gstdio.h> --- a/finch/gntidle.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntidle.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/finch/gntlog.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntlog.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -32,8 +35,6 @@
static GHashTable *log_viewers = NULL;
--- a/finch/gntmedia.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntmedia.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -30,8 +35,6 @@
/* An incredibly large part of the following is from gtkmedia.c */
--- a/finch/gntmedia.h Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntmedia.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,10 +30,6 @@
void finch_media_manager_init(void);
--- a/finch/gntmenuutil.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntmenuutil.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/finch/gntnotify.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntnotify.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -32,8 +34,6 @@
--- a/finch/gntplugin.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntplugin.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -32,8 +34,6 @@
--- a/finch/gntpounce.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntpounce.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -37,8 +39,6 @@
--- a/finch/gntprefs.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntprefs.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h>
--- a/finch/gntrequest.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntrequest.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -36,8 +38,6 @@
--- a/finch/gntroomlist.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntroomlist.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h>
--- a/finch/gntsound.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntsound.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h>
--- a/finch/gntstatus.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntstatus.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -34,8 +36,6 @@
--- a/finch/gntui.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntui.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h>
@@ -42,8 +47,6 @@
--- a/finch/gntxfer.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/gntxfer.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -30,7 +33,6 @@
--- a/finch/libfinch.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/libfinch.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include <glib/gstdio.h> --- a/finch/plugins/gntclipboard.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/plugins/gntclipboard.c Mon Jun 08 23:12:55 2020 +0000
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #define PLUGIN_ID "gntclipboard"
#define PLUGIN_DOMAIN (g_quark_from_static_string(PLUGIN_ID))
--- a/finch/plugins/gntgf.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/plugins/gntgf.c Mon Jun 08 23:12:55 2020 +0000
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
#define PLUGIN_STATIC_NAME GntGf
@@ -40,6 +38,8 @@
+#include <glib/gi18n-lib.h> --- a/finch/plugins/gnthistory.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/plugins/gnthistory.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,7 @@
/* Ripped from gtk/plugins/history.c */
+#include <glib/gi18n-lib.h> --- a/finch/plugins/gnttinyurl.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/plugins/gnttinyurl.c Mon Jun 08 23:12:55 2020 +0000
@@ -16,7 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include <libsoup/soup.h>
--- a/finch/plugins/grouping.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/plugins/grouping.c Mon Jun 08 23:12:55 2020 +0000
@@ -15,7 +15,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+#include <glib/gi18n-lib.h> --- a/finch/plugins/lastlog.c Sun Jun 07 07:38:48 2020 +0000
+++ b/finch/plugins/lastlog.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,8 @@
#define PLUGIN_STATIC_NAME GntLastlog
+#include <glib/gi18n-lib.h> --- a/libpurple/account.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/account.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,6 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -27,6 +30,7 @@
+#include "purpleprivate.h" --- a/libpurple/accounts.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/accounts.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,6 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -25,6 +28,7 @@
+#include "purpleprivate.h" static PurpleAccountUiOps *account_ui_ops = NULL;
@@ -223,14 +227,14 @@
switch (G_VALUE_TYPE(attr_value))
- g_hash_table_insert(attrs, id, (char *)value);+ g_hash_table_insert(attrs, (char *)id, (char *)value); if (sscanf(value, "%d", &v) == 1) {
- g_hash_table_insert(attrs, id, GINT_TO_POINTER(v));+ g_hash_table_insert(attrs, (char *)id, GINT_TO_POINTER(v)); --- a/libpurple/blistnode.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/blistnode.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,6 +22,9 @@
typedef struct _PurpleBlistNodePrivate PurpleBlistNodePrivate;
/* Private data of a buddy list node */
--- a/libpurple/buddyicon.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/buddyicon.c Mon Jun 08 23:12:55 2020 +0000
@@ -24,6 +24,7 @@
#include "conversation.h"
+#include "purpleprivate.h" /* NOTE: Instances of this struct are allocated without zeroing the memory, so
--- a/libpurple/buddylist.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/buddylist.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,6 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include "conversation.h"
@@ -28,6 +31,7 @@
+#include "purpleprivate.h" @@ -1980,6 +1984,11 @@
+purple_blist_get_default_group_name(void) { purple_blist_request_add_buddy(PurpleAccount *account, const char *username,
--- a/libpurple/buddylist.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/buddylist.h Mon Jun 08 23:12:55 2020 +0000
@@ -37,9 +37,10 @@
#define PURPLE_TYPE_BUDDY_LIST (purple_buddy_list_get_type())
typedef struct _PurpleBuddyList PurpleBuddyList;
-#define PURPLE_BLIST_DEFAULT_GROUP_NAME _("Buddies")+#define PURPLE_BLIST_DEFAULT_GROUP_NAME (purple_blist_get_default_group_name()) @@ -432,6 +433,17 @@
void purple_blist_walk(PurpleBlistWalkFunc group_func, PurpleBlistWalkFunc chat_func, PurpleBlistWalkFunc meta_contact_func, PurpleBlistWalkFunc contact_func, gpointer data);
+ * purple_blist_get_default_group_name: + * Gets the default group name for the buddy list. + * Returns: The name of the default group. +const gchar *purple_blist_get_default_group_name(void); /****************************************************************************************/
/* Buddy list file management API */
/****************************************************************************************/
--- a/libpurple/connection.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/connection.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -30,6 +32,7 @@
+#include "purpleprivate.h" #include "purpleprotocolfactory.h"
--- a/libpurple/contact.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/contact.c Mon Jun 08 23:12:55 2020 +0000
@@ -23,6 +23,7 @@
#include "internal.h" /* TODO: this needs to die */
+#include "purpleprivate.h" typedef struct _PurpleContactPrivate PurpleContactPrivate;
--- a/libpurple/conversation.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/conversation.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,6 +19,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -29,6 +32,7 @@
+#include "purpleprivate.h" --- a/libpurple/conversations.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/conversations.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include "purpleprivate.h" #include "conversations.h"
static GList *conversations = NULL;
--- a/libpurple/conversationtypes.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/conversationtypes.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,10 +19,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include "conversationtypes.h"
+#include "purpleprivate.h" #define SEND_TYPED_TIMEOUT_SECONDS 5
--- a/libpurple/core.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/core.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,6 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -35,6 +38,7 @@
+#include "purpleprivate.h" #include "savedstatuses.h"
#include "smiley-custom.h"
--- a/libpurple/enums.c.in Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/enums.c.in Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
-#endif /* HAVE_CONFIG_H */--- a/libpurple/group.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/group.c Mon Jun 08 23:12:55 2020 +0000
@@ -23,6 +23,7 @@
#include "internal.h" /* TODO: we need to kill this */
+#include "purpleprivate.h" typedef struct _PurpleGroupPrivate PurpleGroupPrivate;
--- a/libpurple/idle.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/idle.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/image.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/image.c Mon Jun 08 23:12:55 2020 +0000
@@ -23,6 +23,7 @@
--- a/libpurple/internal.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/internal.h Mon Jun 08 23:12:55 2020 +0000
@@ -28,21 +28,21 @@
* @title: Internal definitions and includes
+#if !defined(PURPLE_COMPILATION) +#error "internal.h included outside of libpurple" #ifndef GLIB_VERSION_MIN_REQUIRED
#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_28)
-/* for SIOCGIFCONF in SKYOS */-#include <net/sockios.h>-#include <glib/gi18n-lib.h>@@ -55,11 +55,13 @@
#define BUF_LONG BUF_LEN * 2
@@ -70,11 +72,11 @@
#ifdef HAVE_LANGINFO_CODESET
@@ -92,11 +94,8 @@
# define HOST_NAME_MAX 255
-#include <glib/gstdio.h>-#include "win32/win32dep.h"+# include "win32/win32dep.h" @@ -109,16 +108,6 @@
-#define PURPLE_STATIC_ASSERT(condition, message) \- { typedef char static_assertion_failed_ ## message \- [(condition) ? 1 : -1]; static_assertion_failed_ ## message dummy; \-/* This is meant to track use-after-free errors.- * TODO: it should be disabled in released code. */-#define PURPLE_ASSERT_CONNECTION_IS_VALID(gc) \- _purple_assert_connection_is_valid(gc, __FILE__, __LINE__) #define PURPLE_BEGIN_IGNORE_CAST_ALIGN \
@@ -145,232 +134,4 @@
- struct sockaddr_in6 in6;- struct sockaddr_storage storage;-#define PURPLE_WEBSITE "https://pidgin.im/"-#define PURPLE_DEVEL_WEBSITE "https://developer.pidgin.im/"-/* INTERNAL FUNCTIONS */- * _purple_account_set_current_error:- * @account: The account to set the error for.- * @new_err: The #PurpleConnectionErrorInfo instance representing the- * Sets an error for an account.-void _purple_account_set_current_error(PurpleAccount *account,- PurpleConnectionErrorInfo *new_err);- * _purple_account_to_xmlnode:- * @account: The account- * Get an XML description of an account.- * Returns: The XML description of the account.-PurpleXmlNode *_purple_account_to_xmlnode(PurpleAccount *account);- * _purple_blist_get_last_child:- * @node: The node whose last child is to be retrieved.- * Returns the last child of a particular node.- * Returns: The last child of the node.-PurpleBlistNode *_purple_blist_get_last_child(PurpleBlistNode *node);-/* This is for the accounts code to notify the buddy icon code that- * it's done loading. We may want to replace this with a signal. */-_purple_buddy_icons_account_loaded_cb(void);-/* This is for the buddy list to notify the buddy icon code that- * it's done loading. We may want to replace this with a signal. */-_purple_buddy_icons_blist_loaded_cb(void);- * _purple_connection_new:- * @account: The account the connection should be connecting to.- * @regist: Whether we are registering a new account or just- * trying to do a normal signon.- * @password: The password to use.- * Creates a connection to the specified account and either connects- * or attempts to register a new account. If you are logging in,- * the connection uses the current active status for this account.- * So if you want to sign on as "away," for example, you need to- * have called purple_account_set_status(account, "away").- * (And this will call purple_account_connect() automatically).- * Note: This function should only be called by purple_account_connect()- * in account.c. If you're trying to sign on an account, use that-void _purple_connection_new(PurpleAccount *account, gboolean regist,- * _purple_connection_new_unregister:- * @account: The account to unregister- * @password: The password to use.- * @cb: Optional callback to be called when unregistration is complete- * @user_data: user data to pass to the callback- * Tries to unregister the account on the server. If the account is not- * connected, also creates a new connection.- * Note: This function should only be called by purple_account_unregister()-void _purple_connection_new_unregister(PurpleAccount *account, const char *password,- PurpleAccountUnregistrationCb cb, void *user_data);- * _purple_connection_wants_to_die:- * @gc: The connection to check- * Checks if a connection is disconnecting, and should not attempt to reconnect.- * Note: This function should only be called by purple_account_set_enabled()-gboolean _purple_connection_wants_to_die(PurpleConnection *gc);- * _purple_connection_add_active_chat:- * @chat: The chat conversation to add- * Adds a chat to the active chats list of a connection- * Note: This function should only be called by purple_serv_got_joined_chat()-void _purple_connection_add_active_chat(PurpleConnection *gc,- PurpleChatConversation *chat);- * _purple_connection_remove_active_chat:- * @chat: The chat conversation to remove- * Removes a chat from the active chats list of a connection- * Note: This function should only be called by purple_serv_got_chat_left()-void _purple_connection_remove_active_chat(PurpleConnection *gc,- PurpleChatConversation *chat);- * _purple_conversations_update_cache:- * @conv: The conversation.- * @name: The new name. If no change, use %NULL.- * @account: The new account. If no change, use %NULL.- * Updates the conversation cache to use a new conversation name and/or- * account. This function only updates the conversation cache. It is the- * caller's responsibility to actually update the conversation.- * Note: This function should only be called by purple_conversation_set_name()- * and purple_conversation_set_account() in conversation.c.-void _purple_conversations_update_cache(PurpleConversation *conv,- const char *name, PurpleAccount *account);- * _purple_statuses_get_primitive_scores:- * Note: This function should only be called by- * purple_buddy_presence_compute_score() in presence.c.- * Returns: The primitive scores array from status.c.-int *_purple_statuses_get_primitive_scores(void);- * _purple_blist_get_localized_default_group_name:- * Returns the name of default group for previously used non-English- * localization. It's used for merging default group, in case when roster- * contains localized name.- * Please note, prpls shouldn't save default group name depending on current- * locale. So, this function is mostly for libpurple2 compatibility. And for- * improperly written prpls.-_purple_blist_get_localized_default_group_name(void);- * Sets most commonly used socket flags: O_NONBLOCK and FD_CLOEXEC.- * @param fd The file descriptor for the socket.- * @return TRUE if succeeded, FALSE otherwise.-_purple_network_set_common_socket_flags(int fd);- * A fstat alternative, like g_stat for stat.- * @param fd The file descriptor.- * @param st The stat buffer.- * @return the result just like for fstat.-_purple_fstat(int fd, GStatBuf *st);- * _purple_message_init: (skip)- * Initializes the #PurpleMessage subsystem.-_purple_message_init(void);- * _purple_message_uninit: (skip)- * Uninitializes the #PurpleMessage subsystem.-_purple_message_uninit(void);-_purple_assert_connection_is_valid(PurpleConnection *gc,- const gchar *file, int line);- * _purple_conversation_write_common:- * @conv: The conversation.- * Writes to a conversation window.- * This function should not be used to write IM or chat messages. Use- * purple_conversation_write_message() instead. This function will- * most likely call this anyway, but it may do it's own formatting,- * sound playback, etc. depending on whether the conversation is a chat or an- * See purple_conversation_write_message().-_purple_conversation_write_common(PurpleConversation *conv, PurpleMessage *msg); #endif /* PURPLE_INTERNAL_H */
--- a/libpurple/keyring.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/keyring.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,6 +20,8 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/log.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/log.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,10 +19,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include <glib/gstdio.h> +#include "glibcompat.h" /* for purple_g_stat on win32 */ -#include "glibcompat.h" /* for purple_g_stat on win32 */--- a/libpurple/media/backend-fs2.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/media/backend-fs2.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/media/backend-iface.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/media/backend-iface.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,6 +30,7 @@
--- a/libpurple/mediamanager.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/mediamanager.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/meson.build Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/meson.build Mon Jun 08 23:12:55 2020 +0000
@@ -258,6 +258,8 @@
libpurple = library('purple',
purple_coresources + purple_builtsources +
+ c_args : ['-DPURPLE_COMPILATION'], include_directories : [toplevel_inc, libpurple_inc],
version : PURPLE_LIB_VERSION,
--- a/libpurple/message.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/message.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,11 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" --- a/libpurple/message.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/message.h Mon Jun 08 23:12:55 2020 +0000
@@ -46,6 +46,11 @@
G_DECLARE_FINAL_TYPE(PurpleMessage, purple_message, PURPLE, MESSAGE, GObject)
+/* conversations.h depends on PurpleMessage and currently PurpleMessageFlag is +#include <conversation.h> * purple_message_new_outgoing:
* @who: Message's recipient.
--- a/libpurple/network.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/network.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,6 +20,7 @@
+#include "purpleprivate.h" --- a/libpurple/network.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/network.h Mon Jun 08 23:12:55 2020 +0000
@@ -31,6 +31,11 @@
+# include <netinet/in.h> +# include <sys/socket.h> /**************************************************************************/
--- a/libpurple/options.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/options.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,11 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> /******************************************************************************
--- a/libpurple/pluginpref.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/pluginpref.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,14 +19,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
#include "purplekeyvaluepair.h"
--- a/libpurple/plugins.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,12 +19,17 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> typedef struct _PurplePluginInfoPrivate PurplePluginInfoPrivate;
--- a/libpurple/plugins/autoaccept.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/autoaccept.c Mon Jun 08 23:12:55 2020 +0000
@@ -17,7 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+#include <glib/gi18n-lib.h> #define PLUGIN_ID "core-plugin_pack-autoaccept"
#define PLUGIN_NAME N_("Autoaccept")
--- a/libpurple/plugins/buddynote.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/buddynote.c Mon Jun 08 23:12:55 2020 +0000
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
+#include <glib/gi18n-lib.h> --- a/libpurple/plugins/codeinline.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/codeinline.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/plugins/debug_example.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/debug_example.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,10 +20,7 @@
-/* When writing a third-party plugin, do not include libpurple's internal.h- * included below. This file is for internal libpurple use only. We're including- * it here for our own convenience. */+#include <glib/gi18n-lib.h> /* This file includes all the libpurple headers */
--- a/libpurple/plugins/helloworld.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/helloworld.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,10 +21,7 @@
-/* When writing a third-party plugin, do not include libpurple's internal.h- * included below. This file is for internal libpurple use only. We're including- * it here for our own convenience. */+#include <glib/gi18n-lib.h> /* This file includes all the libpurple headers */
--- a/libpurple/plugins/idle.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/idle.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/plugins/joinpart.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/joinpart.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #define JOINPART_PLUGIN_ID "core-rlaager-joinpart"
--- a/libpurple/plugins/keyrings/internalkeyring.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/keyrings/internalkeyring.c Mon Jun 08 23:12:55 2020 +0000
@@ -24,7 +24,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/plugins/keyrings/kwallet/purplekwallet.cpp Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.cpp Mon Jun 08 23:12:55 2020 +0000
@@ -24,7 +24,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/plugins/keyrings/kwallet/purplekwallet.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.h Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,6 @@
* along with this program ; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/plugins/keyrings/secretservice.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/keyrings/secretservice.c Mon Jun 08 23:12:55 2020 +0000
@@ -32,7 +32,8 @@
* to resolve this if desired.
+#include <glib/gi18n-lib.h> #include <libsecret/secret.h>
--- a/libpurple/plugins/log_reader.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/log_reader.c Mon Jun 08 23:12:55 2020 +0000
@@ -15,8 +15,11 @@
+#include <glib/gstdio.h> +#include <glib/gi18n-lib.h> --- a/libpurple/plugins/notify_example.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/notify_example.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,10 +20,7 @@
-/* When writing a third-party plugin, do not include libpurple's internal.h- * included below. This file is for internal libpurple use only. We're including- * it here for our own convenience. */+#include <glib/gi18n-lib.h> /* This file includes all the libpurple headers */
--- a/libpurple/plugins/offlinemsg.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/offlinemsg.c Mon Jun 08 23:12:55 2020 +0000
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+#include <glib/gi18n-lib.h> #define PLUGIN_ID "core-plugin_pack-offlinemsg"
#define PLUGIN_NAME N_("Offline Message Emulation")
--- a/libpurple/plugins/one_time_password.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/one_time_password.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+#include <glib/gi18n-lib.h> #define PLUGIN_ID "core-one_time_password"
--- a/libpurple/plugins/pluginpref_example.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/pluginpref_example.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,10 +19,7 @@
-/* When writing a third-party plugin, do not include libpurple's internal.h- * included below. This file is for internal libpurple use only. We're including- * it here for our own convenience. */+#include <glib/gi18n-lib.h> /* This file includes all the libpurple headers */
--- a/libpurple/plugins/psychic.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/psychic.c Mon Jun 08 23:12:55 2020 +0000
@@ -15,7 +15,8 @@
+#include <glib/gi18n-lib.h> #define PLUGIN_ID "core-psychic"
--- a/libpurple/plugins/signals-test.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/signals-test.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
#define SIGNAL_TEST_PLUGIN_ID "core-signals-test"
+#include <glib/gi18n-lib.h> --- a/libpurple/plugins/simple.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/simple.c Mon Jun 08 23:12:55 2020 +0000
@@ -15,7 +15,8 @@
+#include <glib/gi18n-lib.h> /** Plugin id : type-author-name (to guarantee uniqueness) */
--- a/libpurple/plugins/statenotify.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/statenotify.c Mon Jun 08 23:12:55 2020 +0000
@@ -15,7 +15,8 @@
+#include <glib/gi18n-lib.h> #define STATENOTIFY_PLUGIN_ID "core-statenotify"
--- a/libpurple/plugins/test-request-input.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/plugins/test-request-input.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,8 @@
+#include <glib/gi18n-lib.h>
#define PREF_ROOT "/plugins"
--- a/libpurple/prefs.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/prefs.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,16 +21,15 @@
--- a/libpurple/presence.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/presence.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,9 +18,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" /**************************************************************************
--- a/libpurple/protocol.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocol.h Mon Jun 08 23:12:55 2020 +0000
@@ -41,6 +41,7 @@
#include "conversations.h"
--- a/libpurple/protocols.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,6 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include "conversation.h"
--- a/libpurple/protocols/bonjour/bonjour.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,6 +19,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -30,7 +33,6 @@
#include "dns_sd_proxy.h"
@@ -52,6 +54,11 @@
+bonjour_get_group_name(void) { bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group)
--- a/libpurple/protocols/bonjour/bonjour.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/bonjour/bonjour.h Mon Jun 08 23:12:55 2020 +0000
@@ -28,13 +28,12 @@
-#define BONJOUR_GROUP_NAME _("Bonjour")+#define BONJOUR_GROUP_NAME (bonjour_get_group_name()) #define BONJOUR_PROTOCOL_NAME "bonjour"
#define BONJOUR_ICON_NAME "bonjour"
@@ -79,4 +78,6 @@
const char *bonjour_get_jid(PurpleAccount *account);
+const gchar *bonjour_get_group_name(void); #endif /* PURPLE_BONJOUR_BONJOUR_H */
--- a/libpurple/protocols/bonjour/bonjour_ft.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/bonjour/bonjour_ft.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+# include <sys/socket.h> +#include "purpleprivate.h" --- a/libpurple/protocols/bonjour/buddy.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/bonjour/buddy.c Mon Jun 08 23:12:55 2020 +0000
@@ -17,7 +17,6 @@
--- a/libpurple/protocols/bonjour/mdns_avahi.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/bonjour/mdns_avahi.c Mon Jun 08 23:12:55 2020 +0000
@@ -14,7 +14,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
#include "mdns_interface.h"
--- a/libpurple/protocols/bonjour/mdns_common.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/bonjour/mdns_common.c Mon Jun 08 23:12:55 2020 +0000
@@ -16,7 +16,6 @@
--- a/libpurple/protocols/bonjour/parser.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/bonjour/parser.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
#include <libxml/parser.h>
--- a/libpurple/protocols/bonjour/xmpp.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/bonjour/xmpp.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" --- a/libpurple/protocols/facebook/api.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/facebook/api.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include <json-glib/json-glib.h>
#include <libsoup/soup.h>
--- a/libpurple/protocols/facebook/api.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/facebook/api.h Mon Jun 08 23:12:55 2020 +0000
@@ -31,8 +31,6 @@
* The API for interacting with the Facebook Messenger protocol.
--- a/libpurple/protocols/facebook/facebook.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/facebook/facebook.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/facebook/http.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/facebook/http.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/facebook/json.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/facebook/json.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/facebook/mqtt.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/facebook/mqtt.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include <glib/gprintf.h>
--- a/libpurple/protocols/facebook/util.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/facebook/util.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/gg/account.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/account.h Mon Jun 08 23:12:55 2020 +0000
@@ -32,7 +32,7 @@
#error "This file is outdated"
--- a/libpurple/protocols/gg/avatar.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/avatar.c Mon Jun 08 23:12:55 2020 +0000
@@ -33,6 +33,8 @@
#include "oauth/oauth-purple.h"
+#include "purpleprivate.h" #define GGP_AVATAR_USERAGENT "GG Client build 11.0.0.7562"
--- a/libpurple/protocols/gg/avatar.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/avatar.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef PURPLE_GG_AVATAR_H
#define PURPLE_GG_AVATAR_H
typedef struct _ggp_avatar_session_data ggp_avatar_session_data;
--- a/libpurple/protocols/gg/chat.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/chat.c Mon Jun 08 23:12:55 2020 +0000
@@ -25,6 +25,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/gg/chat.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/chat.h Mon Jun 08 23:12:55 2020 +0000
@@ -29,7 +29,7 @@
typedef struct _ggp_chat_session_data ggp_chat_session_data;
--- a/libpurple/protocols/gg/edisc.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/edisc.c Mon Jun 08 23:12:55 2020 +0000
@@ -33,6 +33,10 @@
#include <json-glib/json-glib.h>
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" #define GGP_EDISC_OS "WINNT x86-msvc"
#define GGP_EDISC_TYPE "desktop"
#define GGP_EDISC_API "6"
--- a/libpurple/protocols/gg/edisc.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/edisc.h Mon Jun 08 23:12:55 2020 +0000
@@ -29,7 +29,7 @@
#ifndef PURPLE_GG_EDISC_H
#define PURPLE_GG_EDISC_H
typedef struct _ggp_edisc_session_data ggp_edisc_session_data;
--- a/libpurple/protocols/gg/gg.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/gg.c Mon Jun 08 23:12:55 2020 +0000
@@ -26,9 +26,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" --- a/libpurple/protocols/gg/gg.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/gg.h Mon Jun 08 23:12:55 2020 +0000
@@ -29,7 +29,6 @@
#include <libsoup/soup.h>
--- a/libpurple/protocols/gg/html.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/html.h Mon Jun 08 23:12:55 2020 +0000
@@ -29,7 +29,7 @@
--- a/libpurple/protocols/gg/image-prpl.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/image-prpl.c Mon Jun 08 23:12:55 2020 +0000
@@ -27,12 +27,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> -#include <image-store.h> struct _ggp_image_session_data
--- a/libpurple/protocols/gg/image-prpl.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/image-prpl.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef PURPLE_GG_IMAGE_PRPL_H
#define PURPLE_GG_IMAGE_PRPL_H
#define GGP_IMAGE_SIZE_MAX 255000
--- a/libpurple/protocols/gg/libgadu-events.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/libgadu-events.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef PURPLE_GG_LIBGADU_EVENTS_H
#define PURPLE_GG_LIBGADU_EVENTS_H
--- a/libpurple/protocols/gg/libgaduw.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/libgaduw.c Mon Jun 08 23:12:55 2020 +0000
@@ -32,6 +32,8 @@
static void ggp_libgaduw_debug_handler(int level, const char * format,
--- a/libpurple/protocols/gg/libgaduw.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/libgaduw.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef PURPLE_GG_LIBGADUW_H
#define PURPLE_GG_LIBGADUW_H
--- a/libpurple/protocols/gg/message-prpl.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/message-prpl.c Mon Jun 08 23:12:55 2020 +0000
@@ -25,6 +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
+#include <glib/gi18n-lib.h> #include "message-prpl.h"
--- a/libpurple/protocols/gg/message-prpl.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/message-prpl.h Mon Jun 08 23:12:55 2020 +0000
@@ -29,7 +29,7 @@
#ifndef PURPLE_GG_MESSAGE_PRPL_H
#define PURPLE_GG_MESSAGE_PRPL_H
typedef struct _ggp_message_session_data ggp_message_session_data;
--- a/libpurple/protocols/gg/multilogon.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/multilogon.c Mon Jun 08 23:12:55 2020 +0000
@@ -29,6 +29,8 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/gg/multilogon.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/multilogon.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef PURPLE_GG_MULTILOGON_H
#define PURPLE_GG_MULTILOGON_H
typedef struct _ggp_multilogon_session_data ggp_multilogon_session_data;
--- a/libpurple/protocols/gg/oauth/oauth-parameter.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth-parameter.c Mon Jun 08 23:12:55 2020 +0000
@@ -25,6 +25,8 @@
#include "oauth-parameter.h"
struct gg_oauth_parameter {
--- a/libpurple/protocols/gg/oauth/oauth-parameter.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth-parameter.h Mon Jun 08 23:12:55 2020 +0000
@@ -26,8 +26,6 @@
#ifndef _GGP_OAUTH_PARAMETER_H
#define _GGP_OAUTH_PARAMETER_H
typedef struct gg_oauth_parameter gg_oauth_parameter_t;
int gg_oauth_parameter_set(gg_oauth_parameter_t **list, const char *key, const char *value);
--- a/libpurple/protocols/gg/oauth/oauth-purple.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth-purple.c Mon Jun 08 23:12:55 2020 +0000
@@ -35,6 +35,7 @@
+#include "purpleprivate.h" #define GGP_OAUTH_RESPONSE_MAX 10240
--- a/libpurple/protocols/gg/oauth/oauth-purple.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth-purple.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef _GGP_OAUTH_PURPLE_H
#define _GGP_OAUTH_PURPLE_H
typedef void (*ggp_oauth_request_cb)(PurpleConnection *gc, const gchar *token,
--- a/libpurple/protocols/gg/oauth/oauth.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth.c Mon Jun 08 23:12:55 2020 +0000
@@ -27,6 +27,10 @@
#include "oauth-parameter.h"
char *gg_oauth_static_nonce; /* dla unit testów */
char *gg_oauth_static_timestamp; /* dla unit testów */
--- a/libpurple/protocols/gg/oauth/oauth.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth.h Mon Jun 08 23:12:55 2020 +0000
@@ -26,7 +26,6 @@
char * gg_oauth_generate_header(const char *method, const char *url,
--- a/libpurple/protocols/gg/pubdir-prpl.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/pubdir-prpl.c Mon Jun 08 23:12:55 2020 +0000
@@ -27,6 +27,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -35,6 +37,8 @@
+#include "purpleprivate.h" --- a/libpurple/protocols/gg/pubdir-prpl.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/pubdir-prpl.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef PURPLE_GG_PUBDIR_PRPL_H
#define PURPLE_GG_PUBDIR_PRPL_H
--- a/libpurple/protocols/gg/purplew.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/purplew.c Mon Jun 08 23:12:55 2020 +0000
@@ -31,6 +31,8 @@
+#include <glib/gi18n-lib.h> guint ggp_purplew_http_input_add(struct gg_http *http_req,
PurpleInputFunction func, gpointer user_data)
--- a/libpurple/protocols/gg/purplew.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/purplew.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef PURPLE_GG_PURPLEW_H
#define PURPLE_GG_PURPLEW_H
--- a/libpurple/protocols/gg/resolver-purple.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/resolver-purple.c Mon Jun 08 23:12:55 2020 +0000
@@ -27,7 +27,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
#include "resolver-purple.h"
--- a/libpurple/protocols/gg/roster.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/roster.c Mon Jun 08 23:12:55 2020 +0000
@@ -29,11 +29,15 @@
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" #define GGP_ROSTER_SYNC_SETT "gg-synchronized"
#define GGP_ROSTER_DEBUG 0
#define GGP_ROSTER_GROUPID_DEFAULT "00000000-0000-0000-0000-000000000000"
--- a/libpurple/protocols/gg/roster.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/roster.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef PURPLE_GG_ROSTER_H
#define PURPLE_GG_ROSTER_H
--- a/libpurple/protocols/gg/servconn.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/servconn.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,6 @@
#ifndef PURPLE_GG_SERVCONN_H
#define PURPLE_GG_SERVCONN_H
void ggp_servconn_setup(PurpleAccountOption *server_option);
--- a/libpurple/protocols/gg/status.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/status.c Mon Jun 08 23:12:55 2020 +0000
@@ -27,10 +27,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/gg/status.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/status.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,7 @@
#ifndef PURPLE_GG_STATUS_H
#define PURPLE_GG_STATUS_H
typedef struct _ggp_status_session_data ggp_status_session_data;
--- a/libpurple/protocols/gg/tcpsocket.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/tcpsocket.c Mon Jun 08 23:12:55 2020 +0000
@@ -29,6 +29,9 @@
+#include "purpleprivate.h" GCancellable *cancellable;
--- a/libpurple/protocols/gg/tcpsocket.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/tcpsocket.h Mon Jun 08 23:12:55 2020 +0000
@@ -29,7 +29,7 @@
#ifndef PURPLE_GG_TCPSOCKET_H
#define PURPLE_GG_TCPSOCKET_H
--- a/libpurple/protocols/gg/utils.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/utils.c Mon Jun 08 23:12:55 2020 +0000
@@ -31,6 +31,8 @@
uin_t ggp_str_to_uin(const char *str)
--- a/libpurple/protocols/gg/utils.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/utils.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,10 +30,11 @@
#ifndef PURPLE_GG_UTILS_H
#define PURPLE_GG_UTILS_H
#include <json-glib/json-glib.h>
* Converts stringified UIN to uin_t.
--- a/libpurple/protocols/gg/validator.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/validator.c Mon Jun 08 23:12:55 2020 +0000
@@ -31,6 +31,8 @@
+#include <glib/gi18n-lib.h> gboolean ggp_validator_password(PurpleRequestField *field, gchar **errmsg,
--- a/libpurple/protocols/gg/validator.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/validator.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,6 @@
#ifndef PURPLE_GG_VALIDATOR_H
#define PURPLE_GG_VALIDATOR_H
gboolean ggp_validator_password(PurpleRequestField *field, gchar **errmsg,
--- a/libpurple/protocols/gg/xml.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/gg/xml.h Mon Jun 08 23:12:55 2020 +0000
@@ -30,7 +30,6 @@
gboolean ggp_xml_get_string(const PurpleXmlNode *xml, gchar *childName, gchar **var);
--- a/libpurple/protocols/irc/cmds.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/irc/cmds.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/irc/dcc_send.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/irc/dcc_send.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,8 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" --- a/libpurple/protocols/irc/irc.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/irc/irc.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/irc/msgs.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/irc/msgs.c Mon Jun 08 23:12:55 2020 +0000
@@ -24,7 +24,10 @@
* possible for a malicious server or man-in-the-middle to trigger a crash.
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/irc/parse.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/irc/parse.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/adhoccommands.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/adhoccommands.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,8 @@
+#include <glib/gi18n-lib.h> #include "adhoccommands.h"
--- a/libpurple/protocols/jabber/auth.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/auth.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -30,6 +31,8 @@
+#include "purpleprivate.h" static GSList *auth_mechs = NULL;
static void auth_old_result_cb(JabberStream *js, const char *from,
--- a/libpurple/protocols/jabber/auth_cyrus.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,9 +20,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" --- a/libpurple/protocols/jabber/auth_digest_md5.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/auth_digest_md5.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include "auth_digest_md5.h"
--- a/libpurple/protocols/jabber/auth_digest_md5.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/auth_digest_md5.h Mon Jun 08 23:12:55 2020 +0000
@@ -25,8 +25,6 @@
#ifndef PURPLE_JABBER_AUTH_DIGEST_MD5_H
#define PURPLE_JABBER_AUTH_DIGEST_MD5_H
* Every function in this file is ONLY exposed for tests.
* DO NOT USE ANYTHING HERE OR YOU WILL BE SENT TO THE PIT OF DESPAIR.
--- a/libpurple/protocols/jabber/auth_plain.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/auth_plain.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/auth_scram.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/auth_scram.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/auth_webex.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/auth_webex.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/protocols/jabber/bosh.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/bosh.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include <libsoup/soup.h>
--- a/libpurple/protocols/jabber/buddy.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/buddy.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/caps.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/caps.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,8 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/chat.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/chat.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/chat.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/chat.h Mon Jun 08 23:12:55 2020 +0000
@@ -25,7 +25,6 @@
#ifndef PURPLE_JABBER_CHAT_H
#define PURPLE_JABBER_CHAT_H
--- a/libpurple/protocols/jabber/data.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/data.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,7 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/disco.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/disco.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,6 @@
#include "adhoccommands.h"
--- a/libpurple/protocols/jabber/google/gmail.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/google/gmail.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/protocols/jabber/google/google.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/google/google.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/protocols/jabber/google/google_p2p.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/google/google_p2p.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,7 +22,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/protocols/jabber/google/google_presence.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/google/google_presence.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
#include "google_presence.h"
--- a/libpurple/protocols/jabber/google/google_roster.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/google/google_roster.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
#include "google_roster.h"
--- a/libpurple/protocols/jabber/google/google_session.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/google/google_session.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
#include "google_session.h"
--- a/libpurple/protocols/jabber/google/jingleinfo.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/google/jingleinfo.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/google/relay.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/google/relay.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/gtalk.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/gtalk.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/ibb.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/ibb.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,8 @@
--- a/libpurple/protocols/jabber/iq.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/iq.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/jabber.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/jabber.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" --- a/libpurple/protocols/jabber/jingle/content.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/content.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,7 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/jingle/iceudp.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/iceudp.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,7 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/jingle/jingle.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.c Mon Jun 08 23:12:55 2020 +0000
@@ -23,7 +23,6 @@
--- a/libpurple/protocols/jabber/jingle/rawudp.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/rawudp.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,7 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/jingle/rtp.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,10 +22,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/jingle/session.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/session.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,7 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/jingle/transport.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/transport.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,7 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/jutil.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/jutil.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/message.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/message.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include "adhoccommands.h"
--- a/libpurple/protocols/jabber/oob.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/oob.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/protocols/jabber/parser.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/parser.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include <libxml/parser.h>
--- a/libpurple/protocols/jabber/pep.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/pep.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,7 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/ping.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/ping.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,7 +22,6 @@
--- a/libpurple/protocols/jabber/presence.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/presence.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> @@ -32,6 +33,8 @@
#include "adhoccommands.h"
+#include "purpleprivate.h" --- a/libpurple/protocols/jabber/roster.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/roster.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include "purpleprivate.h" --- a/libpurple/protocols/jabber/si.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/si.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,8 +22,17 @@
+# include <sys/socket.h> +#include <glib/gi18n-lib.h> +#include "purpleprivate.h" --- a/libpurple/protocols/jabber/useravatar.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/useravatar.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,14 @@
+#include <glib/gi18n-lib.h> #include <libsoup/soup.h>
--- a/libpurple/protocols/jabber/usermood.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/usermood.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,8 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/usernick.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/usernick.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,8 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/usertune.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/usertune.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,6 @@
--- a/libpurple/protocols/jabber/xdata.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/xdata.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/jabber/xmpp.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/jabber/xmpp.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/novell/nmuser.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/novell/nmuser.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,8 @@
+#include <glib/gi18n-lib.h> --- a/libpurple/protocols/novell/novell.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/novell/novell.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,12 @@
+#include <glib/gi18n-lib.h> +# include <sys/utsname.h> --- a/libpurple/protocols/null/nullprpl.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/null/nullprpl.c Mon Jun 08 23:12:55 2020 +0000
@@ -45,12 +45,8 @@
+#include <glib/gi18n-lib.h> -/* If you're using this as the basis of a protocol that will be distributed- * separately from libpurple, remove the internal.h include below and replace- * it with code to include your own config.h or similar. If you're going to- * provide for translation, you'll also need to setup the gettext macros. */--- a/libpurple/protocols/sametime/im_mime.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/sametime/im_mime.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,8 +21,6 @@
--- a/libpurple/protocols/sametime/sametime.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/sametime/sametime.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,10 @@
+#include <glib/gi18n-lib.h> +#define BUF_LONG (BUF_LEN * 2) @@ -29,6 +32,7 @@
+#include <glib/gstdio.h> --- a/libpurple/protocols/simple/http.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/simple/http.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,6 @@
--- a/libpurple/protocols/simple/ntlm.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/simple/ntlm.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/protocols/simple/simple.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/simple/simple.c Mon Jun 08 23:12:55 2020 +0000
@@ -22,8 +22,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" --- a/libpurple/protocols/simple/sipmsg.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/simple/sipmsg.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/protocols/zephyr/ZVariables.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/zephyr/ZVariables.c Mon Jun 08 23:12:55 2020 +0000
@@ -9,7 +9,9 @@
-#include "libpurple/internal.h"+#include <glib/gstdio.h> --- a/libpurple/protocols/zephyr/sysdep.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/zephyr/sysdep.h Mon Jun 08 23:12:55 2020 +0000
@@ -11,7 +11,10 @@
#ifndef PURPLE_ZEPHYR_SYSDEP_H
#define PURPLE_ZEPHYR_SYSDEP_H
--- a/libpurple/protocols/zephyr/zephyr.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c Mon Jun 08 23:12:55 2020 +0000
@@ -26,10 +26,18 @@
-#include "libpurple/internal.h"+#include <glib/gi18n-lib.h> +#include <glib/gstdio.h> @@ -37,6 +45,8 @@
#define ZEPHYR_FALLBACK_CHARSET "ISO-8859-1"
/* these are deliberately high, since most people don't send multiple "PING"s */
#define ZEPHYR_TYPING_SEND_TIMEOUT 15
#define ZEPHYR_TYPING_RECV_TIMEOUT 10
--- a/libpurple/protocols/zephyr/zephyr_internal.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/protocols/zephyr/zephyr_internal.h Mon Jun 08 23:12:55 2020 +0000
@@ -11,7 +11,9 @@
#ifndef PURPLE_ZEPHYR_ZEPHYR_INTERNAL_H
#define PURPLE_ZEPHYR_ZEPHYR_INTERNAL_H
--- a/libpurple/proxy.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/proxy.c Mon Jun 08 23:12:55 2020 +0000
@@ -25,6 +25,8 @@
, 2nd provide an easy way to add socks support
, 3rd draw women to it like flies to honey */
+#include <glib/gi18n-lib.h> --- a/libpurple/purple.h.in Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/purple.h.in Mon Jun 08 23:12:55 2020 +0000
@@ -35,10 +35,12 @@
+#ifndef PURPLE_GLOBAL_HEADER_INSIDE +#define PURPLE_GLOBAL_HEADER_INSIDE +#undef PURPLE_GLOBAL_HEADER_INSIDE #endif /* PURPLE_PURPLE_H */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/purpleprivate.h Mon Jun 08 23:12:55 2020 +0000
@@ -0,0 +1,265 @@
+ * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +#ifndef PURPLE_PRIVATE_H +#define PURPLE_PRIVATE_H +#include <glib/gstdio.h> +#define PURPLE_STATIC_ASSERT(condition, message) \ + { typedef char static_assertion_failed_ ## message \ + [(condition) ? 1 : -1]; static_assertion_failed_ ## message dummy; \ +/* This is meant to track use-after-free errors. + * TODO: it should be disabled in released code. */ +#define PURPLE_ASSERT_CONNECTION_IS_VALID(gc) \ + _purple_assert_connection_is_valid(gc, __FILE__, __LINE__) + struct sockaddr_in6 in6; + struct sockaddr_storage storage; + * _purple_account_set_current_error: + * @account: The account to set the error for. + * @new_err: The #PurpleConnectionErrorInfo instance representing the + * Sets an error for an account. +void _purple_account_set_current_error(PurpleAccount *account, + PurpleConnectionErrorInfo *new_err); + * _purple_account_to_xmlnode: + * @account: The account + * Get an XML description of an account. + * Returns: The XML description of the account. +PurpleXmlNode *_purple_account_to_xmlnode(PurpleAccount *account); + * _purple_blist_get_last_child: + * @node: The node whose last child is to be retrieved. + * Returns the last child of a particular node. + * Returns: The last child of the node. +PurpleBlistNode *_purple_blist_get_last_child(PurpleBlistNode *node); +/* This is for the accounts code to notify the buddy icon code that + * it's done loading. We may want to replace this with a signal. */ +_purple_buddy_icons_account_loaded_cb(void); +/* This is for the buddy list to notify the buddy icon code that + * it's done loading. We may want to replace this with a signal. */ +_purple_buddy_icons_blist_loaded_cb(void); + * _purple_connection_new: + * @account: The account the connection should be connecting to. + * @regist: Whether we are registering a new account or just + * trying to do a normal signon. + * @password: The password to use. + * Creates a connection to the specified account and either connects + * or attempts to register a new account. If you are logging in, + * the connection uses the current active status for this account. + * So if you want to sign on as "away," for example, you need to + * have called purple_account_set_status(account, "away"). + * (And this will call purple_account_connect() automatically). + * Note: This function should only be called by purple_account_connect() + * in account.c. If you're trying to sign on an account, use that +void _purple_connection_new(PurpleAccount *account, gboolean regist, + * _purple_connection_new_unregister: + * @account: The account to unregister + * @password: The password to use. + * @cb: Optional callback to be called when unregistration is complete + * @user_data: user data to pass to the callback + * Tries to unregister the account on the server. If the account is not + * connected, also creates a new connection. + * Note: This function should only be called by purple_account_unregister() +void _purple_connection_new_unregister(PurpleAccount *account, const char *password, + PurpleAccountUnregistrationCb cb, void *user_data); + * _purple_connection_wants_to_die: + * @gc: The connection to check + * Checks if a connection is disconnecting, and should not attempt to reconnect. + * Note: This function should only be called by purple_account_set_enabled() +gboolean _purple_connection_wants_to_die(PurpleConnection *gc); + * _purple_connection_add_active_chat: + * @chat: The chat conversation to add + * Adds a chat to the active chats list of a connection + * Note: This function should only be called by purple_serv_got_joined_chat() +void _purple_connection_add_active_chat(PurpleConnection *gc, + PurpleChatConversation *chat); + * _purple_connection_remove_active_chat: + * @chat: The chat conversation to remove + * Removes a chat from the active chats list of a connection + * Note: This function should only be called by purple_serv_got_chat_left() +void _purple_connection_remove_active_chat(PurpleConnection *gc, + PurpleChatConversation *chat); + * _purple_conversations_update_cache: + * @conv: The conversation. + * @name: The new name. If no change, use %NULL. + * @account: The new account. If no change, use %NULL. + * Updates the conversation cache to use a new conversation name and/or + * account. This function only updates the conversation cache. It is the + * caller's responsibility to actually update the conversation. + * Note: This function should only be called by purple_conversation_set_name() + * and purple_conversation_set_account() in conversation.c. +void _purple_conversations_update_cache(PurpleConversation *conv, + const char *name, PurpleAccount *account); + * _purple_statuses_get_primitive_scores: + * Note: This function should only be called by + * purple_buddy_presence_compute_score() in presence.c. + * Returns: The primitive scores array from status.c. +int *_purple_statuses_get_primitive_scores(void); + * _purple_blist_get_localized_default_group_name: + * Returns the name of default group for previously used non-English + * localization. It's used for merging default group, in case when roster + * contains localized name. + * Please note, prpls shouldn't save default group name depending on current + * locale. So, this function is mostly for libpurple2 compatibility. And for + * improperly written prpls. +_purple_blist_get_localized_default_group_name(void); + * Sets most commonly used socket flags: O_NONBLOCK and FD_CLOEXEC. + * @param fd The file descriptor for the socket. + * @return TRUE if succeeded, FALSE otherwise. +_purple_network_set_common_socket_flags(int fd); + * A fstat alternative, like g_stat for stat. + * @param fd The file descriptor. + * @param st The stat buffer. + * @return the result just like for fstat. +_purple_fstat(int fd, GStatBuf *st); + * _purple_message_init: (skip) + * Initializes the #PurpleMessage subsystem. +_purple_message_init(void); + * _purple_message_uninit: (skip) + * Uninitializes the #PurpleMessage subsystem. +_purple_message_uninit(void); +_purple_assert_connection_is_valid(PurpleConnection *gc, + const gchar *file, int line); + * _purple_conversation_write_common: + * @conv: The conversation. + * Writes to a conversation window. + * This function should not be used to write IM or chat messages. Use + * purple_conversation_write_message() instead. This function will + * most likely call this anyway, but it may do it's own formatting, + * sound playback, etc. depending on whether the conversation is a chat or an + * See purple_conversation_write_message(). +_purple_conversation_write_common(PurpleConversation *conv, PurpleMessage *msg); +#endif /* PURPLE_PRIVATE_H */ --- a/libpurple/request.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/request.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/request.h Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/request.h Mon Jun 08 23:12:55 2020 +0000
@@ -29,8 +29,9 @@
#include "conversation.h"
#include "request-datasheet.h"
--- a/libpurple/savedstatuses.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/savedstatuses.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,6 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/libpurple/server.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/server.c Mon Jun 08 23:12:55 2020 +0000
@@ -23,6 +23,8 @@
/* This file is the fullcrap */
+#include <glib/gi18n-lib.h> #include "conversation.h"
@@ -31,6 +33,7 @@
+#include "purpleprivate.h" --- a/libpurple/status.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/status.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" --- a/libpurple/util.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/util.c Mon Jun 08 23:12:55 2020 +0000
@@ -16,7 +16,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include "purpleprivate.h" #include "conversation.h"
--- a/libpurple/xfer.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/xfer.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include "glibcompat.h" /* for purple_g_stat on win32 */
+#include <glib/gstdio.h> --- a/libpurple/xmlnode.c Sun Jun 07 07:38:48 2020 +0000
+++ b/libpurple/xmlnode.c Mon Jun 08 23:12:55 2020 +0000
@@ -24,6 +24,8 @@
* write my own stuff. Also, re-writing this lets me be as lightweight
* as I want to be. Thank you libxode for giving me a good starting point */
+#include <glib/gi18n-lib.h> --- a/meson.build Sun Jun 07 07:38:48 2020 +0000
+++ b/meson.build Mon Jun 08 23:12:55 2020 +0000
@@ -37,12 +37,20 @@
purple_minor_version = parts[1]
purple_micro_version = parts[2]
-add_project_arguments('-DHAVE_CONFIG_H=1', language : 'c')+GETTEXT_PACKAGE=meson.project_name() + '-DVERSION="@0@"'.format(meson.project_version()), + '-DDISPLAY_VERSION="@0@"'.format(meson.project_version()), + '-DPURPLE_WEBSITE="https://pidgin.im"', + '-DGETTEXT_PACKAGE="@0@"'.format(GETTEXT_PACKAGE)], conf = configuration_data()
man_conf = configuration_data()
version_conf = configuration_data()
-conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())+conf.set_quoted('GETTEXT_PACKAGE', GETTEXT_PACKAGE) conf.set_quoted('PACKAGE', meson.project_name())
conf.set_quoted('PACKAGE_NAME', meson.project_name())
conf.set_quoted('VERSION', meson.project_version())
@@ -607,7 +615,12 @@
# Ensure C++ compiler works
cxx_compiler = meson.get_compiler('cpp')
- add_project_arguments('-DHAVE_CONFIG_H=1', language : 'cpp')+ add_project_arguments([ + '-DDISPLAY_VERSION="@0@"'.format(meson.project_version()), + '-DPURPLE_WEBSITE="https://pidgin.im"', + '-DGETTEXT_PACKAGE="@0@"'.format(GETTEXT_PACKAGE)], --- a/pidgin/gtkaccount.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkaccount.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/gtkblist-theme-loader.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkblist-theme-loader.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/pidgin/gtkblist-theme.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkblist-theme.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
#include "gtkblist-theme.h"
/******************************************************************************
--- a/pidgin/gtkblist.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkblist.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/gtkconn.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkconn.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/pidgin/gtkconv.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkconv.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,15 @@
+#include <glib/gi18n-lib.h> +#include <glib/gstdio.h> @@ -33,6 +41,8 @@
#include "gtkdnd-hints.h"
@@ -6782,7 +6792,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/pidgin/gtkdialogs.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkdialogs.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h>
#include "package_revision.h"
--- a/pidgin/gtkdnd-hints.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkdnd-hints.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
-#include "gtkdnd-hints.h"+#include "gtkdnd-hints.h" #include <gdk-pixbuf/gdk-pixbuf.h>
--- a/pidgin/gtkidle.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkidle.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/pidgin/gtkmedia.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkmedia.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/gtknotify.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtknotify.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,10 +18,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include <gdk/gdkkeysyms.h>
--- a/pidgin/gtkpluginpref.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkpluginpref.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,10 +20,6 @@
#include "gtkpluginpref.h"
--- a/pidgin/gtkpounce.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkpounce.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h>
--- a/pidgin/gtkprefs.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkprefs.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,18 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include <glib/gstdio.h>
--- a/pidgin/gtkprivacy.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkprivacy.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/gtkrequest.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkrequest.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h>
--- a/pidgin/gtkroomlist.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkroomlist.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include "pidginaccountchooser.h"
--- a/pidgin/gtksavedstatuses.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtksavedstatuses.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h>
--- a/pidgin/gtksmiley-manager.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtksmiley-manager.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/gtksmiley-theme.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtksmiley-theme.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
-#include "gtksmiley-theme.h"+#include "gtksmiley-theme.h" --- a/pidgin/gtksound.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtksound.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,18 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/gtkstatusbox.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkstatusbox.c Mon Jun 08 23:12:55 2020 +0000
@@ -35,9 +35,9 @@
* and the "New..." and "Saved..." options.
-#include <gdk/gdkkeysyms.h>+#include <glib/gi18n-lib.h>
+#include <gdk/gdkkeysyms.h> --- a/pidgin/gtkutils.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkutils.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include <glib/gstdio.h> #include "glibcompat.h" /* for purple_g_stat on win32 */
--- a/pidgin/gtkwhiteboard.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkwhiteboard.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,10 @@
+#include <glib/gi18n-lib.h> #include "gtkwhiteboard.h"
--- a/pidgin/gtkxfer.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/gtkxfer.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/libpidgin.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/libpidgin.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,8 +21,14 @@
+#include <glib/gi18n-lib.h> +#include <glib/gstdio.h>
@@ -387,7 +393,7 @@
"and post the backtrace from the core file. If you do not know\n"
"how to get the backtrace, please read the instructions at\n"
"%swiki/GetABacktrace\n"),
- PIDGIN_NAME, DISPLAY_VERSION, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE+ PIDGIN_NAME, DISPLAY_VERSION, PURPLE_WEBSITE, PURPLE_WEBSITE /* we have to convert the message (UTF-8 to console
--- a/pidgin/minidialog.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/minidialog.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/pidgin/pidgin.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/pidgin.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,6 @@
--- a/pidgin/pidgin.h Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/pidgin.h Mon Jun 08 23:12:55 2020 +0000
@@ -29,6 +29,8 @@
* @title: UI Definitions and Includes
+#include <glib/gi18n-lib.h> --- a/pidgin/pidginabout.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/pidginabout.c Mon Jun 08 23:12:55 2020 +0000
@@ -16,6 +16,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include <json-glib/json-glib.h>
@@ -23,7 +30,6 @@
#include "package_revision.h"
#include "pidginresources.h"
--- a/pidgin/pidginaccountchooser.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/pidginaccountchooser.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/pidgin/pidgindebug.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/pidgindebug.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> +#include <glib/gstdio.h> --- a/pidgin/pidginlog.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/pidginlog.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/pidginmenutray.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/pidginmenutray.c Mon Jun 08 23:12:55 2020 +0000
@@ -17,7 +17,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
#include "pidginmenutray.h"
--- a/pidgin/pidginstock.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/pidginstock.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,9 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h>
#include "gtkicon-theme-loader.h"
#include "theme-manager.h"
--- a/pidgin/pidgintooltip.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/pidgintooltip.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,7 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/plugins/contact_priority.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/contact_priority.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,7 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
+#include <glib/gi18n-lib.h> #include "pidginplugininfo.h"
--- a/pidgin/plugins/disco/gtkdisco.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/disco/gtkdisco.c Mon Jun 08 23:12:55 2020 +0000
@@ -24,7 +24,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> --- a/pidgin/plugins/disco/xmppdisco.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/disco/xmppdisco.c Mon Jun 08 23:12:55 2020 +0000
@@ -36,7 +36,8 @@
* For services that are a JID w/o a node, handle fetching ad-hoc commands?
+#include <glib/gi18n-lib.h> --- a/pidgin/plugins/extplacement.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/extplacement.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
+#include <glib/gi18n-lib.h> --- a/pidgin/plugins/gtk-signals-test.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/gtk-signals-test.c Mon Jun 08 23:12:55 2020 +0000
@@ -20,8 +20,6 @@
#define GTK_SIGNAL_TEST_PLUGIN_ID "gtk-signals-test"
--- a/pidgin/plugins/gtkbuddynote.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/gtkbuddynote.c Mon Jun 08 23:12:55 2020 +0000
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
#include <pidginplugininfo.h>
--- a/pidgin/plugins/iconaway.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/iconaway.c Mon Jun 08 23:12:55 2020 +0000
@@ -18,11 +18,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#include <glib/gi18n-lib.h> #include "pidginplugininfo.h"
--- a/pidgin/plugins/relnot.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/relnot.c Mon Jun 08 23:12:55 2020 +0000
@@ -19,11 +19,7 @@
+#include <glib/gi18n-lib.h> #include <libsoup/soup.h>
--- a/pidgin/plugins/ticker/ticker.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/ticker/ticker.c Mon Jun 08 23:12:55 2020 +0000
@@ -24,7 +24,9 @@
* ticker.c -- Syd Logan, Summer 2000
* pluginized- Sean Egan, Summer 2002
+#include <glib/gi18n-lib.h> --- a/pidgin/plugins/xmppconsole/xmppconsole.c Sun Jun 07 07:38:48 2020 +0000
+++ b/pidgin/plugins/xmppconsole/xmppconsole.c Mon Jun 08 23:12:55 2020 +0000
@@ -21,7 +21,8 @@
+#include <glib/gi18n-lib.h> @@ -567,7 +568,7 @@
builder = gtk_builder_new_from_resource(
"/im/pidgin/Pidgin/Plugin/XMPPConsole/console.ui");
- gtk_builder_set_translation_domain(builder, PACKAGE);+ gtk_builder_set_translation_domain(builder, GETTEXT_PACKAGE); console->window = GTK_WIDGET(
gtk_builder_get_object(builder, "PidginXmppConsole"));
gtk_builder_add_callback_symbol(builder, "console_destroy",
