/soc/2013/ankitkv/gobjectification: 6cc39a95f75b: Merged default...
Ankit Vani
a at nevitus.org
Fri Dec 6 04:20:45 EST 2013
Changeset: 6cc39a95f75b619af48ec196bedd3d5f1810aae3
Author: Ankit Vani <a at nevitus.org>
Date: 2013-12-06 14:50 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/6cc39a95f75b
Description:
Merged default branch
diffstat:
.hgignore | 9 +++------
ChangeLog.API | 10 ++++++++++
libpurple/cipher.h | 10 +++++-----
libpurple/ciphers/descipher.c | 11 +++++------
libpurple/ciphers/rc4cipher.c | 8 ++++----
libpurple/circularbuffer.c | 6 +++---
libpurple/connection.c | 6 +++---
libpurple/conversationtypes.c | 2 +-
libpurple/conversationtypes.h | 3 ++-
libpurple/dbus-define-api.h | 2 +-
libpurple/protocols/jabber/data.c | 2 +-
libpurple/protocols/jabber/data.h | 2 +-
libpurple/protocols/jabber/ibb.c | 2 +-
libpurple/protocols/jabber/ibb.h | 2 +-
libpurple/protocols/msn/msnutils.c | 10 +++++-----
libpurple/protocols/oscar/family_oservice.c | 2 --
libpurple/roomlist.c | 6 +++---
libpurple/whiteboard.c | 16 ++++++++--------
libpurple/xfer.c | 5 ++---
pidgin/gtknotify.c | 15 ---------------
pidgin/gtkprefs.c | 11 ++++++++++-
pidgin/gtkutils.h | 4 ++--
pidgin/gtkwebviewtoolbar.c | 2 +-
23 files changed, 72 insertions(+), 74 deletions(-)
diffs (truncated from 508 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -63,15 +63,13 @@ doc/reference/.*/html/.*
doc/reference/.*/xml/.*
doc/reference/.*/version.xml
finch/finch$
-finch/libgnt/gntmarshal.c
-finch/libgnt/gntmarshal.h
+finch/libgnt/gntmarshal.[ch]
gtk-doc.make
install-sh
intltool-.*
libpurple/dbus-bindings.c
libpurple/dbus-signals.c
-libpurple/dbus-types.c
-libpurple/dbus-types.h
+libpurple/dbus-types.[ch]
libpurple/enums.[ch]
libpurple/example/nullclient
libpurple/gconf/purple.schemas$
@@ -82,8 +80,7 @@ libpurple/plugins/perl/common/Makefile.o
libpurple/plugins/perl/common/const-c.inc
libpurple/plugins/perl/common/const-xs.inc
libpurple/plugins/perl/common/lib
-libpurple/purple-client-bindings.c
-libpurple/purple-client-bindings.h
+libpurple/purple-client-bindings.[ch]
libpurple/purple-client-example
libpurple/Purple.gir
libpurple/purple.h$
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -1,5 +1,15 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
+This file intends to list all changes to libpurple, Pidgin, and Finch's public
+API. We sometimes forget to add changes to this file--sorry.
+
+If your plugin fails to build with a new major version (e.g. 3.0.0) we
+suggest checking this list first, in case a function was simply renamed.
+You may still need to consult our API docs or our source code.
+
+If you notice something missing from this list, please let us know and we'll
+add it.
+
version 3.0.0 (??/??/????):
libpurple:
Added:
diff --git a/libpurple/cipher.h b/libpurple/cipher.h
--- a/libpurple/cipher.h
+++ b/libpurple/cipher.h
@@ -1,5 +1,5 @@
/**
- * @file ciphers.h Purple Cipher and Hash API
+ * @file cipher.h Purple Cipher and Hash API
* @ingroup core
*/
@@ -23,8 +23,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 PURPLE_CIPHERS_H
-#define PURPLE_CIPHERS_H
+#ifndef PURPLE_CIPHER_H
+#define PURPLE_CIPHER_H
#include <glib.h>
#include <glib-object.h>
@@ -57,7 +57,7 @@ typedef struct _PurpleHashClass PurpleH
*
* Modes for batch encrypters
*/
-typedef enum {
+typedef enum {
PURPLE_CIPHER_BATCH_MODE_ECB,
PURPLE_CIPHER_BATCH_MODE_CBC
} PurpleCipherBatchMode;
@@ -407,4 +407,4 @@ size_t purple_hash_get_block_size(Purple
G_END_DECLS
-#endif /* PURPLE_CIPHERS_H */
+#endif /* PURPLE_CIPHER_H */
diff --git a/libpurple/ciphers/descipher.c b/libpurple/ciphers/descipher.c
--- a/libpurple/ciphers/descipher.c
+++ b/libpurple/ciphers/descipher.c
@@ -5,12 +5,12 @@
* Copyright (C) 1998 Free Software Foundation, Inc.
*
* Please see below for more legal information!
- *
+ *
* According to the definition of DES in FIPS PUB 46-2 from December 1993.
* For a description of triple encryption, see:
* Bruce Schneier: Applied Cryptography. Second Edition.
* John Wiley & Sons, 1996. ISBN 0-471-12845-7. Pages 358 ff.
- *
+ *
* 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
* source distribution.
@@ -63,7 +63,7 @@ enum {
static GObjectClass *parent_class = NULL;
static GParamSpec *properties[PROP_LAST];
-/*
+/*
* The s-box values are permuted according to the 'primitive function P'
*/
static guint32 sbox1[64] = {
@@ -275,11 +275,11 @@ static guint8 encrypt_rotate_tab[16] = {
* 16 encryption rounds.
* To calculate subkeys for decryption the caller
* have to reorder the generated subkeys.
- *
+ *
* rawkey: 8 Bytes of key data
* subkey: Array of at least 32 guint32s. Will be filled
* with calculated subkeys.
- *
+ *
*/
static void
purple_des_cipher_key_schedule(const guint8 * rawkey, guint32 * subkey) {
@@ -579,4 +579,3 @@ PurpleCipher *
purple_des_cipher_new(void) {
return g_object_new(PURPLE_TYPE_DES_CIPHER, NULL);
}
-
diff --git a/libpurple/ciphers/rc4cipher.c b/libpurple/ciphers/rc4cipher.c
--- a/libpurple/ciphers/rc4cipher.c
+++ b/libpurple/ciphers/rc4cipher.c
@@ -31,10 +31,10 @@
(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_RC4_CIPHER, PurpleRC4CipherPrivate))
typedef struct {
- guchar state[256];
- guchar x;
- guchar y;
- gint key_len;
+ guchar state[256];
+ guchar x;
+ guchar y;
+ gint key_len;
} PurpleRC4CipherPrivate;
/******************************************************************************
diff --git a/libpurple/circularbuffer.c b/libpurple/circularbuffer.c
--- a/libpurple/circularbuffer.c
+++ b/libpurple/circularbuffer.c
@@ -54,7 +54,7 @@ typedef struct {
/** A pointer to the next byte of buffered data that should be
* read by the consumer. */
- gchar *output;
+ gchar *output;
} PurpleCircularBufferPrivate;
/******************************************************************************
@@ -225,7 +225,7 @@ purple_circular_buffer_set_grow_size(Pur
gsize grow_size)
{
PurpleCircularBufferPrivate *priv =
- PURPLE_CIRCULAR_BUFFER_GET_PRIVATE(buffer);
+ PURPLE_CIRCULAR_BUFFER_GET_PRIVATE(buffer);
priv->growsize = (grow_size != 0) ? grow_size : DEFAULT_BUF_SIZE;
@@ -249,7 +249,7 @@ purple_circular_buffer_get_input(const P
static void
purple_circular_buffer_finalize(GObject *obj) {
PurpleCircularBufferPrivate *priv =
- PURPLE_CIRCULAR_BUFFER_GET_PRIVATE(obj);
+ PURPLE_CIRCULAR_BUFFER_GET_PRIVATE(obj);
g_free(priv->buffer);
diff --git a/libpurple/connection.c b/libpurple/connection.c
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -65,9 +65,9 @@ struct _PurpleConnectionPrivate
GSList *active_chats; /**< A list of active chats
(#PurpleChatConversation structs). */
- void *proto_data; /**< Protocol-specific data.
- TODO Remove this, and use
- protocol-specific subclasses */
+
+ /* TODO Remove this and use protocol-specific subclasses. */
+ void *proto_data; /**< Protocol-specific data. */
char *display_name; /**< How you appear to other people. */
guint keepalive; /**< Keep-alive. */
diff --git a/libpurple/conversationtypes.c b/libpurple/conversationtypes.c
--- a/libpurple/conversationtypes.c
+++ b/libpurple/conversationtypes.c
@@ -1379,7 +1379,7 @@ purple_chat_conversation_set_property(GO
case CHAT_PROP_LEFT:
{
gboolean left = g_value_get_boolean(value);
- if (left == TRUE)
+ if (left)
purple_chat_conversation_leave(chat);
}
break;
diff --git a/libpurple/conversationtypes.h b/libpurple/conversationtypes.h
--- a/libpurple/conversationtypes.h
+++ b/libpurple/conversationtypes.h
@@ -226,7 +226,8 @@ PurpleIMTypingState purple_im_conversati
* Starts the IM's typing timeout.
*
* @param im The IM.
- * @param timeout The timeout.
+ * @param timeout How long in seconds to wait before setting the typing state
+ * to PURPLE_IM_NOT_TYPING.
*/
void purple_im_conversation_start_typing_timeout(PurpleIMConversation *im, int timeout);
diff --git a/libpurple/dbus-define-api.h b/libpurple/dbus-define-api.h
--- a/libpurple/dbus-define-api.h
+++ b/libpurple/dbus-define-api.h
@@ -1,5 +1,5 @@
#ifndef __GI_SCANNER__ /* hide this file from g-ir-scanner */
-#error "This is file is not a valid C code"
+#error "This file is not a valid C code and is not intended to be compiled."
/* This file contains some of the macros from other header files as
function declarations. This does not make sense in C, but it
diff --git a/libpurple/protocols/jabber/data.c b/libpurple/protocols/jabber/data.c
--- a/libpurple/protocols/jabber/data.c
+++ b/libpurple/protocols/jabber/data.c
@@ -1,5 +1,5 @@
/*
- * purple - Jabber Service Discovery
+ * purple - Handling of XEP-0231: Bits of Binary.
*
* 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
diff --git a/libpurple/protocols/jabber/data.h b/libpurple/protocols/jabber/data.h
--- a/libpurple/protocols/jabber/data.h
+++ b/libpurple/protocols/jabber/data.h
@@ -1,5 +1,5 @@
/*
- * purple - Jabber Service Discovery
+ * purple - Handling of XEP-0231: Bits of Binary.
*
* 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
diff --git a/libpurple/protocols/jabber/ibb.c b/libpurple/protocols/jabber/ibb.c
--- a/libpurple/protocols/jabber/ibb.c
+++ b/libpurple/protocols/jabber/ibb.c
@@ -1,5 +1,5 @@
/*
- * purple - Jabber Service Discovery
+ * purple - Handling of XEP-0047: In-Band Bytestreams.
*
* 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
diff --git a/libpurple/protocols/jabber/ibb.h b/libpurple/protocols/jabber/ibb.h
--- a/libpurple/protocols/jabber/ibb.h
+++ b/libpurple/protocols/jabber/ibb.h
@@ -1,5 +1,5 @@
/*
- * purple - Jabber Service Discovery
+ * purple - Handling of XEP-0047: In-Band Bytestreams.
*
* 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
diff --git a/libpurple/protocols/msn/msnutils.c b/libpurple/protocols/msn/msnutils.c
--- a/libpurple/protocols/msn/msnutils.c
+++ b/libpurple/protocols/msn/msnutils.c
@@ -52,7 +52,6 @@ msn_parse_format(const char *mime, char
char *cur;
GString *pre = g_string_new(NULL);
GString *post = g_string_new(NULL);
- unsigned int colors[3];
if (pre_ret != NULL) *pre_ret = NULL;
if (post_ret != NULL) *post_ret = NULL;
@@ -95,8 +94,9 @@ msn_parse_format(const char *mime, char
if (cur && (*(cur = cur + 3) != ';'))
{
int i;
+ guint8 colors[3];
- i = sscanf(cur, "%02x%02x%02x;", &colors[0], &colors[1], &colors[2]);
+ i = sscanf(cur, "%02hhx%02hhx%02hhx;", &colors[0], &colors[1], &colors[2]);
if (i > 0)
{
@@ -109,7 +109,7 @@ msn_parse_format(const char *mime, char
}
else if (i == 2)
{
- unsigned int temp = colors[0];
+ guint8 temp = colors[0];
More information about the Commits
mailing list