[PATCH] Ignoring "Has you" and "You're not in friend's contact list" information.

0 views
Skip to first unread message

Demétrio

unread,
Jan 10, 2011, 5:57:27 PM1/10/11
to msn-...@googlegroups.com, Demétrio
Ignoring the information. It's a bug on WML servers and looks like it'll not be fixed

Demétrio (1):
Ignoring "Has You" and "You're not in contact list" messages.

msn.c | 4 +---
session.c | 10 ----------
2 files changed, 1 insertions(+), 13 deletions(-)

--
1.7.3.4

Demétrio

unread,
Jan 10, 2011, 5:57:28 PM1/10/11
to msn-...@googlegroups.com, Demétrio
Ignoring "Has You" and "You're not in friend contact list" informations.
---

msn.c | 4 +---
session.c | 10 ----------
2 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/msn.c b/msn.c
index cbd210d..1e6ae10 100644
--- a/msn.c
+++ b/msn.c
@@ -730,9 +730,7 @@ tooltip_text (PurpleBuddy *buddy,
purple_notify_user_info_add_pair (user_info, _("Working"), user->media.title);
}
}
-
- purple_notify_user_info_add_pair (user_info, _("Has you"),
- ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
+
}

purple_notify_user_info_add_pair (user_info, _("Blocked"),
diff --git a/session.c b/session.c
index eeb9b39..9a3282f 100644
--- a/session.c
+++ b/session.c
@@ -48,7 +48,6 @@
static void
conversation_created_cb (PurpleConversation *conv, gpointer data)
{
- gchar *str;
const gchar *tmp_user, *friendly_name;
MsnSession *session = data;
struct pn_contact *contact;
@@ -61,15 +60,6 @@ conversation_created_cb (PurpleConversation *conv, gpointer data)
friendly_name = tmp_user;
if (!friendly_name)
friendly_name = tmp_user;
-
- if (contact && !(contact->list_op & (1 << MSN_LIST_RL)))
- {
- str = g_strdup_printf (_("You are not in %s's contact list."), friendly_name);
-
- purple_conversation_write (conv, NULL, str, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NOTIFY, time (NULL));
-
- g_free (str);
- }
}

#ifdef INTERNAL_MAINLOOP
--
1.7.3.4

Felipe Contreras

unread,
Jan 10, 2011, 6:03:29 PM1/10/11
to Demétrio, msn-...@googlegroups.com
Hi,

This patch looks ok. Except that if it's a single patch, you don't
need --cover-letter, a single patch is enough.

Also, the comment that you added in previous patches should be in the
commit message. I'll apply this as:

---
Ignore reverse presence

The server is not sending this information correctly any more, so
let's not show it.
---

And one small comment below. Thanks!

On Tue, Jan 11, 2011 at 12:57 AM, Demétrio <neto.d...@gmail.com> wrote:
> Ignoring "Has You" and "You're not in friend contact list" informations.
> ---
>  msn.c     |    4 +---
>  session.c |   10 ----------
>  2 files changed, 1 insertions(+), 13 deletions(-)
>
> diff --git a/msn.c b/msn.c
> index cbd210d..1e6ae10 100644
> --- a/msn.c
> +++ b/msn.c
> @@ -730,9 +730,7 @@ tooltip_text (PurpleBuddy *buddy,
>                 purple_notify_user_info_add_pair (user_info, _("Working"), user->media.title);
>             }
>         }
> -
> -        purple_notify_user_info_add_pair (user_info, _("Has you"),
> -                                          ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
> +

Not need for that extra empty line.


--
Felipe Contreras

Reply all
Reply to author
Forward
0 new messages