gobjectification: 49c6e7d0: Compile finch.
sadrul at pidgin.im
sadrul at pidgin.im
Tue Jul 13 18:04:04 EDT 2010
----------------------------------------------------------------------
Revision: 49c6e7d085ef9b1eb356cb7ac8fa23249f6e3219
Parent: afea245ee14d67972cad842c1c91d294a0401fba
Author: sadrul at pidgin.im
Date: 07/13/10 14:17:25
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/49c6e7d085ef9b1eb356cb7ac8fa23249f6e3219
Changelog:
Compile finch.
Changes against parent afea245ee14d67972cad842c1c91d294a0401fba
patched finch/gntaccount.c
patched finch/gntblist.c
patched finch/gntlog.c
patched finch/gntpounce.c
patched finch/gntrequest.c
patched finch/gntstatus.c
-------------- next part --------------
============================================================
--- finch/gntblist.c 6af902ddc88feef07cd6544c0b17724034cfbfef
+++ finch/gntblist.c 9d3067460974fdbe7b45402f762a4d0ed2227caf
@@ -27,6 +27,7 @@
#include "finch.h"
#include <account.h>
+#include <accountlist.h>
#include <blist.h>
#include <gsignal.h>
#include <log.h>
@@ -2604,7 +2605,7 @@ reconstruct_accounts_menu(void)
sub = gnt_menu_new(GNT_MENU_POPUP);
gnt_menuitem_set_submenu(acc, GNT_MENU(sub));
- for (iter = purple_accounts_get_all_active(); iter;
+ for (iter = purple_accounts_actives(); iter;
iter = g_list_delete_link(iter, iter)) {
PurpleAccount *account = iter->data;
PurpleConnection *gc = purple_account_get_connection(account);
@@ -2907,8 +2908,8 @@ view_log_cb(GntMenuItem *item, gpointer
field = purple_request_field_account_new("account", _("Account"), NULL);
purple_request_field_set_type_hint(field, "account");
purple_request_field_set_visible(field,
- (purple_accounts_get_all() != NULL &&
- purple_accounts_get_all()->next != NULL));
+ (purple_accounts_all() != NULL &&
+ purple_accounts_all()->next != NULL));
purple_request_field_set_required(field, TRUE);
purple_request_field_group_add_field(group, field);
purple_request_field_account_set_show_all(field, TRUE);
============================================================
--- finch/gntaccount.c db5ae24338179ca7f1855571ae81bde99f789d2c
+++ finch/gntaccount.c d81a3dad0e7c744682a2ce18ae5c6e7fe3af4ac9
@@ -40,6 +40,7 @@
#include "finch.h"
#include <account.h>
+#include <accountlist.h>
#include <accountopt.h>
#include <connection.h>
#include <notify.h>
@@ -162,7 +163,6 @@ save_account_cb(AccountEditDialog *dialo
if (dialog->account == NULL)
{
account = purple_account_new(username->str, purple_plugin_get_id(plugin));
- purple_accounts_add(account);
}
else
{
@@ -308,6 +308,7 @@ update_user_splits(AccountEditDialog *di
else
{
dialog->splits = gnt_vbox_new(FALSE);
+ gnt_box_set_alignment(GNT_BOX(dialog->splits), GNT_ALIGN_MID);
gnt_box_set_pad(GNT_BOX(dialog->splits), 0);
gnt_box_set_fill(GNT_BOX(dialog->splits), TRUE);
}
@@ -318,7 +319,7 @@ update_user_splits(AccountEditDialog *di
if (!plugin)
return;
prplinfo = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
-
+
username = dialog->account ? g_strdup(purple_account_get_username(dialog->account)) : NULL;
for (iter = prplinfo->user_splits; iter; iter = iter->next)
@@ -328,6 +329,8 @@ update_user_splits(AccountEditDialog *di
char *buf;
hbox = gnt_hbox_new(TRUE);
+ gnt_box_set_pad(GNT_BOX(hbox), 0);
+ gnt_box_set_fill(GNT_BOX(hbox), TRUE);
gnt_box_add_widget(GNT_BOX(dialog->splits), hbox);
buf = g_strdup_printf("%s:", purple_account_user_split_get_text(split));
@@ -687,7 +690,7 @@ really_delete_account(PurpleAccount *acc
}
}
purple_request_close_with_handle(account); /* Close any other opened delete window */
- purple_accounts_delete(account);
+ g_object_unref(G_OBJECT(account));
}
static void
@@ -746,7 +749,7 @@ account_list_key_pressed_cb(GntWidget *w
return FALSE;
}
- accounts = purple_accounts_get_all();
+ accounts = purple_accounts_all();
count = g_list_length(accounts);
pos = g_list_index(accounts, account);
pos = (move + pos + count + 1) % (count + 1);
@@ -755,7 +758,7 @@ account_list_key_pressed_cb(GntWidget *w
/* I don't like this, but recreating the entire list seems to be
* the easiest way of doing it */
gnt_tree_remove_all(tree);
- accounts = purple_accounts_get_all();
+ accounts = purple_accounts_all();
for (; accounts; accounts = accounts->next)
account_add(accounts->data);
gnt_tree_set_selected(tree, account);
@@ -795,7 +798,7 @@ void finch_accounts_show_all()
accounts.tree = gnt_tree_new_with_columns(2);
GNT_WIDGET_SET_FLAGS(accounts.tree, GNT_WIDGET_NO_BORDER);
- for (iter = purple_accounts_get_all(); iter; iter = iter->next)
+ for (iter = purple_accounts_all(); iter; iter = iter->next)
{
PurpleAccount *account = iter->data;
account_add(account);
@@ -875,7 +878,7 @@ void finch_accounts_init()
finch_accounts_get_handle(), PURPLE_CALLBACK(account_removed_callback),
NULL);
- iter = purple_accounts_get_all();
+ iter = purple_accounts_all();
if (iter) {
for (; iter; iter = iter->next) {
if (purple_account_get_enabled(iter->data))
============================================================
--- finch/gntrequest.c 952b02ce6e9b3715d8ae3f17249faa800a5670c8
+++ finch/gntrequest.c 0db5b98d493deeb410368e810fff9bcce61a1660
@@ -38,6 +38,7 @@
#include "finch.h"
#include "gntrequest.h"
+#include "accountlist.h"
#include "debug.h"
#include "util.h"
@@ -551,7 +552,7 @@ create_account_field(PurpleRequestField
def = purple_request_field_account_get_default_value(field);
if (all)
- list = purple_accounts_get_all();
+ list = purple_accounts_all();
else
list = purple_connections_get_all();
============================================================
--- finch/gntstatus.c 26ff1916749d19a3688851b030844191d1547cf3
+++ finch/gntstatus.c c0b2bb75150e36d747ff19b8c87fef7969470952
@@ -37,6 +37,7 @@
#include "finch.h"
+#include <accountlist.h>
#include <notify.h>
#include <request.h>
@@ -580,7 +581,7 @@ void finch_savedstatus_edit(PurpleSavedS
gnt_tree_set_col_width(GNT_TREE(tree), 1, 10);
gnt_tree_set_col_width(GNT_TREE(tree), 2, 30);
- for (iter = purple_accounts_get_all(); iter; iter = iter->next)
+ for (iter = purple_accounts_all(); iter; iter = iter->next)
{
add_substatus(edit, iter->data);
}
============================================================
--- finch/gntpounce.c 0447e0c67f4d175ed50681c2c1fda8bc9d528c88
+++ finch/gntpounce.c d6cb407a5024f43b406ce480b1bab156f95db902
@@ -39,7 +39,7 @@
#include "finch.h"
-#include "account.h"
+#include "accountlist.h"
#include "conversation.h"
#include "debug.h"
#include "notify.h"
@@ -307,7 +307,7 @@ finch_pounce_editor_show(PurpleAccount *
g_return_if_fail((cur_pounce != NULL) ||
(account != NULL) ||
- (purple_accounts_get_all() != NULL));
+ (purple_accounts_all() != NULL));
dialog = g_new0(PurpleGntPounceDialog, 1);
@@ -325,7 +325,7 @@ finch_pounce_editor_show(PurpleAccount *
gc = (PurpleConnection *)connections->data;
dialog->account = purple_connection_get_account(gc);
} else
- dialog->account = purple_accounts_get_all()->data;
+ dialog->account = purple_accounts_all()->data;
dialog->pounce = NULL;
}
@@ -347,7 +347,7 @@ finch_pounce_editor_show(PurpleAccount *
/* Account: */
gnt_box_add_widget(GNT_BOX(window), gnt_label_new(_("Account:")));
dialog->account_menu = combo = gnt_combo_box_new();
- list = purple_accounts_get_all();
+ list = purple_accounts_all();
for (; list; list = list->next)
{
PurpleAccount *account;
@@ -628,7 +628,7 @@ pounces_manager_add_cb(GntButton *button
static void
pounces_manager_add_cb(GntButton *button, gpointer user_data)
{
- if (purple_accounts_get_all() == NULL) {
+ if (purple_accounts_all() == NULL) {
purple_notify_error(NULL, _("Cannot create pounce"),
_("You do not have any accounts."),
_("You must create an account first before you can create a pounce."));
============================================================
--- finch/gntlog.c 2e47ca930723bb09e5063f237965292175c28cba
+++ finch/gntlog.c 795abf4da74164938503827545c10732a3f82ff0
@@ -35,7 +35,7 @@
#include <gnttree.h>
#include <gntwindow.h>
-#include "account.h"
+#include "accountlist.h"
#include "debug.h"
#include "log.h"
#include "notify.h"
@@ -502,7 +502,7 @@ void finch_syslog_show()
return;
}
- for(accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
+ for(accounts = purple_accounts_all(); accounts != NULL; accounts = accounts->next) {
PurpleAccount *account = (PurpleAccount *)accounts->data;
if(purple_find_prpl(purple_account_get_protocol_id(account)) == NULL)
More information about the Commits
mailing list