pidgin.yaz: src/protocols/sametime/sametime.c comparison

comparison src/protocols/sametime/sametime.c @ 12813:547c199072c8

[gaim-migrate @ 15161] - fixes to sametime administrative notification message dialog to make them a little less obscure as to what the heck they are - added an extra step to the sametime connection login between authenticating and starting services - fix to outgoing encoding of html formatted messages in sametime to use NCR encoding - addition of gaim_utf8_ncr_encode to util.h - fix of minor possible (unlikely) memleak in gaim_utf8_ncr_decode committer: Tailor Script <tailor@pidgin.im>

author	Christopher O'Brien <siege@pidgin.im>
date	Wed, 11 Jan 2006 03:07:01 +0000
parents	258871a62600
children	aacda65b3449

comparison

equal deleted inserted replaced

-:7e6de7079eeb
+:547c199072c8
 #include <mw_srvc_place.h>
 #include <mw_srvc_resolve.h>
 #include <mw_srvc_store.h>
 #include <mw_st_list.h>
-/* project includes */
+/* plugin includes */
 #include "sametime.h"
 /* considering that there's no display of this information for prpls,
 I don't know why I even bother providing these. Oh valiant reader,
 #define MW_PRPL_OPT_FORCE_LOGIN   MW_PRPL_OPT_BASE "/force_login"
 #define MW_PRPL_OPT_SAVE_DYNAMIC  MW_PRPL_OPT_BASE "/save_dynamic"
 /* stages of connecting-ness */
-#define MW_CONNECT_STEPS  9
+#define MW_CONNECT_STEPS  10
 /* stages of conciousness */
 #define MW_STATE_OFFLINE      "offline"
 #define MW_STATE_ACTIVE       "active"
 acct = gaim_connection_get_account(gc);
 /* grab the buddy list from the server */
 unit = mwStorageUnit_new(mwStore_AWARE_LIST);
 mwServiceStorage_load(pd->srvc_store, unit, fetch_blist_cb, pd, NULL);
-/* start watching for new conversations */
-gaim_signal_connect(gaim_conversations_get_handle(),
-		      "conversation-created", gc,
-		      GAIM_CALLBACK(conversation_created_cb), pd);
-/* watch for group extended menu items */
-gaim_signal_connect(gaim_blist_get_handle(),
-		      "blist-node-extended-menu", gc,
-		      GAIM_CALLBACK(blist_node_menu_cb), pd);
 /* find all the NAB groups and subscribe to them */
 blist = gaim_get_blist();
 for(l = blist->root; l; l = l->next) {
 GaimGroup *group = (GaimGroup *) l;
 here */
 static void session_started(struct mwGaimPluginData *pd) {
 GaimStatus *status;
 GaimAccount *acct;
+/* set out initial status */
 acct = gaim_connection_get_account(pd->gc);
 status = gaim_account_get_active_status(acct);
 mw_prpl_set_status(acct, status);
+/* start watching for new conversations */
+gaim_signal_connect(gaim_conversations_get_handle(),
+		      "conversation-created", pd->gc,
+		      GAIM_CALLBACK(conversation_created_cb), pd);
+/* watch for group extended menu items */
+gaim_signal_connect(gaim_blist_get_handle(),
+		      "blist-node-extended-menu", pd->gc,
+		      GAIM_CALLBACK(blist_node_menu_cb), pd);
 /* use our services to do neat things */
 services_starting(pd);
 }
 msg = _("Login Acknowledged");
 gaim_connection_update_progress(gc, msg, 8, MW_CONNECT_STEPS);
 break;
 case mwSession_STARTED:
-msg = _("Connected to Sametime Community Server");
+msg = _("Starting Services");
 gaim_connection_update_progress(gc, msg, 9, MW_CONNECT_STEPS);
+session_started(pd);
+msg = _("Connected");
+gaim_connection_update_progress(gc, msg, 10, MW_CONNECT_STEPS);
 gaim_connection_set_state(gc, GAIM_CONNECTED);
-session_started(pd);
 break;
 case mwSession_STOPPING:
 if(GPOINTER_TO_UINT(info) & ERR_FAILURE) {
 msg = mwError(GPOINTER_TO_UINT(info));
 }
 static void mw_session_admin(struct mwSession *session,
 			     const char *text) {
+GaimConnection *gc;
-GaimConnection *gc = session_to_gc(session);
+GaimAccount *acct;
+const char *host;
+char *prim;
+gc = session_to_gc(session);
 g_return_if_fail(gc != NULL);
-/** @todo Admin alerts should probably be in a conversation window
+acct = gaim_connection_get_account(gc);
-rather than a gaim_notify_message. Or in some sort of updating
+g_return_if_fail(acct != NULL);
-dialog, or something. */
+host = gaim_account_get_string(acct, MW_KEY_HOST, NULL);
-gaim_notify_message(gc, GAIM_NOTIFY_MSG_INFO, _("Admin Alert"),
-		      text, NULL, NULL, NULL);
+prim = _("A Sametime administrator has issued the following announcement"
+	   " on server %s");
+prim = g_strdup_printf(prim, NSTR(host));
+gaim_notify_message(gc, GAIM_NOTIFY_MSG_INFO,
+		      _("Sametime Administrator Announcement"),
+		      prim, text, NULL, NULL);
+g_free(prim);
 }
 /** called from read_cb, attempts to read available data from sock and
 pass it to the session, passing back the return code from the read
 const char *fn = gaim_imgstore_get_filename(img);
 return g_strdup_printf("attachment; filename=\"%s\"", fn);
 }
+#if NB_HACK
 static char *nb_im_encode(GaimConnection *gc, const char *message) {
 GaimAccount *acct;
 const char *enc;
 char *ret;
 GError *error = NULL;
 acct = gaim_connection_get_account(gc);
 g_return_val_if_fail(acct != NULL, NULL);
 enc = gaim_account_get_string(acct, MW_KEY_ENCODING,
 				MW_PLUGIN_DEFAULT_ENCODING);
 /* something went so wrong that not even the fallback worked */
 if(! ret) ret = g_strdup(message);
 return ret;
 }
+#endif
+#if NB_HACK
 static gboolean is_nb(struct mwConversation *conv) {
 struct mwLoginInfo *info;
 info = mwConversation_getTargetInfo(conv);
 if(! info) return FALSE;
 we can discount the real 0x1000 */
 /* I tried to avoid having any client-type-dependant code in here, I
 really did. Oh well. CURSE YOU NOTESBUDDY */
 return ((info->type == 0x1000) || ((info->type & 0xff00) == 0x1400));
 }
+#endif
 /** turn an IM with embedded images into a multi-part mime document */
 static char *im_mime_convert(GaimConnection *gc,
 			     struct mwConversation *conv,
 /* add the text/html part */
 part = gaim_mime_part_new(doc);
 gaim_mime_part_set_field(part, "Content-Disposition", "inline");
+#if NB_HACK
 if(is_nb(conv)) {
 GaimAccount *acct = gaim_connection_get_account(gc);
 tmp = (char *) gaim_account_get_string(acct, MW_KEY_ENCODING,
 					   MW_PLUGIN_DEFAULT_ENCODING);
 gaim_mime_part_set_field(part, "Content-Type", "text/html");
 gaim_mime_part_set_field(part, "Content-Transfer-Encoding", "8bit");
 gaim_mime_part_set_data(part, str->str);
 }
+#else
+tmp = gaim_utf8_ncr_encode(str->str);
+gaim_mime_part_set_field(part, "Content-Type", "text/html");
+gaim_mime_part_set_field(part, "Content-Transfer-Encoding", "7bit");
+gaim_mime_part_set_data(part, str->str);
+g_free(tmp);
+#endif
 g_string_free(str, TRUE);
 str = g_string_new(NULL);
 gaim_mime_document_write(doc, str);
 tmp = str->str;
 g_free(tmp);
 } else if(mwConversation_supports(conv, mwImSend_HTML)) {
 /* send an HTML message */
+#if NB_HACK
 if(is_nb(conv)) {
 	/* html messages need the notesbuddy hack */
 	char *msg = nb_im_encode(gc, message);
 	tmp = gaim_strdup_withhtml(msg);
 } else {
 	/* need to do this to get the \n to <br> conversion */
 	tmp = gaim_strdup_withhtml(message);
 }
+#else
+char *ncr;
+ncr = gaim_utf8_ncr_encode(message);
+tmp = gaim_strdup_withhtml(ncr);
+g_free(ncr);
+#endif
 ret = mwConversation_send(conv, mwImSend_HTML, tmp);
 g_free(tmp);
 } else {
 /* port to connect to */
 opt = gaim_account_option_int_new(_("Port"), MW_KEY_PORT,
 				    MW_PLUGIN_DEFAULT_PORT);
 l = g_list_append(l, opt);
+#if NB_HACK
 /* notesbuddy hack encoding */
 opt = gaim_account_option_string_new(_("NotesBuddy encoding"),
 				       MW_KEY_ENCODING,
 				       MW_PLUGIN_DEFAULT_ENCODING);
 l = g_list_append(l, opt);
+#endif
 { /* copy the old force login setting from prefs if it's
 there. Don't delete the preference, since there may be more
 than one account that wants to check for it. */
 gboolean b = FALSE;

Mercurial > pidgin.yaz

comparison src/protocols/sametime/sametime.c @ 12813:547c199072c8