comparison: libpurple/protocols/sametime/sametime.c
libpurple/protocols/sametime/sametime.c
- branch
- soc.2013.gobjectification.plugins
- changeset 36782
- 64936dae41a3
- parent 36736
- 164cbd1113d4
- parent 34955
- 854143116575
- child 36862
- 7b6f1efa00c8
equal
deleted
inserted
replaced
| 36781:8fb558514134 | 36782:64936dae41a3 |
|---|---|
| 1724 " on server %s"); | 1724 " on server %s"); |
| 1725 prim = g_strdup_printf(msg, NSTR(host)); | 1725 prim = g_strdup_printf(msg, NSTR(host)); |
| 1726 | 1726 |
| 1727 purple_notify_message(gc, PURPLE_NOTIFY_MSG_INFO, | 1727 purple_notify_message(gc, PURPLE_NOTIFY_MSG_INFO, |
| 1728 _("Sametime Administrator Announcement"), | 1728 _("Sametime Administrator Announcement"), |
| 1729 prim, text, NULL, NULL); | 1729 prim, text, NULL, NULL, |
| 1730 purple_request_cpar_from_connection(gc)); | |
| 1730 | 1731 |
| 1731 g_free(prim); | 1732 g_free(prim); |
| 1732 } | 1733 } |
| 1733 | 1734 |
| 1734 | 1735 |
| 2029 pd = mwSession_getClientData(session); | 2030 pd = mwSession_getClientData(session); |
| 2030 gc = pd->gc; | 2031 gc = pd->gc; |
| 2031 | 2032 |
| 2032 serv_got_chat_left(gc, CONF_TO_ID(conf)); | 2033 serv_got_chat_left(gc, CONF_TO_ID(conf)); |
| 2033 | 2034 |
| 2034 purple_notify_error(gc, _("Conference Closed"), NULL, msg); | 2035 purple_notify_error(gc, _("Conference Closed"), NULL, msg, |
| 2036 purple_request_cpar_from_connection(gc)); | |
| 2035 g_free(msg); | 2037 g_free(msg); |
| 2036 } | 2038 } |
| 2037 | 2039 |
| 2038 | 2040 |
| 2039 static void mw_conf_peer_joined(struct mwConference *conf, | 2041 static void mw_conf_peer_joined(struct mwConference *conf, |
| 2454 | 2456 |
| 2455 | 2457 |
| 2456 /* Does what it takes to get an error displayed for a conversation */ | 2458 /* Does what it takes to get an error displayed for a conversation */ |
| 2457 static void convo_error(struct mwConversation *conv, guint32 err) { | 2459 static void convo_error(struct mwConversation *conv, guint32 err) { |
| 2458 PurpleIMConversation *im; | 2460 PurpleIMConversation *im; |
| 2461 PurpleConnection *pc; | |
| 2459 char *tmp, *text; | 2462 char *tmp, *text; |
| 2460 struct mwIdBlock *idb; | 2463 struct mwIdBlock *idb; |
| 2461 | 2464 |
| 2462 idb = mwConversation_getTarget(conv); | 2465 idb = mwConversation_getTarget(conv); |
| 2463 | 2466 |
| 2469 purple_conversation_get_account(PURPLE_CONVERSATION(im)), text)) { | 2472 purple_conversation_get_account(PURPLE_CONVERSATION(im)), text)) { |
| 2470 | 2473 |
| 2471 g_free(text); | 2474 g_free(text); |
| 2472 text = g_strdup_printf(_("Unable to send message to %s:"), | 2475 text = g_strdup_printf(_("Unable to send message to %s:"), |
| 2473 (idb->user)? idb->user: "(unknown)"); | 2476 (idb->user)? idb->user: "(unknown)"); |
| 2474 purple_notify_error(purple_account_get_connection( | 2477 pc = purple_account_get_connection(purple_conversation_get_account( |
| 2475 purple_conversation_get_account(PURPLE_CONVERSATION(im))), | 2478 PURPLE_CONVERSATION(im))); |
| 2476 NULL, text, tmp); | 2479 purple_notify_error(pc, NULL, text, tmp, purple_request_cpar_from_connection(pc)); |
| 2477 } | 2480 } |
| 2478 | 2481 |
| 2479 g_free(tmp); | 2482 g_free(tmp); |
| 2480 g_free(text); | 2483 g_free(text); |
| 2481 } | 2484 } |
| 3027 pd = mwSession_getClientData(session); | 3030 pd = mwSession_getClientData(session); |
| 3028 gc = pd->gc; | 3031 gc = pd->gc; |
| 3029 | 3032 |
| 3030 serv_got_chat_left(gc, PLACE_TO_ID(place)); | 3033 serv_got_chat_left(gc, PLACE_TO_ID(place)); |
| 3031 | 3034 |
| 3032 purple_notify_error(gc, _("Place Closed"), NULL, msg); | 3035 purple_notify_error(gc, _("Place Closed"), NULL, msg, |
| 3036 purple_request_cpar_from_connection(gc)); | |
| 3033 g_free(msg); | 3037 g_free(msg); |
| 3034 } | 3038 } |
| 3035 | 3039 |
| 3036 | 3040 |
| 3037 static void mw_place_peerJoined(struct mwPlace *place, | 3041 static void mw_place_peerJoined(struct mwPlace *place, |
| 5256 | 5260 |
| 5257 msgA = _("Unable to add group: group exists"); | 5261 msgA = _("Unable to add group: group exists"); |
| 5258 msgB = _("A group named '%s' already exists in your buddy list."); | 5262 msgB = _("A group named '%s' already exists in your buddy list."); |
| 5259 msg = g_strdup_printf(msgB, name); | 5263 msg = g_strdup_printf(msgB, name); |
| 5260 | 5264 |
| 5261 purple_notify_error(gc, _("Unable to add group"), msgA, msg); | 5265 purple_notify_error(gc, _("Unable to add group"), msgA, msg, |
| 5266 purple_request_cpar_from_connection(gc)); | |
| 5262 | 5267 |
| 5263 g_free(msg); | 5268 g_free(msg); |
| 5264 return; | 5269 return; |
| 5265 } | 5270 } |
| 5266 | 5271 |
| 5386 | 5391 |
| 5387 msgB = _("The identifier '%s' did not match any Notes Address Book" | 5392 msgB = _("The identifier '%s' did not match any Notes Address Book" |
| 5388 " groups in your Sametime community."); | 5393 " groups in your Sametime community."); |
| 5389 msg = g_strdup_printf(msgB, res->name); | 5394 msg = g_strdup_printf(msgB, res->name); |
| 5390 | 5395 |
| 5391 purple_notify_error(gc, _("Unable to add group"), msgA, msg); | 5396 purple_notify_error(gc, _("Unable to add group"), msgA, msg, |
| 5397 purple_request_cpar_from_connection(gc)); | |
| 5392 | 5398 |
| 5393 g_free(msg); | 5399 g_free(msg); |
| 5394 } | 5400 } |
| 5395 } | 5401 } |
| 5396 | 5402 |
| 5511 msgA = _("No matches"); | 5517 msgA = _("No matches"); |
| 5512 msgB = _("The identifier '%s' did not match any users in your" | 5518 msgB = _("The identifier '%s' did not match any users in your" |
| 5513 " Sametime community."); | 5519 " Sametime community."); |
| 5514 msg = g_strdup_printf(msgB, (res && res->name) ? NSTR(res->name) : ""); | 5520 msg = g_strdup_printf(msgB, (res && res->name) ? NSTR(res->name) : ""); |
| 5515 | 5521 |
| 5516 purple_notify_error(gc, _("No Matches"), msgA, msg); | 5522 purple_notify_error(gc, _("No Matches"), msgA, msg, |
| 5523 purple_request_cpar_from_connection(gc)); | |
| 5517 | 5524 |
| 5518 g_free(msg); | 5525 g_free(msg); |
| 5519 } | 5526 } |
| 5520 } | 5527 } |
| 5521 | 5528 |
