Changeset e248c7f

Timestamp:

2009-10-12T22:23:49Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4524f66

Parents:

dd0d57b1

Message:

Automatically try prpl-$proto if $proto doesn't exist, and disable native
protocol modules if purple is enabled; they don't go together very well.

Files:

• configure (modified) (2 diffs)
• protocols/nogaim.c (modified) (1 diff)

configure

@@ -450 +450 @@
 protoobjs=''
 
-if [ "$msn" = 0 ]; then
-        echo '#undef WITH_MSN' >> config.h
-else
-        echo '#define WITH_MSN' >> config.h
-        protocols=$protocols'msn '
-        protoobjs=$protoobjs'msn_mod.o '
-fi
-
-if [ "$jabber" = 0 ]; then
-        echo '#undef WITH_JABBER' >> config.h
-else
-        echo '#define WITH_JABBER' >> config.h
-        protocols=$protocols'jabber '
-        protoobjs=$protoobjs'jabber_mod.o '
-fi
-
-if [ "$oscar" = 0 ]; then
-        echo '#undef WITH_OSCAR' >> config.h
-else
-        echo '#define WITH_OSCAR' >> config.h
-        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
-
 if [ "$purple" = 0 ]; then
         echo '#undef WITH_PURPLE' >> config.h
@@ -489 +457 @@
         protocols=$protocols'purple '
         protoobjs=$protoobjs'purple_mod.o '
+
+        # Having both libpurple and native IM modules in one binary may
+        # do strange things. Let's not do that.
+        msn=0
+        jabber=0
+        oscar=0
+        yahoo=0
+fi
+
+if [ "$msn" = 0 ]; then
+        echo '#undef WITH_MSN' >> config.h
+else
+        echo '#define WITH_MSN' >> config.h
+        protocols=$protocols'msn '
+        protoobjs=$protoobjs'msn_mod.o '
+fi
+
+if [ "$jabber" = 0 ]; then
+        echo '#undef WITH_JABBER' >> config.h
+else
+        echo '#define WITH_JABBER' >> config.h
+        protocols=$protocols'jabber '
+        protoobjs=$protoobjs'jabber_mod.o '
+fi
+
+if [ "$oscar" = 0 ]; then
+        echo '#undef WITH_OSCAR' >> config.h
+else
+        echo '#define WITH_OSCAR' >> config.h
+        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
 

protocols/nogaim.c

@@ -102 +102 @@
 {
         GList *gl;
-        for (gl = protocols; gl; gl = gl->next) 
+        
+        for( gl = protocols; gl; gl = gl->next )
         {
                 struct prpl *proto = gl->data;
-                if(!g_strcasecmp(proto->name, name)) 
+                
+                if( g_strcasecmp( proto->name, name ) == 0 )
                         return proto;
+
+#ifdef WITH_PURPLE
+                /* I know, hardcoding is evil, but that doesn't make it
+                   impossible. :-) */
+                if( g_strncasecmp( proto->name, "prpl-", 5 ) == 0 &&
+                    g_strcasecmp( proto->name + 5, name ) == 0 )
+                        return proto;
+#endif
         }
+        
         return NULL;
 }