pidgin: 2f6318bd: disapproval of revision 'eca3adf7cdd9217...
ivan.komarov at soc.pidgin.im
ivan.komarov at soc.pidgin.im
Sun Sep 26 11:51:22 EDT 2010
----------------------------------------------------------------------
Revision: 2f6318bd834113559a405ec68cdb178f2180b680
Parent: eca3adf7cdd9217fcf670611fb705385fcfaa48d
Author: ivan.komarov at soc.pidgin.im
Date: 09/26/10 11:49:16
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2f6318bd834113559a405ec68cdb178f2180b680
Changelog:
disapproval of revision 'eca3adf7cdd9217fcf670611fb705385fcfaa48d'
This was an experimental change from my SoC branch, which is not quite release-worthy. I'll undo it for now.
Changes against parent eca3adf7cdd9217fcf670611fb705385fcfaa48d
patched libpurple/protocols/oscar/visibility.c
-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/visibility.c 082c782bfb6f2f33b29ca349b521c0432fb5bbd8
+++ libpurple/protocols/oscar/visibility.c 2fa0497ed474a598202098dd2bce22ec32b02942
@@ -16,10 +16,9 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
- */
+*/
#include "visibility.h"
-#include "request.h"
/* 4 separate strings are needed in order to ease translators' job */
#define APPEAR_ONLINE N_("Appear Online")
@@ -71,77 +70,17 @@ create_visibility_menu_item(OscarData *o
return purple_menu_action_new(label, PURPLE_CALLBACK(visibility_cb), NULL, NULL);
}
-typedef void (*ShowDialog)(PurplePluginAction *);
-
-struct list_remove_data
-{
- PurplePluginAction *action;
- ShowDialog show_dialog_again;
- OscarData *od;
- guint16 list_type;
- const gchar *list_name;
-};
-
static void
-list_remove_cb(struct list_remove_data *data, PurpleRequestFields *fields)
+show_private_list(PurplePluginAction *action, guint16 list_type, const gchar *title, const gchar *list_description, const gchar *menu_action_name)
{
- ShowDialog show_dialog_again = data->show_dialog_again;
- PurplePluginAction *action = data->action;
- PurpleRequestField *field = purple_request_fields_get_field(fields, "list-items");
- GList *sels = purple_request_field_list_get_selected(field);
- for (; sels; sels = sels->next) {
- const gchar *name = sels->data;
- const gchar *bname = purple_request_field_list_get_data(field, name);
-
- purple_debug_info("oscar", "Removing %s from %s\n", bname, data->list_name);
-
- aim_ssi_del_from_private_list(data->od, bname, data->list_type);
- }
-
- g_free(data);
- show_dialog_again(action);
-}
-
-static void
-list_close_cb(struct list_remove_data *data, gpointer ignored)
-{
- g_free(data);
-}
-
-static void
-show_private_list(PurplePluginAction *action,
- guint16 list_type,
- const gchar *list_name,
- const gchar *list_description,
- const gchar *menu_action_name,
- ShowDialog caller)
-{
PurpleConnection *gc = (PurpleConnection *) action->context;
OscarData *od = purple_connection_get_protocol_data(gc);
PurpleAccount *account = purple_connection_get_account(gc);
- GSList *buddies, *cur;
- gchar *desc;
- struct list_remove_data *data;
+ GSList *buddies, *filtered_buddies, *cur;
+ gchar *text, *secondary;
- PurpleRequestField *field;
- PurpleRequestFields *fields = purple_request_fields_new();
- PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
-
- purple_request_fields_add_group(fields, group);
-
- desc = g_strdup_printf(_("You can add a buddy to this list "
- "by right-clicking on them and "
- "selecting \"%s\""), menu_action_name);
-
- field = purple_request_field_list_new("list-items", desc);
- g_free(desc);
-
- purple_request_field_group_add_field(group, field);
-
- purple_request_field_list_set_multi_select(field, TRUE);
- purple_request_field_set_required(field, TRUE);
-
buddies = purple_find_buddies(account, NULL);
+ filtered_buddies = NULL;
for (cur = buddies; cur != NULL; cur = cur->next) {
PurpleBuddy *buddy;
const gchar *bname;
@@ -149,51 +88,38 @@ show_private_list(PurplePluginAction *ac
buddy = cur->data;
bname = purple_buddy_get_name(buddy);
if (aim_ssi_itemlist_finditem(od->ssi.local, NULL, bname, list_type)) {
- const gchar *alias = purple_buddy_get_alias_only(buddy);
- char *dname = alias ? g_strdup_printf("%s (%s)", bname, alias) : NULL;
- purple_request_field_list_add(field, dname ? dname : bname, (void *)bname);
- g_free(dname);
+ filtered_buddies = g_slist_prepend(filtered_buddies, buddy);
}
}
g_slist_free(buddies);
- data = g_new0(struct list_remove_data, 1);
- data->action = action;
- data->show_dialog_again = caller;
- data->od = od;
- data->list_type = list_type;
- data->list_name = list_name;
+ filtered_buddies = g_slist_reverse(filtered_buddies);
+ text = oscar_format_buddies(filtered_buddies, _("you have no buddies on this list"));
+ g_slist_free(filtered_buddies);
- purple_request_fields(gc, list_name, list_description, NULL,
- fields,
- _("Close"), G_CALLBACK(list_close_cb),
- _("Remove"), G_CALLBACK(list_remove_cb),
- account, NULL, NULL,
- data);
+ secondary = g_strdup_printf(_("You can add a buddy to this list "
+ "by right-clicking on them and "
+ "selecting \"%s\""), menu_action_name);
+ purple_notify_formatted(gc, title, list_description, secondary, text, NULL, NULL);
+ g_free(secondary);
+ g_free(text);
}
void
oscar_show_visible_list(PurplePluginAction *action)
{
- show_private_list(action,
- AIM_SSI_TYPE_PERMIT,
- _("Visible List"),
- _("These buddies will see "
- "your status when you switch "
- "to \"Invisible\""),
- _(APPEAR_ONLINE),
- oscar_show_visible_list);
+ show_private_list(action, AIM_SSI_TYPE_PERMIT, _("Visible List"),
+ _("These buddies will see "
+ "your status when you switch "
+ "to \"Invisible\""),
+ _(APPEAR_ONLINE));
}
void
oscar_show_invisible_list(PurplePluginAction *action)
{
- show_private_list(action,
- AIM_SSI_TYPE_DENY,
- _("Invisible List"),
- _("These buddies will always see you as offline"),
- _(APPEAR_OFFLINE),
- oscar_show_invisible_list);
-}
-
+ show_private_list(action, AIM_SSI_TYPE_DENY, _("Invisible List"),
+ _("These buddies will always see you as offline"),
+ _(APPEAR_OFFLINE));
+}
\ No newline at end of file
More information about the Commits
mailing list