Changeset 3f44e43 for protocols/nogaim.c


Ignore:
Timestamp:
2016-11-21T07:49:26Z (5 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/nogaim.c

    r537d9b9 r3f44e43  
    196196}
    197197
     198/* Returns heap allocated string with text attempting to explain why a protocol is missing
     199 * Free the return value with g_free() */
     200char *explain_unknown_protocol(const char *name)
     201{
     202        char *extramsg = NULL;
     203
     204        if (is_protocol_disabled(name)) {
     205                return g_strdup("Protocol disabled in the global config (bitlbee.conf)");
     206        }
     207
     208        if (strcmp(name, "yahoo") == 0) {
     209                return g_strdup("The old yahoo protocol is gone, try the funyahoo++ libpurple plugin instead.");
     210        }
     211
     212#ifdef WITH_PURPLE
     213        if ((strcmp(name, "msn") == 0) ||
     214            (strcmp(name, "loubserp-mxit") == 0) ||
     215            (strcmp(name, "myspace") == 0)) {
     216                return g_strdup("This protocol has been removed from your libpurple version.");
     217        }
     218
     219        if (strcmp(name, "hipchat") == 0) {
     220                return g_strdup("This account type isn't supported by libpurple's jabber.");
     221        }
     222
     223#else
     224        if (strcmp(name, "aim") == 0 || strcmp(name, "icq") == 0) {
     225                return g_strdup("This account uses libpurple specific aliases for oscar. "
     226                                "Re-add the account with `account add oscar ...'");
     227        }
     228
     229        extramsg = "If this is a libpurple plugin, you might need to install bitlbee-libpurple instead.";
     230#endif
     231        return g_strconcat("The protocol plugin is not installed or could not be loaded. "
     232                           "Use the `plugins' command to list available protocols. ",
     233                           extramsg, NULL);
     234}
     235
    198236void nogaim_init()
    199237{
    200238        extern void msn_initmodule();
    201239        extern void oscar_initmodule();
    202         extern void byahoo_initmodule();
    203240        extern void jabber_initmodule();
    204241        extern void twitter_initmodule();
     
    212249#ifdef WITH_OSCAR
    213250        oscar_initmodule();
    214 #endif
    215 
    216 #ifdef WITH_YAHOO
    217         byahoo_initmodule();
    218251#endif
    219252
Note: See TracChangeset for help on using the changeset viewer.