Changeset 3f44e43 for protocols

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

Location:

protocols

Files:

• account.c (modified) (1 diff)
• nogaim.c (modified) (2 diffs)
• nogaim.h (modified) (1 diff)
• yahoo/Makefile (deleted)
• yahoo/libyahoo2.c (deleted)
• yahoo/yahoo.c (deleted)
• yahoo/yahoo2.h (deleted)
• yahoo/yahoo2_callbacks.h (deleted)
• yahoo/yahoo2_types.h (deleted)
• yahoo/yahoo_debug.h (deleted)
• yahoo/yahoo_httplib.c (deleted)
• yahoo/yahoo_httplib.h (deleted)
• yahoo/yahoo_list.h (deleted)
• yahoo/yahoo_util.c (deleted)
• yahoo/yahoo_util.h (deleted)

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