Mercurial > pidgin3 / file comparison

comparison: finch/gntconv.c

finch/gntconv.c

branch
soc.2013.gobjectification
changeset 34670
9bd5bd903dc7
parent 34666
cd9ebef950c6
child 34671
ca9b45be7a63
equal deleted inserted replaced
34669:250f77369396 34670:9bd5bd903dc7
120 if (send || (purple_im_conversation_get_type_again(im) != 0 && 120 if (send || (purple_im_conversation_get_type_again(im) != 0 &&
121 time(NULL) > purple_im_conversation_get_type_again(im))) { 121 time(NULL) > purple_im_conversation_get_type_again(im))) {
122 unsigned int timeout; 122 unsigned int timeout;
123 timeout = serv_send_typing(purple_conversation_get_connection(conv), 123 timeout = serv_send_typing(purple_conversation_get_connection(conv),
124 purple_conversation_get_name(conv), 124 purple_conversation_get_name(conv),
125 PURPLE_IM_CONVERSATION_TYPING); 125 PURPLE_IM_TYPING);
126 purple_im_conversation_set_type_again(im, timeout); 126 purple_im_conversation_set_type_again(im, timeout);
127 } 127 }
128 } else { 128 } else {
129 purple_im_conversation_stop_send_typed_timeout(im); 129 purple_im_conversation_stop_send_typed_timeout(im);
130 130
131 serv_send_typing(purple_conversation_get_connection(conv), 131 serv_send_typing(purple_conversation_get_connection(conv),
132 purple_conversation_get_name(conv), 132 purple_conversation_get_name(conv),
133 PURPLE_IM_CONVERSATION_NOT_TYPING); 133 PURPLE_IM_NOT_TYPING);
134 } 134 }
135 } 135 }
136 } 136 }
137 137
138 static void 138 static void
268 return; 268 return;
269 269
270 conv = PURPLE_CONVERSATION(im); 270 conv = PURPLE_CONVERSATION(im);
271 ggc = FINCH_CONV(conv); 271 ggc = FINCH_CONV(conv);
272 272
273 if (purple_im_conversation_get_typing_state(im) == PURPLE_IM_CONVERSATION_TYPING) { 273 if (purple_im_conversation_get_typing_state(im) == PURPLE_IM_TYPING) {
274 int scroll; 274 int scroll;
275 str = get_conversation_title(conv, account); 275 str = get_conversation_title(conv, account);
276 title = g_strdup_printf(_("%s [%s]"), str, 276 title = g_strdup_printf(_("%s [%s]"), str,
277 gnt_ascii_only() ? "T" : "\342\243\277"); 277 gnt_ascii_only() ? "T" : "\342\243\277");
278 g_free(str); 278 g_free(str);
992 992
993 g_free(newline); 993 g_free(newline);
994 g_free(strip); 994 g_free(strip);
995 995
996 if (PURPLE_IS_IM_CONVERSATION(conv) && purple_im_conversation_get_typing_state( 996 if (PURPLE_IS_IM_CONVERSATION(conv) && purple_im_conversation_get_typing_state(
997 PURPLE_IM_CONVERSATION(conv)) == PURPLE_IM_CONVERSATION_TYPING) { 997 PURPLE_IM_CONVERSATION(conv)) == PURPLE_IM_TYPING) {
998 strip = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_title(conv)); 998 strip = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_title(conv));
999 gnt_text_view_append_text_with_tag(GNT_TEXT_VIEW(ggconv->tv), 999 gnt_text_view_append_text_with_tag(GNT_TEXT_VIEW(ggconv->tv),
1000 strip, GNT_TEXT_FLAG_DIM, "typing"); 1000 strip, GNT_TEXT_FLAG_DIM, "typing");
1001 g_free(strip); 1001 g_free(strip);
1002 } 1002 }
1060 1060
1061 finch_write_common(conv, name, message, flags, mtime); 1061 finch_write_common(conv, name, message, flags, mtime);
1062 } 1062 }
1063 1063
1064 static const char * 1064 static const char *
1065 chat_flag_text(PurpleChatConversationBuddyFlags flags) 1065 chat_flag_text(PurpleChatUserFlags flags)
1066 { 1066 {
1067 if (flags & PURPLE_CHAT_CONVERSATION_BUDDY_FOUNDER) 1067 if (flags & PURPLE_CHAT_USER_FOUNDER)
1068 return "~"; 1068 return "~";
1069 if (flags & PURPLE_CHAT_CONVERSATION_BUDDY_OP) 1069 if (flags & PURPLE_CHAT_USER_OP)
1070 return "@"; 1070 return "@";
1071 if (flags & PURPLE_CHAT_CONVERSATION_BUDDY_HALFOP) 1071 if (flags & PURPLE_CHAT_USER_HALFOP)
1072 return "%"; 1072 return "%";
1073 if (flags & PURPLE_CHAT_CONVERSATION_BUDDY_VOICE) 1073 if (flags & PURPLE_CHAT_USER_VOICE)
1074 return "+"; 1074 return "+";
1075 return " "; 1075 return " ";
1076 } 1076 }
1077 1077
1078 static void 1078 static void
1091 1091
1092 g_string_printf(string, 1092 g_string_printf(string,
1093 ngettext("List of %d user:\n", "List of %d users:\n", count), count); 1093 ngettext("List of %d user:\n", "List of %d users:\n", count), count);
1094 for (iter = users; iter; iter = iter->next) 1094 for (iter = users; iter; iter = iter->next)
1095 { 1095 {
1096 PurpleChatConversationBuddy *cbuddy = iter->data; 1096 PurpleChatUser *chatuser = iter->data;
1097 const char *str; 1097 const char *str;
1098 1098
1099 if ((str = purple_chat_conversation_buddy_get_alias(cbuddy)) == NULL) 1099 if ((str = purple_chat_user_get_alias(chatuser)) == NULL)
1100 str = purple_chat_conversation_buddy_get_name(cbuddy); 1100 str = purple_chat_user_get_name(chatuser);
1101 g_string_append_printf(string, "[ %s ]", str); 1101 g_string_append_printf(string, "[ %s ]", str);
1102 } 1102 }
1103 1103
1104 purple_conversation_write(conv, NULL, string->str, 1104 purple_conversation_write(conv, NULL, string->str,
1105 PURPLE_MESSAGE_SYSTEM, time(NULL)); 1105 PURPLE_MESSAGE_SYSTEM, time(NULL));
1106 g_string_free(string, TRUE); 1106 g_string_free(string, TRUE);
1107 } 1107 }
1108 1108
1109 for (; users; users = users->next) 1109 for (; users; users = users->next)
1110 { 1110 {
1111 PurpleChatConversationBuddy *cbuddy = users->data; 1111 PurpleChatUser *chatuser = users->data;
1112 GntTree *tree = GNT_TREE(ggc->u.chat->userlist); 1112 GntTree *tree = GNT_TREE(ggc->u.chat->userlist);
1113 gnt_entry_add_suggest(entry, purple_chat_conversation_buddy_get_name(cbuddy)); 1113 gnt_entry_add_suggest(entry, purple_chat_user_get_name(chatuser));
1114 gnt_entry_add_suggest(entry, purple_chat_conversation_buddy_get_alias(cbuddy)); 1114 gnt_entry_add_suggest(entry, purple_chat_user_get_alias(chatuser));
1115 gnt_tree_add_row_after(tree, g_strdup(purple_chat_conversation_buddy_get_name(cbuddy)), 1115 gnt_tree_add_row_after(tree, g_strdup(purple_chat_user_get_name(chatuser)),
1116 gnt_tree_create_row(tree, chat_flag_text(purple_chat_conversation_buddy_get_flags(cbuddy)), purple_chat_conversation_buddy_get_alias(cbuddy)), NULL, NULL); 1116 gnt_tree_create_row(tree, chat_flag_text(purple_chat_user_get_flags(chatuser)), purple_chat_user_get_alias(chatuser)), NULL, NULL);
1117 } 1117 }
1118 } 1118 }
1119 1119
1120 static void 1120 static void
1121 finch_chat_rename_user(PurpleChatConversation *chat, const char *old, const char *new_n, const char *new_a) 1121 finch_chat_rename_user(PurpleChatConversation *chat, const char *old, const char *new_n, const char *new_a)
1122 { 1122 {
1123 /* Update the name for string completion */ 1123 /* Update the name for string completion */
1124 FinchConv *ggc = FINCH_CONV(PURPLE_CONVERSATION(chat)); 1124 FinchConv *ggc = FINCH_CONV(PURPLE_CONVERSATION(chat));
1125 GntEntry *entry = GNT_ENTRY(ggc->entry); 1125 GntEntry *entry = GNT_ENTRY(ggc->entry);
1126 GntTree *tree = GNT_TREE(ggc->u.chat->userlist); 1126 GntTree *tree = GNT_TREE(ggc->u.chat->userlist);
1127 PurpleChatConversationBuddy *cb = purple_chat_conversation_find_buddy(chat, new_n); 1127 PurpleChatUser *cb = purple_chat_conversation_find_buddy(chat, new_n);
1128 1128
1129 gnt_entry_remove_suggest(entry, old); 1129 gnt_entry_remove_suggest(entry, old);
1130 gnt_tree_remove(tree, (gpointer)old); 1130 gnt_tree_remove(tree, (gpointer)old);
1131 1131
1132 gnt_entry_add_suggest(entry, new_n); 1132 gnt_entry_add_suggest(entry, new_n);
1133 gnt_entry_add_suggest(entry, new_a); 1133 gnt_entry_add_suggest(entry, new_a);
1134 gnt_tree_add_row_after(tree, g_strdup(new_n), 1134 gnt_tree_add_row_after(tree, g_strdup(new_n),
1135 gnt_tree_create_row(tree, chat_flag_text(purple_chat_conversation_buddy_get_flags(cb)), new_a), NULL, NULL); 1135 gnt_tree_create_row(tree, chat_flag_text(purple_chat_user_get_flags(cb)), new_a), NULL, NULL);
1136 } 1136 }
1137 1137
1138 static void 1138 static void
1139 finch_chat_remove_users(PurpleChatConversation *chat, GList *list) 1139 finch_chat_remove_users(PurpleChatConversation *chat, GList *list)
1140 { 1140 {
1147 gnt_tree_remove(tree, list->data); 1147 gnt_tree_remove(tree, list->data);
1148 } 1148 }
1149 } 1149 }
1150 1150
1151 static void 1151 static void
1152 finch_chat_update_user(PurpleChatConversationBuddy *cb) 1152 finch_chat_update_user(PurpleChatUser *cb)
1153 { 1153 {
1154 PurpleChatConversation *chat; 1154 PurpleChatConversation *chat;
1155 FinchConv *ggc; 1155 FinchConv *ggc;
1156 if (!cb) 1156 if (!cb)
1157 return; 1157 return;
1158 1158
1159 chat = purple_chat_conversation_buddy_get_chat(cb); 1159 chat = purple_chat_user_get_chat(cb);
1160 ggc = FINCH_CONV(PURPLE_CONVERSATION(chat)); 1160 ggc = FINCH_CONV(PURPLE_CONVERSATION(chat));
1161 gnt_tree_change_text(GNT_TREE(ggc->u.chat->userlist), 1161 gnt_tree_change_text(GNT_TREE(ggc->u.chat->userlist),
1162 (gpointer)purple_chat_conversation_buddy_get_name(cb), 0, 1162 (gpointer)purple_chat_user_get_name(cb), 0,
1163 chat_flag_text(purple_chat_conversation_buddy_get_flags(cb))); 1163 chat_flag_text(purple_chat_user_get_flags(cb)));
1164 } 1164 }
1165 1165
1166 static void 1166 static void
1167 finch_conv_present(PurpleConversation *conv) 1167 finch_conv_present(PurpleConversation *conv)
1168 { 1168 {

Mercurial Repository: pidgin3

mercurial