gobjectification: f47731b3: Get the plugins to compile after the rem...

sadrul at pidgin.im sadrul at pidgin.im
Tue Jul 13 18:04:18 EDT 2010


----------------------------------------------------------------------
Revision: f47731b3a72637e4e13f98b4d5eb915080456bc3
Parent:   bb49fc89e954766506275c1001248597d1cd213e
Author:   sadrul at pidgin.im
Date:     07/13/10 14:14:43
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/f47731b3a72637e4e13f98b4d5eb915080456bc3

Changelog: 

Get the plugins to compile after the removal of account-manager.

Changes against parent bb49fc89e954766506275c1001248597d1cd213e

  patched  libpurple/plugins/idle.c
  patched  libpurple/plugins/perl/common/Account.xs
  patched  libpurple/plugins/perl/common/module.h
  patched  libpurple/plugins/tcl/tcl_cmds.c

-------------- next part --------------
============================================================
--- libpurple/plugins/idle.c	7b0753dcfb62f6f3d54238239649e1f92af7b359
+++ libpurple/plugins/idle.c	662cac9a9f2e99254fbf77b93ee171df34c09ad9
@@ -24,6 +24,7 @@
 
 #include "internal.h"
 
+#include "accountlist.h"
 #include "connection.h"
 #include "debug.h"
 #include "notify.h"
@@ -106,7 +107,7 @@ idle_all_action_ok(void *ignored, Purple
 	int tm = purple_request_fields_get_integer(fields, "mins");
 	const char *prpl_id = NULL;
 
-	list = purple_accounts_get_all_active();
+	list = purple_accounts_actives();
 	for(iter = list; iter; iter = iter->next) {
 		acct = (PurpleAccount *)(iter->data);
 
============================================================
--- libpurple/plugins/perl/common/Account.xs	b6f406a1197a70dd34aa3af42f6e533fb9830052
+++ libpurple/plugins/perl/common/Account.xs	e2f533e570fb77c6caf5f2e05792eed1e7aaf37f
@@ -264,37 +264,25 @@ void
 PROTOTYPES: ENABLE
 
 void
-purple_accounts_add(account)
-    Purple::Account account
-
-void
-purple_accounts_remove(account)
-    Purple::Account account
-
-void
-purple_accounts_delete(account)
-    Purple::Account account
-
-void
 purple_accounts_reorder(account, new_index)
     Purple::Account account
     size_t new_index
 
 void
-purple_accounts_get_all()
+purple_accounts_all()
 PREINIT:
     GList *l;
 PPCODE:
-    for (l = purple_accounts_get_all(); l != NULL; l = l->next) {
+    for (l = purple_accounts_all(); l != NULL; l = l->next) {
         XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Account")));
     }
 
 void
-purple_accounts_get_all_active()
+purple_accounts_actives()
 PREINIT:
     GList *list, *iter;
 PPCODE:
-    list = purple_accounts_get_all_active();
+    list = purple_accounts_actives();
     for (iter = list; iter != NULL; iter = iter->next) {
         XPUSHs(sv_2mortal(purple_perl_bless_object(iter->data, "Purple::Account")));
     }
============================================================
--- libpurple/plugins/perl/common/module.h	83f1b80788de545b53be5e6044f2748cf32e5275
+++ libpurple/plugins/perl/common/module.h	f74732eafe4c3b39a54391b64a2be00f09c39bc3
@@ -20,6 +20,7 @@ typedef struct group *Purple__Group;
 #include "../perl-common.h"
 
 #include "account.h"
+#include "accountlist.h"
 #include "accountopt.h"
 #include "blist.h"
 #include "buddyicon.h"
============================================================
--- libpurple/plugins/tcl/tcl_cmds.c	ac39d2f2f86cff8951ba88a4f198932158432478
+++ libpurple/plugins/tcl/tcl_cmds.c	4a5f7b08974c2f256835caf34ce7e9d3d4665a65
@@ -27,6 +27,7 @@
 #include "connection.h"
 #include "eventloop.h"
 #include "account.h"
+#include "accountlist.h"
 #include "server.h"
 #include "notify.h"
 #include "blist.h"
@@ -51,7 +52,7 @@ static PurpleAccount *tcl_validate_accou
 	if (account == NULL)
 		return NULL;
 
-	for (cur = purple_accounts_get_all(); cur != NULL; cur = g_list_next(cur)) {
+	for (cur = purple_accounts_all(); cur != NULL; cur = g_list_next(cur)) {
 		if (account == cur->data)
 			return account;
 	}
@@ -234,7 +235,7 @@ int tcl_cmd_account(ClientData unused, T
 				return error;
 		}
 		list = Tcl_NewListObj(0, NULL);
-		for (cur = purple_accounts_get_all(); cur != NULL; cur = g_list_next(cur)) {
+		for (cur = purple_accounts_all(); cur != NULL; cur = g_list_next(cur)) {
 			account = cur->data;
 			if (listopt == CMD_ACCOUNTLIST_ONLINE && !purple_account_is_connected(account))
 				continue;


More information about the Commits mailing list