/soc/2013/ankitkv/gobjectification: 254e2d4e6056: Merged soc.201...

[Ankit Vani]

Changeset: 254e2d4e60568c80ce416dca2c91b3c7ab63db5d
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-22 02:51 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/254e2d4e6056

Description:

Merged soc.2013.gobjectification branch

diffstat:

 ChangeLog.API                              |   1 +
 doc/reference/libpurple/signals_blist.xml  |  20 --------------------
 doc/reference/pidgin/signals_gtkimhtml.xml |   1 +
 libpurple/buddylist.c                      |  12 ------------
 4 files changed, 2 insertions(+), 32 deletions(-)

diffs (95 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -355,6 +355,7 @@ version 3.0.0 (??/??/????):
 		* xmlnode_* functions are now purple_xmlnode_*
 
 		Removed:
+		* buddy-added and buddy-removed blist signals
 		* privacy.h file
 		* value.h file
 		* _PurpleCipherBatchMode
diff --git a/doc/reference/libpurple/signals_blist.xml b/doc/reference/libpurple/signals_blist.xml
--- a/doc/reference/libpurple/signals_blist.xml
+++ b/doc/reference/libpurple/signals_blist.xml
@@ -13,8 +13,6 @@
   @signal buddy-signed-off
   @signal update-idle
   @signal blist-node-extended-menu
-  @signal buddy-added
-  @signal buddy-removed
   @signal buddy-icon-changed
   @signal blist-node-aliased
   @signal buddy-caps-changed
@@ -96,24 +94,6 @@ void (*blist_node_removed)(PurpleBlistNo
    Emitted when a blist node is removed from the buddy list.
  @endsignaldef
 
- @signaldef buddy-added
-  @signalproto
-void (*buddy_added)(PurpleBuddy *buddy)
-  @endsignalproto
-  @signaldesc
-   Emitted when a new buddy is added to the buddy list.
-  @deprecated Use blist-node-added instead.
- @endsignaldef
-
- @signaldef buddy-removed
-  @signalproto
-void (*buddy_removed)(PurpleBuddy *buddy)
-  @endsignalproto
-  @signaldesc
-   Emitted when a buddy is removed from the buddy list.
-  @deprecated Use blist-node-removed instead.
- @endsignaldef
-
  @signaldef buddy-icon-changed
   @signalproto
 void (*buddy_icon_changed)(PurpleBuddy *buddy)
diff --git a/doc/reference/pidgin/signals_gtkimhtml.xml b/doc/reference/pidgin/signals_gtkimhtml.xml
--- a/doc/reference/pidgin/signals_gtkimhtml.xml
+++ b/doc/reference/pidgin/signals_gtkimhtml.xml
@@ -62,6 +62,7 @@ void (*format_function_update)(GtkIMHtml
   @signaldesc Emitted when the cursor has moved and formatting has changed
   @param imhtml The GtkIMHtml emitting the signal.
   @param data   User defined data.
+ @endsignaldef
 
  @signaldef paste
  	@signalproto
diff --git a/libpurple/buddylist.c b/libpurple/buddylist.c
--- a/libpurple/buddylist.c
+++ b/libpurple/buddylist.c
@@ -1054,8 +1054,6 @@ void purple_blist_add_buddy(PurpleBuddy 
 	}
 
 	/* Signal that the buddy has been added */
-	purple_signal_emit(purple_blist_get_handle(), "buddy-added", buddy);
-
 	purple_signal_emit(purple_blist_get_handle(), "blist-node-added",
 			PURPLE_BLIST_NODE(buddy));
 }
@@ -1406,8 +1404,6 @@ void purple_blist_remove_buddy(PurpleBud
 	purple_pounce_destroy_all_by_buddy(buddy);
 
 	/* Signal that the buddy has been removed before freeing the memory for it */
-	purple_signal_emit(purple_blist_get_handle(), "buddy-removed", buddy);
-
 	purple_signal_emit(purple_blist_get_handle(), "blist-node-removed",
 			PURPLE_BLIST_NODE(buddy));
 
@@ -1922,14 +1918,6 @@ purple_blist_init(void)
 						 purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
 						 PURPLE_TYPE_BLIST_NODE);
 
-	purple_signal_register(handle, "buddy-added",
-						 purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
-						 PURPLE_TYPE_BUDDY);
-
-	purple_signal_register(handle, "buddy-removed",
-						 purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
-						 PURPLE_TYPE_BUDDY);
-
 	purple_signal_register(handle, "buddy-icon-changed",
 						 purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
 						 PURPLE_TYPE_BUDDY);