Mercurial > pidgin

comparison libpurple/protocols/jabber/jabber.c @ 29458:a538cb73f897

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head b0098e2250f135d121960d8152e144e7e344125e) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head dcd3ab65d5cfcd79b00a7b95ab5fe788da64c112)
author Marcus Lundblad <ml@update.uu.se>
date Sun, 07 Feb 2010 19:31:56 +0000
parents 1cf9103727f2 5391094529c6
children f3654983e1da
comparison
equal deleted inserted replaced
28982:791606778223 29458:a538cb73f897
2056 } 2056 }
2057 2057
2058 if (full) { 2058 if (full) {
2059 PurpleStatus *status; 2059 PurpleStatus *status;
2060 2060
2061 status = purple_presence_get_active_status(presence); 2061 status = purple_presence_get_status(presence, "mood");
2062 mood = purple_status_get_attr_string(status, "mood"); 2062 mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
2063 if(mood != NULL) { 2063 if(mood && *mood) {
2064 const char *moodtext; 2064 const char *moodtext;
2065 moodtext = purple_status_get_attr_string(status, "moodtext"); 2065 moodtext = purple_status_get_attr_string(status, PURPLE_MOOD_COMMENT);
2066 if(moodtext != NULL) { 2066 if(moodtext && *moodtext) {
2067 char *moodplustext = g_strdup_printf("%s (%s)", mood, moodtext); 2067 char *moodplustext = g_strdup_printf("%s (%s)", mood, moodtext);
2068 2068
2069 purple_notify_user_info_add_pair(user_info, _("Mood"), moodplustext); 2069 purple_notify_user_info_add_pair(user_info, _("Mood"), moodplustext);
2070 g_free(moodplustext); 2070 g_free(moodplustext);
2071 } else 2071 } else
2128 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), 2128 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
2129 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), 2129 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
2130 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), 2130 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
2131 "buzz", _("Allow Buzz"), buzz_enabled, 2131 "buzz", _("Allow Buzz"), buzz_enabled,
2132 NULL); 2132 NULL);
2133 types = g_list_append(types, type); 2133 types = g_list_prepend(types, type);
2134 2134
2135 priority_value = purple_value_new(PURPLE_TYPE_INT); 2135 priority_value = purple_value_new(PURPLE_TYPE_INT);
2136 purple_value_set_int(priority_value, 1); 2136 purple_value_set_int(priority_value, 1);
2137 buzz_enabled = purple_value_new(PURPLE_TYPE_BOOLEAN); 2137 buzz_enabled = purple_value_new(PURPLE_TYPE_BOOLEAN);
2138 purple_value_set_boolean(buzz_enabled, TRUE); 2138 purple_value_set_boolean(buzz_enabled, TRUE);
2144 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), 2144 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
2145 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), 2145 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
2146 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), 2146 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
2147 "buzz", _("Allow Buzz"), buzz_enabled, 2147 "buzz", _("Allow Buzz"), buzz_enabled,
2148 NULL); 2148 NULL);
2149 types = g_list_append(types, type); 2149 types = g_list_prepend(types, type);
2150 2150
2151 priority_value = purple_value_new(PURPLE_TYPE_INT); 2151 priority_value = purple_value_new(PURPLE_TYPE_INT);
2152 purple_value_set_int(priority_value, 0); 2152 purple_value_set_int(priority_value, 0);
2153 buzz_enabled = purple_value_new(PURPLE_TYPE_BOOLEAN); 2153 buzz_enabled = purple_value_new(PURPLE_TYPE_BOOLEAN);
2154 purple_value_set_boolean(buzz_enabled, TRUE); 2154 purple_value_set_boolean(buzz_enabled, TRUE);
2160 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), 2160 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
2161 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), 2161 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
2162 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), 2162 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
2163 "buzz", _("Allow Buzz"), buzz_enabled, 2163 "buzz", _("Allow Buzz"), buzz_enabled,
2164 NULL); 2164 NULL);
2165 types = g_list_append(types, type); 2165 types = g_list_prepend(types, type);
2166 2166
2167 priority_value = purple_value_new(PURPLE_TYPE_INT); 2167 priority_value = purple_value_new(PURPLE_TYPE_INT);
2168 purple_value_set_int(priority_value, 0); 2168 purple_value_set_int(priority_value, 0);
2169 buzz_enabled = purple_value_new(PURPLE_TYPE_BOOLEAN); 2169 buzz_enabled = purple_value_new(PURPLE_TYPE_BOOLEAN);
2170 purple_value_set_boolean(buzz_enabled, TRUE); 2170 purple_value_set_boolean(buzz_enabled, TRUE);
2176 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), 2176 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
2177 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), 2177 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
2178 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), 2178 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
2179 "buzz", _("Allow Buzz"), buzz_enabled, 2179 "buzz", _("Allow Buzz"), buzz_enabled,
2180 NULL); 2180 NULL);
2181 types = g_list_append(types, type); 2181 types = g_list_prepend(types, type);
2182 2182
2183 priority_value = purple_value_new(PURPLE_TYPE_INT); 2183 priority_value = purple_value_new(PURPLE_TYPE_INT);
2184 purple_value_set_int(priority_value, 0); 2184 purple_value_set_int(priority_value, 0);
2185 type = purple_status_type_new_with_attrs(PURPLE_STATUS_UNAVAILABLE, 2185 type = purple_status_type_new_with_attrs(PURPLE_STATUS_UNAVAILABLE,
2186 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_DND), 2186 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_DND),
2189 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), 2189 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
2190 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), 2190 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
2191 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), 2191 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
2192 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), 2192 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
2193 NULL); 2193 NULL);
2194 types = g_list_append(types, type); 2194 types = g_list_prepend(types, type);
2195 2195
2196 /* 2196 /*
2197 if(js->protocol_version == JABBER_PROTO_0_9) 2197 if(js->protocol_version == JABBER_PROTO_0_9)
2198 m = g_list_append(m, _("Invisible")); 2198 "Invisible"
2199 */ 2199 */
2200 2200
2201 type = purple_status_type_new_with_attrs(PURPLE_STATUS_OFFLINE, 2201 type = purple_status_type_new_with_attrs(PURPLE_STATUS_OFFLINE,
2202 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_UNAVAILABLE), 2202 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_UNAVAILABLE),
2203 NULL, TRUE, TRUE, FALSE, 2203 NULL, TRUE, TRUE, FALSE,
2204 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), 2204 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
2205 NULL); 2205 NULL);
2206 types = g_list_append(types, type); 2206 types = g_list_prepend(types, type);
2207 2207
2208 type = purple_status_type_new_with_attrs(PURPLE_STATUS_TUNE, 2208 type = purple_status_type_new_with_attrs(PURPLE_STATUS_TUNE,
2209 "tune", NULL, FALSE, TRUE, TRUE, 2209 "tune", NULL, FALSE, TRUE, TRUE,
2210 PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), 2210 PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
2211 PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), 2211 PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
2215 PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), 2215 PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
2216 PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), 2216 PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
2217 PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), 2217 PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
2218 PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), 2218 PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
2219 NULL); 2219 NULL);
2220 types = g_list_append(types, type); 2220 types = g_list_prepend(types, type);
2221 2221
2222 return types; 2222 return g_list_reverse(types);
2223 } 2223 }
2224 2224
2225 static void 2225 static void
2226 jabber_password_change_result_cb(JabberStream *js, const char *from, 2226 jabber_password_change_result_cb(JabberStream *js, const char *from,
2227 JabberIqType type, const char *id, 2227 JabberIqType type, const char *id,