Changeset 11bcee9


Ignore:
Timestamp:
2006-04-08T14:10:29Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
85616c3, 88b3a07
Parents:
f8de26f (diff), 9e08d5d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Misc. merges. (Main thing: "$blah is not in your list yet, would you like to add him?")

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • doc/bitlbee.8

    rf8de26f r11bcee9  
    116116.SH AUTHORS
    117117.PP
    118  Wilmer van der Gaast <lintux@lintux.cx>
     118 Wilmer van der Gaast <wilmer@gaast.net>
    119119.BR
    120120 Jelmer Vernooij <jelmer@vernstok.nl>
  • irc.c

    rf8de26f r11bcee9  
    199199}
    200200
    201 static gboolean irc_free_userhash( gpointer key, gpointer value, gpointer data )
     201static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data )
    202202{
    203203        g_free( key );
     
    285285        }
    286286       
    287         g_hash_table_foreach_remove(irc->userhash, irc_free_userhash, NULL);
     287        g_hash_table_foreach_remove(irc->userhash, irc_free_hashkey, NULL);
    288288        g_hash_table_destroy(irc->userhash);
    289289       
    290         g_hash_table_foreach_remove(irc->watches, irc_free_userhash, NULL);
     290        g_hash_table_foreach_remove(irc->watches, irc_free_hashkey, NULL);
    291291        g_hash_table_destroy(irc->watches);
    292292       
  • protocols/nogaim.c

    rf8de26f r11bcee9  
    566566/* prpl.c */
    567567
     568struct show_got_added_data
     569{
     570        struct gaim_connection *gc;
     571        char *handle;
     572};
     573
     574void show_got_added_no( gpointer w, struct show_got_added_data *data )
     575{
     576        g_free( data->handle );
     577        g_free( data );
     578}
     579
     580void show_got_added_yes( gpointer w, struct show_got_added_data *data )
     581{
     582        data->gc->prpl->add_buddy( data->gc, data->handle );
     583        add_buddy( data->gc, NULL, data->handle, data->handle );
     584       
     585        return show_got_added_no( w, data );
     586}
     587
    568588void show_got_added( struct gaim_connection *gc, char *handle, const char *realname )
    569589{
    570         return;
     590        struct show_got_added_data *data = g_new0( struct show_got_added_data, 1 );
     591        char *s;
     592       
     593        /* TODO: Make a setting for this! */
     594        if( user_findhandle( gc, handle ) != NULL )
     595                return;
     596       
     597        s = g_strdup_printf( "The user %s is not in your buddy list yet. Do you want to add him/her now?", handle );
     598       
     599        data->gc = gc;
     600        data->handle = g_strdup( handle );
     601        query_add( gc->irc, gc, s, show_got_added_yes, show_got_added_no, data );
    571602}
    572603
  • protocols/nogaim.h

    rf8de26f r11bcee9  
    1515 * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
    1616 *                          (and possibly other members of the Gaim team)
    17  * Copyright 2002-2004 Wilmer van der Gaast <lintux@lintux.cx>
     17 * Copyright 2002-2004 Wilmer van der Gaast <wilmer@gaast.net>
    1818 */
    1919
     
    5252#define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
    5353
    54 #define PERMIT_ALL      1
    55 #define PERMIT_NONE     2
    56 #define PERMIT_SOME     3
    57 #define DENY_SOME       4
    58 
    5954#define WEBSITE "http://www.bitlee.org/"
    6055#define IM_FLAG_AWAY 0x0020
     
    6257#define OPT_LOGGED_IN 0x00010000
    6358#define GAIM_AWAY_CUSTOM "Custom"
    64 
    65 #define GAIM_LOGO       0
    66 #define GAIM_ERROR      1
    67 #define GAIM_WARNING    2
    68 #define GAIM_INFO       3
    6959
    7060/* ok. now the fun begins. first we create a connection structure */
  • query.c

    rf8de26f r11bcee9  
    140140        if( ans )
    141141        {
     142                serv_got_crap( q->gc, "Accepted: %s", q->question );
    142143                q->yes( NULL, q->data );
    143                 serv_got_crap( q->gc, "Accepted: %s", q->question );
    144144        }
    145145        else
    146146        {
     147                serv_got_crap( q->gc, "Rejected: %s", q->question );
    147148                q->no( NULL, q->data );
    148                 serv_got_crap( q->gc, "Rejected: %s", q->question );
    149149        }
    150150        q->data = NULL;
  • utils/bitlbeed.c

    rf8de26f r11bcee9  
    66*  (without access to /etc/inetd.conf or whatever)               *
    77*                                                                *
    8 *  Copyright 2002-2004 Wilmer van der Gaast <lintux@debian.org>  *
     8*  Copyright 2002-2004 Wilmer van der Gaast <wilmer@gaast.net>   *
    99*                                                                *
    1010*  Licensed under the GNU General Public License                 *
Note: See TracChangeset for help on using the changeset viewer.