aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--protocols/purple/purple.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c
index 6bb8fc99..f28e5cf0 100644
--- a/protocols/purple/purple.c
+++ b/protocols/purple/purple.c
@@ -379,9 +379,9 @@ static void prplcb_blist_update( PurpleBuddyList *list, PurpleBlistNode *node )
static void prplcb_blist_remove( PurpleBuddyList *list, PurpleBlistNode *node )
{
+ /*
PurpleBuddy *bud = (PurpleBuddy*) node;
- /*
if( node->type == PURPLE_BLIST_BUDDY_NODE )
{
struct im_connection *ic = purple_ic_by_pa( bud->account );
@@ -406,10 +406,17 @@ static PurpleBlistUiOps bee_blist_uiops =
static void prplcb_conv_im( PurpleConversation *conv, const char *who, const char *message, PurpleMessageFlags flags, time_t mtime )
{
struct im_connection *ic = purple_ic_by_pa( conv->account );
+ PurpleBuddy *buddy;
/* ..._SEND means it's an outgoing message, no need to echo those. */
- if( !( flags & PURPLE_MESSAGE_SEND ) )
- imcb_buddy_msg( ic, (char*) who, (char*) message, 0, mtime );
+ if( flags & PURPLE_MESSAGE_SEND )
+ return;
+
+ buddy = purple_find_buddy( conv->account, who );
+ if( buddy != NULL )
+ who = purple_buddy_get_contact_alias( buddy );
+
+ imcb_buddy_msg( ic, (char*) who, (char*) message, 0, mtime );
}
static PurpleConversationUiOps bee_conv_uiops =
ix/0.21.0.13 Unnamed repository; edit this file 'description' to name the repository.MimesBrønn
aboutsummaryrefslogtreecommitdiffstats
path: root/spec/models/customstates.rb
blob: bffbe86fbe006437d38758d841390d1085e6a463 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67