pidgin/ljfisher-ssl-client-auth

Whitespace changes for coding-style consistency.
mxit
2011-08-21, Andrew Victor
83a126c3d1bd
Parents 014a56bfee6b
Children c6fea2802469
Whitespace changes for coding-style consistency.
6 files changed, 57 insertions(+), 58 deletions(-)
  • +6 -6
    libpurple/protocols/mxit/actions.c
  • +14 -15
    libpurple/protocols/mxit/mxit.c
  • +1 -1
    libpurple/protocols/mxit/mxit.h
  • +5 -5
    libpurple/protocols/mxit/profile.c
  • +14 -14
    libpurple/protocols/mxit/protocol.c
  • +17 -17
    libpurple/protocols/mxit/roster.c
    • --- a/libpurple/protocols/mxit/actions.c Sun Aug 21 14:50:21 2011 +0000
    +++ b/libpurple/protocols/mxit/actions.c Sun Aug 21 15:28:07 2011 +0000
    @@ -158,7 +158,7 @@
    /* update where am i */
    name = purple_request_fields_get_string( fields, "whereami" );
    - if ( !name)
    + if ( !name )
    profile->whereami[0] = '\0';
    else
    g_strlcpy( profile->whereami, name, sizeof( profile->whereami ) );
    @@ -368,8 +368,8 @@
    purple_debug_info( MXIT_PLUGIN_ID, "mxit_change_pin_action\n" );
    fields = purple_request_fields_new();
    - group = purple_request_field_group_new(NULL);
    - purple_request_fields_add_group(fields, group);
    + group = purple_request_field_group_new( NULL );
    + purple_request_fields_add_group( fields, group );
    /* pin */
    field = purple_request_field_string_new( "pin", _( "PIN" ), session->acc->password, FALSE );
    @@ -472,10 +472,10 @@
    _( "Search for a MXit contact" ),
    _( "Type search information" ),
    NULL, FALSE, FALSE, NULL,
    - _("_Search"), G_CALLBACK( mxit_user_search_cb ),
    - _("_Cancel"), NULL,
    + _( "_Search" ), G_CALLBACK( mxit_user_search_cb ),
    + _( "_Cancel" ), NULL,
    purple_connection_get_account( gc ), NULL, NULL,
    - gc);
    + gc );
    }
    --- a/libpurple/protocols/mxit/mxit.c Sun Aug 21 14:50:21 2011 +0000
    +++ b/libpurple/protocols/mxit/mxit.c Sun Aug 21 15:28:07 2011 +0000
    @@ -129,7 +129,7 @@
    /*------------------------------------------------------------------------
    * Register MXit to receive URI click notifications from the UI
    */
    -void mxit_register_uri_handler(void)
    +void mxit_register_uri_handler( void )
    {
    not_link_ref_count++;
    if ( not_link_ref_count == 1 ) {
    @@ -198,7 +198,7 @@
    if ( !buddy )
    return;
    - contact = purple_buddy_get_protocol_data(buddy);
    + contact = purple_buddy_get_protocol_data( buddy );
    if ( !contact )
    return;
    @@ -214,7 +214,7 @@
    case MXIT_TYPE_INFO :
    tmp = g_strdup_printf("<font color=\"#999999\">%s</font>\n", _( "Loading menu..." ));
    serv_got_im( session->con, who, tmp, PURPLE_MESSAGE_NOTIFY, time( NULL ) );
    - g_free(tmp);
    + g_free( tmp );
    mxit_send_message( session, who, " ", FALSE, FALSE );
    default :
    break;
    @@ -268,7 +268,7 @@
    */
    static const char* mxit_list_emblem( PurpleBuddy* buddy )
    {
    - struct contact* contact = purple_buddy_get_protocol_data(buddy);
    + struct contact* contact = purple_buddy_get_protocol_data( buddy );
    if ( !contact )
    return NULL;
    @@ -310,7 +310,7 @@
    char* mxit_status_text( PurpleBuddy* buddy )
    {
    char* text = NULL;
    - struct contact* contact = purple_buddy_get_protocol_data(buddy);
    + struct contact* contact = purple_buddy_get_protocol_data( buddy );
    if ( !contact )
    return NULL;
    @@ -333,7 +333,7 @@
    */
    static void mxit_tooltip( PurpleBuddy* buddy, PurpleNotifyUserInfo* info, gboolean full )
    {
    - struct contact* contact = purple_buddy_get_protocol_data(buddy);
    + struct contact* contact = purple_buddy_get_protocol_data( buddy );
    if ( !contact )
    return;
    @@ -424,7 +424,7 @@
    char* statusmsg2;
    /* Handle mood changes */
    - if (purple_status_type_get_primitive(purple_status_get_type(status)) == PURPLE_STATUS_MOOD) {
    + if ( purple_status_type_get_primitive(purple_status_get_type( status ) ) == PURPLE_STATUS_MOOD ) {
    const char* moodid = purple_status_get_attr_string( status, PURPLE_MOOD_NAME );
    int mood;
    @@ -487,7 +487,7 @@
    purple_debug_info( MXIT_PLUGIN_ID, "mxit_free_buddy\n" );
    - contact = purple_buddy_get_protocol_data(buddy);
    + contact = purple_buddy_get_protocol_data( buddy );
    if ( contact ) {
    if ( contact->statusMsg )
    g_free( contact->statusMsg );
    @@ -498,7 +498,7 @@
    g_free( contact );
    }
    - purple_buddy_set_protocol_data(buddy, NULL);
    + purple_buddy_set_protocol_data( buddy, NULL );
    }
    @@ -607,12 +607,11 @@
    */
    static void mxit_reinvite( PurpleBlistNode *node, gpointer ignored )
    {
    - PurpleBuddy* buddy;
    - struct contact* contact;
    + PurpleBuddy* buddy = (PurpleBuddy *) node;
    PurpleConnection* gc;
    struct MXitSession* session;
    + struct contact* contact;
    - buddy = (PurpleBuddy *)node;
    gc = purple_account_get_connection( purple_buddy_get_account( buddy ) );
    session = gc->proto_data;
    @@ -648,7 +647,7 @@
    if ( ( contact->subtype == MXIT_SUBTYPE_DELETED ) || ( contact->subtype == MXIT_SUBTYPE_REJECTED ) || ( contact->subtype == MXIT_SUBTYPE_NONE ) ) {
    /* contact is in Deleted, Rejected or None state */
    act = purple_menu_action_new( _( "Re-Invite" ), PURPLE_CALLBACK( mxit_reinvite ), NULL, NULL );
    - m = g_list_append(m, act);
    + m = g_list_append( m, act );
    }
    return m;
    @@ -660,9 +659,9 @@
    *
    * @return Chat defaults list
    */
    -static GHashTable *mxit_chat_info_defaults(PurpleConnection *gc, const char *chat_name)
    +static GHashTable *mxit_chat_info_defaults( PurpleConnection *gc, const char *chat_name )
    {
    - return g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
    + return g_hash_table_new_full( g_str_hash, g_str_equal, NULL, g_free );
    }
    --- a/libpurple/protocols/mxit/mxit.h Sun Aug 21 14:50:21 2011 +0000
    +++ b/libpurple/protocols/mxit/mxit.h Sun Aug 21 15:28:07 2011 +0000
    @@ -191,7 +191,7 @@
    void mxit_enable_signals( struct MXitSession* session );
    #ifdef MXIT_LINK_CLICK
    -void mxit_register_uri_handler(void);
    +void mxit_register_uri_handler( void );
    #endif
    --- a/libpurple/protocols/mxit/profile.c Sun Aug 21 14:50:21 2011 +0000
    +++ b/libpurple/protocols/mxit/profile.c Sun Aug 21 15:28:07 2011 +0000
    @@ -119,12 +119,12 @@
    return 0;
    /* current time */
    - t = time(NULL);
    + t = time( NULL );
    localtime_r( &t, &now );
    /* decode hdate */
    memset( &bdate, 0, sizeof( struct tm ) );
    - purple_str_to_time(date, FALSE, &bdate, NULL, NULL);
    + purple_str_to_time( date, FALSE, &bdate, NULL, NULL );
    /* calculate difference */
    age = now.tm_year - bdate.tm_year;
    @@ -172,7 +172,7 @@
    if ( buddy ) {
    purple_notify_user_info_add_pair( info, _( "Alias" ), purple_buddy_get_alias( buddy ) );
    purple_notify_user_info_add_section_break( info );
    - contact = purple_buddy_get_protocol_data(buddy);
    + contact = purple_buddy_get_protocol_data( buddy );
    }
    purple_notify_user_info_add_pair( info, _( "Display Name" ), profile->nickname );
    @@ -296,7 +296,7 @@
    column = purple_notify_searchresults_column_new( _( "Where I live" ) );
    purple_notify_searchresults_column_add( results, column );
    - while (entries != NULL) {
    + while ( entries != NULL ) {
    struct MXitProfile* profile = ( struct MXitProfile *) entries->data;
    GList* row;
    gchar* tmp = purple_base64_encode( (unsigned char *) profile->userid, strlen( profile->userid ) );
    @@ -326,5 +326,5 @@
    purple_notify_searchresults( session->con, NULL, text, NULL, results, NULL, NULL );
    - g_free( text);
    + g_free( text );
    }
    --- a/libpurple/protocols/mxit/protocol.c Sun Aug 21 14:50:21 2011 +0000
    +++ b/libpurple/protocols/mxit/protocol.c Sun Aug 21 15:28:07 2011 +0000
    @@ -86,7 +86,7 @@
    void mxit_strip_domain( char* username )
    {
    if ( g_str_has_suffix( username, "@m" ) )
    - username[ strlen(username) - 2 ] = '\0';
    + username[ strlen( username ) - 2 ] = '\0';
    }
    @@ -704,9 +704,9 @@
    locale = purple_account_get_string( session->acc, MXIT_CONFIG_LOCALE, MXIT_DEFAULT_LOCALE );
    /* Voice and Video supported */
    - if (mxit_audio_enabled() && mxit_video_enabled())
    - features |= (MXIT_CF_VOICE | MXIT_CF_VIDEO);
    - else if (mxit_audio_enabled())
    + if ( mxit_audio_enabled() && mxit_video_enabled() )
    + features |= ( MXIT_CF_VOICE | MXIT_CF_VIDEO );
    + else if ( mxit_audio_enabled() )
    features |= MXIT_CF_VOICE;
    /* generate client version string (eg, P-2.7.10-Y-PURPLE) */
    @@ -748,9 +748,9 @@
    locale = purple_account_get_string( session->acc, MXIT_CONFIG_LOCALE, MXIT_DEFAULT_LOCALE );
    /* Voice and Video supported */
    - if (mxit_audio_enabled() && mxit_video_enabled())
    - features |= (MXIT_CF_VOICE | MXIT_CF_VIDEO);
    - else if (mxit_audio_enabled())
    + if ( mxit_audio_enabled() && mxit_video_enabled() )
    + features |= ( MXIT_CF_VOICE | MXIT_CF_VIDEO );
    + else if ( mxit_audio_enabled() )
    features |= MXIT_CF_VOICE;
    /* generate client version string (eg, P-2.7.10-Y-PURPLE) */
    @@ -835,7 +835,7 @@
    /* add attributes */
    for ( i = 0; i < nr_attrib; i++ )
    - datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, attribute[i] );
    + datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, attribute[i] );
    /* queue packet for transmission */
    mxit_queue_packet( session, data, datalen, CP_CMD_EXTPROFILE_GET );
    @@ -868,7 +868,7 @@
    /* add attributes */
    for ( i = 1; i < nr_attrib * 3; i+=3 )
    - datalen += sprintf( data + datalen, "%c%s%c%s%c%s", /* \1name\1type\1value */
    + datalen += sprintf( data + datalen, "%c%s%c%s%c%s", /* \1name\1type\1value */
    CP_FLD_TERM, parts[i], CP_FLD_TERM, parts[i + 1], CP_FLD_TERM, parts[i + 2] );
    /* queue packet for transmission */
    @@ -900,7 +900,7 @@
    /* add attributes */
    for ( i = 0; i < nr_attrib; i++ )
    - datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, attribute[i] );
    + datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, attribute[i] );
    /* queue packet for transmission */
    mxit_queue_packet( session, data, datalen, CP_CMD_SUGGESTCONTACTS );
    @@ -929,7 +929,7 @@
    /* add attributes */
    for ( i = 0; i < nr_attrib; i++ )
    - datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, attribute[i] );
    + datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, attribute[i] );
    /* queue packet for transmission */
    mxit_queue_packet( session, data, datalen, CP_CMD_SUGGESTCONTACTS );
    @@ -1175,7 +1175,7 @@
    /* add usernames */
    for ( i = 0; i < nr_usernames; i++ )
    - datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, usernames[i] );
    + datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, usernames[i] );
    /* queue packet for transmission */
    mxit_queue_packet( session, data, datalen, CP_CMD_GRPCHAT_CREATE );
    @@ -1204,7 +1204,7 @@
    /* add usernames */
    for ( i = 0; i < nr_usernames; i++ )
    - datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, usernames[i] );
    + datalen += sprintf( data + datalen, "%c%s", CP_FLD_TERM, usernames[i] );
    /* queue packet for transmission */
    mxit_queue_packet( session, data, datalen, CP_CMD_GRPCHAT_INVITE );
    @@ -2281,7 +2281,7 @@
    case CP_CMD_PRESENCE :
    /* presence update */
    - mxit_parse_cmd_presence(session, &packet->records[2], packet->rcount - 3 );
    + mxit_parse_cmd_presence( session, &packet->records[2], packet->rcount - 3 );
    break;
    case CP_CMD_RX_MSG :
    --- a/libpurple/protocols/mxit/roster.c Sun Aug 21 14:50:21 2011 +0000
    +++ b/libpurple/protocols/mxit/roster.c Sun Aug 21 15:28:07 2011 +0000
    @@ -82,9 +82,9 @@
    }
    /* add Mood option */
    - type = purple_status_type_new_with_attrs(PURPLE_STATUS_MOOD, "mood", NULL, FALSE, TRUE, TRUE,
    + type = purple_status_type_new_with_attrs( PURPLE_STATUS_MOOD, "mood", NULL, FALSE, TRUE, TRUE,
    PURPLE_MOOD_NAME, _("Mood Name"), purple_value_new( PURPLE_TYPE_STRING ),
    - NULL);
    + NULL );
    statuslist = g_list_append( statuslist, type );
    return statuslist;
    @@ -135,21 +135,21 @@
    /* moods (reference: libpurple/status.h) */
    static PurpleMood mxit_moods[] = {
    - {"angry", N_("Angry"), NULL},
    - {"excited", N_("Excited"), NULL},
    - {"grumpy", N_("Grumpy"), NULL},
    - {"happy", N_("Happy"), NULL},
    - {"in_love", N_("In love"), NULL},
    - {"invincible", N_("Invincible"), NULL},
    - {"sad", N_("Sad"), NULL},
    - {"hot", N_("Hot"), NULL},
    - {"sick", N_("Sick"), NULL},
    - {"sleepy", N_("Sleepy"), NULL},
    - {"bored", N_("Bored"), NULL},
    - {"cold", N_("Cold"), NULL},
    - {"confused", N_("Confused"), NULL},
    - {"hungry", N_("Hungry"), NULL},
    - {"stressed", N_("Stressed"), NULL},
    + { "angry", N_( "Angry" ), NULL },
    + { "excited", N_( "Excited" ), NULL },
    + { "grumpy", N_( "Grumpy" ), NULL },
    + { "happy", N_( "Happy" ), NULL },
    + { "in_love", N_( "In love" ), NULL },
    + { "invincible", N_( "Invincible" ), NULL },
    + { "sad", N_( "Sad" ), NULL },
    + { "hot", N_( "Hot" ), NULL },
    + { "sick", N_( "Sick" ), NULL },
    + { "sleepy", N_( "Sleepy" ), NULL },
    + { "bored", N_( "Bored" ), NULL },
    + { "cold", N_( "Cold" ), NULL },
    + { "confused", N_( "Confused" ), NULL },
    + { "hungry", N_( "Hungry" ), NULL },
    + { "stressed", N_( "Stressed" ), NULL },
    /* Mark the last record. */
    { NULL, NULL, NULL }
    };