Changeset 11bcee9

Timestamp:

2006-04-08T14:10:29Z (19 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:

• doc/bitlbee.8 (modified) (1 diff)
• irc.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (1 diff)
• protocols/nogaim.h (modified) (3 diffs)
• query.c (modified) (1 diff)
• utils/bitlbeed.c (modified) (1 diff)

doc/bitlbee.8

@@ -116 +116 @@
 .SH AUTHORS
 .PP
- Wilmer van der Gaast <lintux@lintux.cx>
+ Wilmer van der Gaast <wilmer@gaast.net>
 .BR
  Jelmer Vernooij <jelmer@vernstok.nl>

irc.c

@@ -199 +199 @@
 }
 
-static gboolean irc_free_userhash( gpointer key, gpointer value, gpointer data )
+static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data )
 {
         g_free( key );
@@ -285 +285 @@
         }
         
-        g_hash_table_foreach_remove(irc->userhash, irc_free_userhash, NULL);
+        g_hash_table_foreach_remove(irc->userhash, irc_free_hashkey, NULL);
         g_hash_table_destroy(irc->userhash);
         
-        g_hash_table_foreach_remove(irc->watches, irc_free_userhash, NULL);
+        g_hash_table_foreach_remove(irc->watches, irc_free_hashkey, NULL);
         g_hash_table_destroy(irc->watches);
         

protocols/nogaim.c

@@ -566 +566 @@
 /* prpl.c */
 
+struct show_got_added_data
+{
+        struct gaim_connection *gc;
+        char *handle;
+};
+
+void show_got_added_no( gpointer w, struct show_got_added_data *data )
+{
+        g_free( data->handle );
+        g_free( data );
+}
+
+void show_got_added_yes( gpointer w, struct show_got_added_data *data )
+{
+        data->gc->prpl->add_buddy( data->gc, data->handle );
+        add_buddy( data->gc, NULL, data->handle, data->handle );
+        
+        return show_got_added_no( w, data );
+}
+
 void show_got_added( struct gaim_connection *gc, char *handle, const char *realname )
 {
-        return;
+        struct show_got_added_data *data = g_new0( struct show_got_added_data, 1 );
+        char *s;
+        
+        /* TODO: Make a setting for this! */
+        if( user_findhandle( gc, handle ) != NULL )
+                return;
+        
+        s = g_strdup_printf( "The user %s is not in your buddy list yet. Do you want to add him/her now?", handle );
+        
+        data->gc = gc;
+        data->handle = g_strdup( handle );
+        query_add( gc->irc, gc, s, show_got_added_yes, show_got_added_no, data );
 }
 

protocols/nogaim.h

@@ -15 +15 @@
  * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
  *                          (and possibly other members of the Gaim team)
- * Copyright 2002-2004 Wilmer van der Gaast <lintux@lintux.cx>
+ * Copyright 2002-2004 Wilmer van der Gaast <wilmer@gaast.net>
  */
 
@@ -52 +52 @@
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
 
-#define PERMIT_ALL      1
-#define PERMIT_NONE     2
-#define PERMIT_SOME     3
-#define DENY_SOME       4
-
 #define WEBSITE "http://www.bitlee.org/"
 #define IM_FLAG_AWAY 0x0020
@@ -62 +57 @@
 #define OPT_LOGGED_IN 0x00010000
 #define GAIM_AWAY_CUSTOM "Custom"
-
-#define GAIM_LOGO       0
-#define GAIM_ERROR      1
-#define GAIM_WARNING    2
-#define GAIM_INFO       3
 
 /* ok. now the fun begins. first we create a connection structure */

query.c

@@ -140 +140 @@
         if( ans )
         {
+                serv_got_crap( q->gc, "Accepted: %s", q->question );
                 q->yes( NULL, q->data );
-                serv_got_crap( q->gc, "Accepted: %s", q->question );
         }
         else
         {
+                serv_got_crap( q->gc, "Rejected: %s", q->question );
                 q->no( NULL, q->data );
-                serv_got_crap( q->gc, "Rejected: %s", q->question );
         }
         q->data = NULL;

utils/bitlbeed.c

@@ -6 +6 @@
 *  (without access to /etc/inetd.conf or whatever)               *
 *                                                                *
-*  Copyright 2002-2004 Wilmer van der Gaast <lintux@debian.org>  *
+*  Copyright 2002-2004 Wilmer van der Gaast <wilmer@gaast.net>   *
 *                                                                *
 *  Licensed under the GNU General Public License                 *