Changeset ad9ac5d

Timestamp:

2015-11-23T21:20:34Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

1e2094e, 5b01e1a

Parents:

9c8dbc7

Message:

Show a nicer message when a protocol is disabled in account add

This adds the disabled protocols' prpl structs to a different linked
list, only used for this lookup. They were previously marked as leaking
by valgrind, so, whatever. I can't free them, since some protocols
memdup() it after attempting to register.

I think disabling the protocols from bitlbee.conf is just stupid and
provides no real benefits, but someone will complain if i get rid of it.
So this just improves the error message to make it less confusing when
someone accidentally uncomments that crap.

Files:

• protocols/nogaim.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (1 diff)
• root_commands.c (modified) (1 diff)

protocols/nogaim.c

@@ -90 +90 @@
 
 GList *protocols = NULL;
+GList *disabled_protocols = NULL;
 
 void register_protocol(struct prpl *p)
@@ -103 +104 @@
 
         if (refused) {
-                log_message(LOGLVL_WARNING, "Protocol %s disabled\n", p->name);
+                disabled_protocols = g_list_append(disabled_protocols, p);
         } else {
                 protocols = g_list_append(protocols, p);
@@ -109 +110 @@
 }
 
+static int proto_name_cmp(const void *proto_, const void *name)
+{
+        const struct prpl *proto = proto_;
+        return g_strcasecmp(proto->name, name);
+}
+
 struct prpl *find_protocol(const char *name)
 {
-        GList *gl;
-
-        for (gl = protocols; gl; gl = gl->next) {
-                struct prpl *proto = gl->data;
-
-                if (g_strcasecmp(proto->name, name) == 0) {
-                        return proto;
-                }
-        }
-
-        return NULL;
+        GList *gl = g_list_find_custom(protocols, name, proto_name_cmp);
+        return gl ? gl->data: NULL;
+}
+
+gboolean is_protocol_disabled(const char *name)
+{
+        return g_list_find_custom(disabled_protocols, name, proto_name_cmp) != NULL;
 }
 

protocols/nogaim.h

@@ -275 +275 @@
 G_MODULE_EXPORT GSList *get_connections();
 G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
+G_MODULE_EXPORT gboolean is_protocol_disabled(const char *name);
 /* When registering a new protocol, you should allocate space for a new prpl
  * struct, initialize it (set the function pointers to point to your

root_commands.c

@@ -425 +425 @@
 
                 if (prpl == NULL) {
-                        irc_rootmsg(irc, "Unknown protocol");
+                        if (is_protocol_disabled(cmd[2])) {
+                                irc_rootmsg(irc, "Protocol disabled in global config");
+                        } else {
+                                irc_rootmsg(irc, "Unknown protocol");
+                        }
                         return;
                 }