/soc/2013/ankitkv/gobjectification: 10eb6534ac71: Merged soc.201...

[Ankit Vani]

Changeset: 10eb6534ac71af1d874ccfeabac234b21749dfe1
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-21 23:55 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/10eb6534ac71

Description:

Merged soc.2013.gobjectification branch

diffstat:

 doc/Makefile.am              |   1 -
 doc/cipher-signals.dox       |  31 -------------------------------
 doc/conversation-signals.dox |  18 +++++++++---------
 3 files changed, 9 insertions(+), 41 deletions(-)

diffs (103 lines):

diff --git a/doc/Makefile.am b/doc/Makefile.am
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,7 +18,6 @@ EXTRA_DIST = \
 	account-signals.dox \
 	blist-signals.dox \
 	certificate-signals.dox \
-	cipher-signals.dox \
 	connection-signals.dox \
 	conversation-signals.dox \
 	core-signals.dox \
diff --git a/doc/cipher-signals.dox b/doc/cipher-signals.dox
deleted file mode 100644
--- a/doc/cipher-signals.dox
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @page cipher-signals Cipher Signals
-
- @signals
-  @signal cipher-added
-  @signal cipher-removed
- @endsignals
-
- @see cipher.h
-
- <hr>
-
- @signaldef cipher-added
-  @signalproto
-void (*cipher_added)(PurpleCipher *cipher);
-  @endsignalproto
-  @signaldesc
-   Emitted when a cipher is added.
-  @param cipher The cipher that was added.
- @endsignaldef
-
- @signaldef cipher-removed
-  @signalproto
-void (*cipher_removed)(PurpleCipher *cipher);
-  @endsignalproto
-  @signaldesc
-   Emitted when a cipher is removed.
-  @param cipher The cipher that was removed.
- @endsignaldef
-
- */
-// vim: syntax=c.doxygen tw=75 et
diff --git a/doc/conversation-signals.dox b/doc/conversation-signals.dox
--- a/doc/conversation-signals.dox
+++ b/doc/conversation-signals.dox
@@ -296,8 +296,8 @@ void (*buddy_typing_stopped)(PurpleAccou
 
  @signaldef chat-user-joining
   @signalproto
-gboolean (*chat_buddy_joining)(PurpleConversation *conv, const char *name,
-                           PurpleConvChatBuddyFlags flags);
+gboolean (*chat_user_joining)(PurpleConversation *conv, const char *name,
+                           PurpleChatUserFlags flags);
   @endsignalproto
   @signaldesc
    Emitted when a buddy is joining a chat, before the list of
@@ -310,8 +310,8 @@ gboolean (*chat_buddy_joining)(PurpleCon
 
  @signaldef chat-user-joined
   @signalproto
-void (*chat_buddy_joined)(PurpleConversation *conv, const char *name,
-                          PurpleConvChatBuddyFlags flags,
+void (*chat_user_joined)(PurpleConversation *conv, const char *name,
+                          PurpleChatUserFlags flags,
                           gboolean new_arrival);
   @endsignalproto
   @signaldesc
@@ -336,9 +336,9 @@ void (*chat_join_failed)(PurpleConnectio
 
  @signaldef chat-user-flags
   @signalproto
-void (*chat_buddy_flags)(PurpleChatUser *chatuser,
-                         PurpleConvChatBuddyFlags oldflags,
-                         PurpleConvChatBuddyFlags newflags);
+void (*chat_user_flags)(PurpleChatUser *chatuser,
+                         PurpleChatUserFlags oldflags,
+                         PurpleChatUserFlags newflags);
   @endsignalproto
   @signaldesc
    Emitted when a user in a chat changes flags.
@@ -349,7 +349,7 @@ void (*chat_buddy_flags)(PurpleChatUser 
 
  @signaldef chat-user-leaving
   @signalproto
-gboolean (*chat_buddy_leaving)(PurpleConversation *conv, const char *name,
+gboolean (*chat_user_leaving)(PurpleConversation *conv, const char *name,
                            const char *reason);
   @endsignalproto
   @signaldesc
@@ -363,7 +363,7 @@ gboolean (*chat_buddy_leaving)(PurpleCon
 
  @signaldef chat-user-left
   @signalproto
-void (*chat_buddy_left)(PurpleConversation *conv, const char *name,
+void (*chat_user_left)(PurpleConversation *conv, const char *name,
                         const char *reason);
   @endsignalproto
   @signaldesc