Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/xmpp.c @ 1780:e4378fbab5d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Major API cleanup - bump API to 4 Get rid of old CamelCase names in screen.h
author Mikael Berthe <mikael@lilotux.net>
date Sun, 14 Mar 2010 12:09:08 +0100
parents c4f67e2e675f
children d2747442918a
comparison
equal deleted inserted replaced
1779:2911c950dcd1 1780:e4378fbab5d7
296 296
297 static LmHandlerResult cb_xep184(LmMessageHandler *h, LmConnection *c, 297 static LmHandlerResult cb_xep184(LmMessageHandler *h, LmConnection *c,
298 LmMessage *m, gpointer user_data) 298 LmMessage *m, gpointer user_data)
299 { 299 {
300 char *from = jidtodisp(lm_message_get_from(m)); 300 char *from = jidtodisp(lm_message_get_from(m));
301 scr_RemoveReceiptFlag(from, h); 301 scr_remove_receipt_flag(from, h);
302 g_free(from); 302 g_free(from);
303 return LM_HANDLER_RESULT_REMOVE_MESSAGE; 303 return LM_HANDLER_RESULT_REMOVE_MESSAGE;
304 } 304 }
305 305
306 // xmpp_send_msg(jid, text, type, subject, 306 // xmpp_send_msg(jid, text, type, subject,
952 if (rosternotes) 952 if (rosternotes)
953 lm_message_node_unref(rosternotes); 953 lm_message_node_unref(rosternotes);
954 rosternotes = NULL; 954 rosternotes = NULL;
955 // Update display 955 // Update display
956 update_roster = TRUE; 956 update_roster = TRUE;
957 scr_UpdateBuddyWindow(); 957 scr_update_buddy_window();
958 958
959 if (!reason) 959 if (!reason)
960 scr_LogPrint(LPRINT_LOGNORM, "Disconnected."); 960 scr_LogPrint(LPRINT_LOGNORM, "Disconnected.");
961 else 961 else
962 scr_LogPrint(LPRINT_NORMAL, "Disconnected, reason: %d->'%s'", reason, str); 962 scr_LogPrint(LPRINT_NORMAL, "Disconnected, reason: %d->'%s'", reason, str);
1143 } else { 1143 } else {
1144 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); 1144 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
1145 } 1145 }
1146 1146
1147 buddylist_build(); 1147 buddylist_build();
1148 scr_DrawRoster(); 1148 scr_draw_roster();
1149 goto gotmessage_return; 1149 goto gotmessage_return;
1150 } 1150 }
1151 1151
1152 // We don't call the message_in hook if 'block_unsubscribed' is true and 1152 // We don't call the message_in hook if 'block_unsubscribed' is true and
1153 // this is a regular message from an unsubscribed user. 1153 // this is a regular message from an unsubscribed user.
1247 if (settings_opt_get_int("log_muc_conf")) 1247 if (settings_opt_get_int("log_muc_conf"))
1248 hlog_write_message(s, 0, -1, mbuf); 1248 hlog_write_message(s, 0, -1, mbuf);
1249 g_free(s); 1249 g_free(s);
1250 g_free(mbuf); 1250 g_free(mbuf);
1251 // The topic is displayed in the chat status line, so refresh now. 1251 // The topic is displayed in the chat status line, so refresh now.
1252 scr_UpdateChatStatus(TRUE); 1252 scr_update_chat_status(TRUE);
1253 } 1253 }
1254 } 1254 }
1255 1255
1256 // Timestamp? 1256 // Timestamp?
1257 timestamp = lm_message_node_get_timestamp(m->node); 1257 timestamp = lm_message_node_get_timestamp(m->node);
1918 mystatusmsg = g_strdup(msg); 1918 mystatusmsg = g_strdup(msg);
1919 else 1919 else
1920 mystatusmsg = NULL; 1920 mystatusmsg = NULL;
1921 } 1921 }
1922 1922
1923 if (!scr_CursesStatus()) 1923 if (!scr_curses_status())
1924 return; // Called from config. file 1924 return; // Called from config. file
1925 1925
1926 if (!Autoaway) 1926 if (!Autoaway)
1927 update_last_use(); 1927 update_last_use();
1928 1928
1929 // Update status line 1929 // Update status line
1930 scr_UpdateMainStatus(TRUE); 1930 scr_update_main_status(TRUE);
1931 } 1931 }
1932 1932
1933 1933
1934 enum imstatus xmpp_getstatus(void) 1934 enum imstatus xmpp_getstatus(void)
1935 { 1935 {