Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.c @ 26932:a8537bbcfb79
Remove trailing whitespace that has snuck in.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 22 May 2009 03:54:29 +0000 |
parents | 6b0e150f2276 |
children | f500336f9881 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Fri May 22 03:48:19 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Fri May 22 03:54:29 2009 +0000 @@ -595,7 +595,7 @@ jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING_ENCRYPTION); } -static void +static void txt_resolved_cb(GSList *responses, gpointer data) { JabberStream *js = data; @@ -608,7 +608,7 @@ purple_connection_error_reason (js->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp); g_free(tmp); - return; + return; } while (responses) { @@ -1577,7 +1577,7 @@ purple_dnsquery_destroy(js->stun_query); js->stun_query = NULL; } - + g_free(js); gc->proto_data = NULL; @@ -1798,14 +1798,14 @@ /* both required according to XEP-0030 */ g_return_if_fail(category != NULL); g_return_if_fail(type != NULL); - + for(identity = jabber_identities; identity; identity = identity->next) { JabberIdentity *ident = (JabberIdentity*)identity->data; if (!strcmp(ident->category, category) && !strcmp(ident->type, type) && ((!ident->lang && !lang) || (ident->lang && lang && !strcmp(ident->lang, lang)))) { return; - } + } } ident = g_new0(JabberIdentity, 1); @@ -1897,7 +1897,7 @@ } static void -jabber_tooltip_add_resource_text(JabberBuddyResource *jbr, +jabber_tooltip_add_resource_text(JabberBuddyResource *jbr, PurpleNotifyUserInfo *user_info, gboolean multiple_resources) { char *text = NULL; @@ -1930,13 +1930,13 @@ g_free(label); g_free(value); g_free(text); - + /* if the resource is idle, show that */ /* only show it if there is more than one resource available for the buddy, since the "general" idleness will be shown anyway, this way we can see see the idleness of lower-priority resources */ if (jbr->idle && multiple_resources) { - gchar *idle_str = + gchar *idle_str = purple_str_seconds_to_string(time(NULL) - jbr->idle); label = g_strdup_printf("%s%s", _("Idle"), (res ? res : "")); purple_notify_user_info_add_pair(user_info, label, idle_str); @@ -1969,13 +1969,13 @@ const char *sub; GList *l; const char *mood; - gboolean multiple_resources = + gboolean multiple_resources = jb->resources && g_list_next(jb->resources); JabberBuddyResource *top_jbr = jabber_buddy_find_resource(jb, NULL); /* resource-specific info for the top resource */ if (top_jbr) { - jabber_tooltip_add_resource_text(top_jbr, user_info, + jabber_tooltip_add_resource_text(top_jbr, user_info, multiple_resources); } @@ -1987,7 +1987,7 @@ multiple_resources); } } - + if (full) { PurpleStatus *status; @@ -2892,7 +2892,7 @@ PurpleAccount *account; gchar *who; PurpleMediaSessionType type; - + } JabberMediaRequest; static void @@ -2921,7 +2921,7 @@ #endif gboolean -jabber_initiate_media(PurpleAccount *account, const char *who, +jabber_initiate_media(PurpleAccount *account, const char *who, PurpleMediaSessionType type) { #ifdef USE_VV @@ -3305,7 +3305,7 @@ return FALSE; js = gc->proto_data; - if (!(resource = jabber_get_resource(jid)) || + if (!(resource = jabber_get_resource(jid)) || !(jb = jabber_buddy_find(js, jid, FALSE)) || !(jbr = jabber_buddy_find_resource(jb, resource))) { g_free(resource);