pidgin.yaz: finch/gntaccount.c comparison

comparison finch/gntaccount.c @ 18068:0b3d6ea61760

propagate from branch 'im.pidgin.pidgin' (head 4b50880d8517570eaa67d4cd9d88c5934bb832f1) to branch 'im.pidgin.pidgin.2.1.0' (head fefd59692d4177b91d52f6d71b1565b76c88725d)

author	Richard Laager <rlaager@wiktel.com>
date	Thu, 07 Jun 2007 14:48:33 +0000
parents	4ca97b26a8fb
children	926ccb104da0

comparison

equal deleted inserted replaced

-:5eebb9b24e30
+:0b3d6ea61760
 #include <gntcombobox.h>
 #include <gntentry.h>
 #include <gntlabel.h>
 #include <gntline.h>
 #include <gnttree.h>
+#include <gntwindow.h>
 #include <account.h>
 #include <accountopt.h>
 #include <connection.h>
 #include <notify.h>
 #include <plugin.h>
 #include <request.h>
 #include "gntaccount.h"
+#include "gntblist.h"
 #include "finch.h"
 #include <string.h>
 typedef struct
 		const char *value = NULL;
 		char *s;
 		if (dialog->account)
 		{
-			s = strrchr(username, purple_account_user_split_get_separator(split));
+			if(purple_account_user_split_get_reverse(split))
+				s = strrchr(username, purple_account_user_split_get_separator(split));
+			else
+				s = strchr(username, purple_account_user_split_get_separator(split));
 			if (s != NULL)
 			{
 				*s = '\0';
 				s++;
 				value = s;
 	accounts.tree = NULL;
 }
 void finch_accounts_show_all()
 {
-	GList *iter;
+	const GList *iter;
 	GntWidget *box, *button;
 	if (accounts.window)
 		return;
 			GPOINTER_TO_INT(user_data));
 }
 void finch_accounts_init()
 {
-	GList *iter;
+	const GList *iter;
 	purple_signal_connect(purple_accounts_get_handle(), "account-added",
 			finch_accounts_get_handle(), PURPLE_CALLBACK(account_added_callback),
 			NULL);
 	purple_signal_connect(purple_accounts_get_handle(), "account-removed",
 			PURPLE_CALLBACK(account_abled_cb), GINT_TO_POINTER(FALSE));
 	purple_signal_connect(purple_accounts_get_handle(), "account-enabled",
 			finch_accounts_get_handle(),
 			PURPLE_CALLBACK(account_abled_cb), GINT_TO_POINTER(TRUE));
-	for (iter = purple_accounts_get_all(); iter; iter = iter->next) {
+	iter = purple_accounts_get_all();
-		if (purple_account_get_enabled(iter->data, FINCH_UI))
+	if (iter) {
-			break;
+		for (; iter; iter = iter->next) {
-	}
+			if (purple_account_get_enabled(iter->data, FINCH_UI))
-	if (!iter)
+				break;
+		}
+		if (!iter)
+			finch_accounts_show_all();
+	} else {
+		edit_account(NULL);
 		finch_accounts_show_all();
+	}
 }
 void finch_accounts_uninit()
 {
 	if (accounts.window)
 static void
 add_user_cb(AddUserData *data)
 {
 	PurpleConnection *gc = purple_account_get_connection(data->account);
-	if (g_list_find(purple_connections_get_all(), gc))
+	if (g_list_find((GList *)purple_connections_get_all(), gc))
 	{
 		purple_blist_request_add_buddy(data->account, data->username,
 									 NULL, data->alias);
 	}
 	char *alias;
 	PurpleAccount *account;
 } auth_and_add;
 static void
+free_auth_and_add(auth_and_add *aa)
+{
+	g_free(aa->username);
+	g_free(aa->alias);
+	g_free(aa);
+}
+static void
 authorize_and_add_cb(auth_and_add *aa)
 {
 	aa->auth_cb(aa->data);
 	purple_blist_request_add_buddy(aa->account, aa->username,
 	 	                    NULL, aa->alias);
-	g_free(aa->username);
-	g_free(aa->alias);
-	g_free(aa);
 }
 static void
 deny_no_add_cb(auth_and_add *aa)
 {
 	aa->deny_cb(aa->data);
-	g_free(aa->username);
-	g_free(aa->alias);
-	g_free(aa);
 }
 static void *
 finch_request_authorize(PurpleAccount *account, const char *remote_user,
 					const char *id, const char *alias, const char *message, gboolean on_list,
 		                ? purple_connection_get_display_name(gc)
 		                : purple_account_get_username(account))),
 		                (message != NULL ? ": " : "."),
 		                (message != NULL ? message  : ""));
 	if (!on_list) {
+		GntWidget *widget;
+		GList *iter;
 		auth_and_add *aa = g_new(auth_and_add, 1);
 		aa->auth_cb = (PurpleAccountRequestAuthorizationCb)auth_cb;
 		aa->deny_cb = (PurpleAccountRequestAuthorizationCb)deny_cb;
 		aa->data = user_data;
 		aa->username = g_strdup(remote_user);
 		aa->alias = g_strdup(alias);
 		aa->account = account;
-		uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL,
+		uihandle = gnt_vwindow_new(FALSE);
+		gnt_box_set_title(GNT_BOX(uihandle), _("Authorize buddy?"));
+		gnt_box_set_pad(GNT_BOX(uihandle), 0);
+		widget = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL,
 			PURPLE_DEFAULT_ACTION_NONE,
 			account, remote_user, NULL,
 			aa, 2,
 			_("Authorize"), authorize_and_add_cb,
 			_("Deny"), deny_no_add_cb);
+		gnt_screen_release(widget);
+		gnt_box_set_toplevel(GNT_BOX(widget), FALSE);
+		gnt_box_add_widget(GNT_BOX(uihandle), widget);
+		gnt_box_add_widget(GNT_BOX(uihandle), gnt_hline_new());
+		widget = finch_retrieve_user_info(account->gc, remote_user);
+		for (iter = GNT_BOX(widget)->list; iter; iter = iter->next) {
+			if (GNT_IS_BUTTON(iter->data)) {
+				gnt_widget_destroy(iter->data);
+				gnt_box_remove(GNT_BOX(widget), iter->data);
+				break;
+			}
+		}
+		gnt_box_set_toplevel(GNT_BOX(widget), FALSE);
+		gnt_screen_release(widget);
+		gnt_box_add_widget(GNT_BOX(uihandle), widget);
+		gnt_widget_show(uihandle);
+		g_signal_connect_swapped(G_OBJECT(uihandle), "destroy", G_CALLBACK(free_auth_and_add), aa);
 	} else {
 		uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL,
 			PURPLE_DEFAULT_ACTION_NONE,
 			account, remote_user, NULL,
 			user_data, 2,

Mercurial > pidgin.yaz

comparison finch/gntaccount.c @ 18068:0b3d6ea61760