cpw.qulogic.msnp16: 0b827664: msn: Merge dialog and error to get an un...
masca at cpw.pidgin.im
masca at cpw.pidgin.im
Thu Mar 11 21:35:58 EST 2010
-----------------------------------------------------------------
Revision: 0b827664dfddcf3316ecf9b872a2e82447f9e8a0
Ancestor: cb9d3322c1874bfd71aafac6df922617d6312644
Author: masca at cpw.pidgin.im
Date: 2010-03-12T02:26:57
Branch: im.pidgin.cpw.qulogic.msnp16
URL: http://d.pidgin.im/viewmtn/revision/info/0b827664dfddcf3316ecf9b872a2e82447f9e8a0
Deleted entries:
libpurple/protocols/msn/dialog.c
libpurple/protocols/msn/dialog.h
Modified files:
libpurple/protocols/msn/Makefile.am
libpurple/protocols/msn/error.c
libpurple/protocols/msn/error.h
libpurple/protocols/msn/session.c
ChangeLog:
msn: Merge dialog and error to get an unified msn_error api.
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/Makefile.am bc0d9535367c5da381e6515af27b49fb54888e96
+++ libpurple/protocols/msn/Makefile.am 290414b8b333321d8dc6d53c976336a5ba73af24
@@ -12,8 +12,6 @@ MSNSOURCES = \
command.h \
contact.c\
contact.h\
- dialog.c \
- dialog.h \
error.c \
error.h \
group.c \
============================================================
--- libpurple/protocols/msn/error.c b40d7ae02e64613e5091ef538d37b39528a67342
+++ libpurple/protocols/msn/error.c 8d33dd4ecd569adfed1f40fb5577414afbedbdd6
@@ -24,6 +24,15 @@
#include "msn.h"
#include "error.h"
+typedef struct
+{
+ PurpleConnection *gc;
+ char *who;
+ char *group;
+ gboolean add;
+
+} MsnAddRemData;
+
const char *
msn_error_get_text(unsigned int type, gboolean *debug)
{
@@ -264,3 +273,115 @@ msn_error_handle(MsnSession *session, un
g_free(buf);
}
+/* Remove the buddy referenced by the MsnAddRemData before the serverside list
+ * is changed. If the buddy will be added, he'll be added back; if he will be
+ * removed, he won't be. */
+/* Actually with our MSNP14 code that isn't true yet, he won't be added back :(
+ * */
+static void
+msn_complete_sync_issue(MsnAddRemData *data)
+{
+ PurpleBuddy *buddy;
+ PurpleGroup *group = NULL;
+
+ if (data->group != NULL)
+ group = purple_find_group(data->group);
+
+ if (group != NULL)
+ buddy = purple_find_buddy_in_group(purple_connection_get_account(data->gc), data->who, group);
+ else
+ buddy = purple_find_buddy(purple_connection_get_account(data->gc), data->who);
+
+ if (buddy != NULL)
+ purple_blist_remove_buddy(buddy);
+}
+
+
+static void
+msn_add_cb(MsnAddRemData *data)
+{
+#if 0
+ /* this *should* be necessary !! */
+ msn_complete_sync_issue(data);
+#endif
+
+ if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
+ {
+ MsnSession *session = data->gc->proto_data;
+ MsnUserList *userlist = session->userlist;
+
+ msn_userlist_add_buddy(userlist, data->who, data->group);
+ }
+
+ g_free(data->group);
+ g_free(data->who);
+ g_free(data);
+}
+
+static void
+msn_rem_cb(MsnAddRemData *data)
+{
+ msn_complete_sync_issue(data);
+
+ if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
+ {
+ MsnSession *session = data->gc->proto_data;
+ MsnUserList *userlist = session->userlist;
+
+ if (data->group == NULL) {
+ msn_userlist_rem_buddy_from_list(userlist, data->who, MSN_LIST_FL);
+ } else {
+ g_free(data->group);
+ }
+ }
+
+ g_free(data->who);
+ g_free(data);
+}
+
+void
+msn_error_sync_issue(MsnSession *session, const char *passport,
+ const char *group_name)
+{
+ PurpleConnection *gc;
+ PurpleAccount *account;
+ MsnAddRemData *data;
+ char *msg, *reason;
+
+ account = session->account;
+ gc = purple_account_get_connection(account);
+
+ data = g_new0(MsnAddRemData, 1);
+ data->who = g_strdup(passport);
+ data->group = g_strdup(group_name);
+ data->gc = gc;
+
+ msg = g_strdup_printf(_("Buddy list synchronization issue in %s (%s)"),
+ purple_account_get_username(account),
+ purple_account_get_protocol_name(account));
+
+ if (group_name != NULL)
+ {
+ reason = g_strdup_printf(_("%s on the local list is "
+ "inside the group \"%s\" but not on "
+ "the server list. "
+ "Do you want this buddy to be added?"),
+ passport, group_name);
+ }
+ else
+ {
+ reason = g_strdup_printf(_("%s is on the local list but "
+ "not on the server list. "
+ "Do you want this buddy to be added?"),
+ passport);
+ }
+
+ purple_request_action(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE,
+ purple_connection_get_account(gc), data->who, NULL,
+ data, 2,
+ _("Yes"), G_CALLBACK(msn_add_cb),
+ _("No"), G_CALLBACK(msn_rem_cb));
+
+ g_free(reason);
+ g_free(msg);
+}
============================================================
--- libpurple/protocols/msn/error.h f69edfaaafbb3f6a22707fa670267d42ab6881cc
+++ libpurple/protocols/msn/error.h aa4fd7fdb031449f21730a119ecf9b5ff1160796
@@ -44,4 +44,14 @@ void msn_error_handle(MsnSession *sessio
*/
void msn_error_handle(MsnSession *session, unsigned int type);
+/**
+ * Show the sync issue in a dialog using request api
+ *
+ * @param sesion MsnSession associated to this error.
+ * @param passport The passport associated with the error.
+ * @param group_name The group in the buddy is suppoused to be
+ */
+void msn_error_sync_issue(MsnSession *session, const char *passport,
+ const char *group_name);
+
#endif /* MSN_ERROR_H */
============================================================
--- libpurple/protocols/msn/session.c 622f2fc547262813762e8ca36e6d9c3964265fec
+++ libpurple/protocols/msn/session.c 58b0a5e6b39ea897ee1647eebfd57bd6484bb004
@@ -21,14 +21,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+#include "error.h"
#include "msn.h"
#include "msnutils.h"
#include "session.h"
#include "notification.h"
#include "oim.h"
-#include "dialog.h"
-
MsnSession *
msn_session_new(PurpleAccount *account)
{
@@ -301,7 +300,7 @@ msn_session_sync_users(MsnSession *sessi
if (!found) {
if ((remote_user == NULL) || !(remote_user->list_op & MSN_LIST_FL_OP)) {
/* The user is not on the server list */
- msn_show_sync_issue(session, buddy_name, group_name);
+ msn_error_sync_issue(session, buddy_name, group_name);
} else {
/* The user is not in that group on the server list */
to_remove = g_list_prepend(to_remove, buddy);
More information about the Commits
mailing list