Changeset 3f44e43

Timestamp:

2016-11-21T07:49:26Z (8 years ago)

Author:

dequis <dx@…>

Children:

7a9d968

Parents:

537d9b9 (diff), 5a8afc3 (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:

Merge branch 'master' into parson

Files:

• configure (modified) (4 diffs)
• doc/user-guide/commands.xml (modified) (1 diff)
• irc_im.c (modified) (1 diff)
• protocols/account.c (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (1 diff)
• protocols/yahoo/Makefile (deleted)
• protocols/yahoo/libyahoo2.c (deleted)
• protocols/yahoo/yahoo.c (deleted)
• protocols/yahoo/yahoo2.h (deleted)
• protocols/yahoo/yahoo2_callbacks.h (deleted)
• protocols/yahoo/yahoo2_types.h (deleted)
• protocols/yahoo/yahoo_debug.h (deleted)
• protocols/yahoo/yahoo_httplib.c (deleted)
• protocols/yahoo/yahoo_httplib.h (deleted)
• protocols/yahoo/yahoo_list.h (deleted)
• protocols/yahoo/yahoo_util.c (deleted)
• protocols/yahoo/yahoo_util.h (deleted)
• root_commands.c (modified) (2 diffs)

configure

@@ -36 +36 @@
 jabber="default-on"
 oscar="default-on"
-yahoo="default-on"
 
 twitter=1
@@ -133 +132 @@
 --jabber=0/1    Disable/enable Jabber part              $jabber
 --oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
---yahoo=0/1     Disable/enable Yahoo part               $yahoo
 --twitter=0/1   Disable/enable Twitter part             $twitter
 
@@ -837 +835 @@
         [ "$jabber" = "default-on" ] && jabber=0
         [ "$oscar" = "default-on" ] && oscar=0
-        [ "$yahoo" = "default-on" ] && yahoo=0
 
         echo '#undef PACKAGE' >> config.h
@@ -880 +877 @@
         protocols=$protocols'oscar '
         protoobjs=$protoobjs'oscar_mod.o '
-fi
-
-if [ "$yahoo" = 0 ]; then
-        echo '#undef WITH_YAHOO' >> config.h
-else
-        echo '#define WITH_YAHOO' >> config.h
-        protocols=$protocols'yahoo '
-        protoobjs=$protoobjs'yahoo_mod.o '
 fi
 

doc/user-guide/commands.xml

@@ -104 +104 @@
                         </bitlbee-command>
 
-                        <bitlbee-command name="yahoo">
-                                <syntax>account add yahoo &lt;handle&gt; [&lt;password&gt;]</syntax>
-
-                                <description>
-                                        <para>
-                                                For Yahoo! connections there are no special arguments.
-                                        </para>
-                                </description>
-                        </bitlbee-command>
-
                 </bitlbee-command>
 

irc_im.c

@@ -1014 +1014 @@
         if (!(acc = account_get(ic->irc->b, value))) {
                 return SET_INVALID;
-        } else if (!acc->prpl->chat_join) {
+        } else if (!acc->prpl->chat_join && acc->prpl != &protocol_missing) {
                 irc_rootmsg(ic->irc, "Named chatrooms not supported on that account.");
                 return SET_INVALID;

protocols/account.c

@@ -71 +71 @@
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | ACC_SET_LOCKABLE;
         set_setstr(&a->set, "username", user);
+
+        if (prpl == &protocol_missing) {
+                s = set_add(&a->set, "server", NULL, set_eval_account, a);
+                s->flags |= SET_NOSAVE | SET_HIDDEN | ACC_SET_OFFLINE_ONLY | ACC_SET_ONLINE_ONLY;
+        }
 
         /* Hardcode some more clever tag guesses. */

protocols/nogaim.c

@@ -196 +196 @@
 }
 
+/* Returns heap allocated string with text attempting to explain why a protocol is missing 
+ * Free the return value with g_free() */
+char *explain_unknown_protocol(const char *name)
+{
+        char *extramsg = NULL;
+
+        if (is_protocol_disabled(name)) {
+                return g_strdup("Protocol disabled in the global config (bitlbee.conf)");
+        }
+
+        if (strcmp(name, "yahoo") == 0) {
+                return g_strdup("The old yahoo protocol is gone, try the funyahoo++ libpurple plugin instead.");
+        }
+
+#ifdef WITH_PURPLE
+        if ((strcmp(name, "msn") == 0) ||
+            (strcmp(name, "loubserp-mxit") == 0) ||
+            (strcmp(name, "myspace") == 0)) {
+                return g_strdup("This protocol has been removed from your libpurple version.");
+        }
+
+        if (strcmp(name, "hipchat") == 0) {
+                return g_strdup("This account type isn't supported by libpurple's jabber.");
+        }
+
+#else
+        if (strcmp(name, "aim") == 0 || strcmp(name, "icq") == 0) {
+                return g_strdup("This account uses libpurple specific aliases for oscar. "
+                                "Re-add the account with `account add oscar ...'");
+        }
+
+        extramsg = "If this is a libpurple plugin, you might need to install bitlbee-libpurple instead.";
+#endif
+        return g_strconcat("The protocol plugin is not installed or could not be loaded. "
+                           "Use the `plugins' command to list available protocols. ",
+                           extramsg, NULL);
+}
+
 void nogaim_init()
 {
         extern void msn_initmodule();
         extern void oscar_initmodule();
-        extern void byahoo_initmodule();
         extern void jabber_initmodule();
         extern void twitter_initmodule();
@@ -212 +249 @@
 #ifdef WITH_OSCAR
         oscar_initmodule();
-#endif
-
-#ifdef WITH_YAHOO
-        byahoo_initmodule();
 #endif
 

protocols/nogaim.h

@@ -327 +327 @@
 G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
 G_MODULE_EXPORT gboolean is_protocol_disabled(const char *name);
+G_MODULE_EXPORT char *explain_unknown_protocol(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

@@ -439 +439 @@
 
                 if (prpl == NULL) {
-                        if (is_protocol_disabled(cmd[2])) {
-                                irc_rootmsg(irc, "Protocol disabled in global config");
-                        } else {
-                                irc_rootmsg(irc, "Unknown protocol");
-                        }
+                        char *msg = explain_unknown_protocol(cmd[2]);
+                        irc_rootmsg(irc, "Unknown protocol");
+                        irc_rootmsg(irc, msg);
+                        g_free(msg);
                         return;
                 }
@@ -592 +591 @@
                                     "first (use /OPER)", a->tag);
                 } else if (a->prpl == &protocol_missing) {
-                        irc_rootmsg(irc, "Protocol `%s' not recognised (plugin may be missing or not running?)",
-                                    set_getstr(&a->set, "_protocol_name"));
+                        char *proto = set_getstr(&a->set, "_protocol_name");
+                        char *msg = explain_unknown_protocol(proto);
+                        irc_rootmsg(irc, "Unknown protocol `%s'", proto);
+                        irc_rootmsg(irc, msg);
+                        g_free(msg);
                 } else {
                         account_on(irc->b, a);