Changeset 0b9daac for protocols/jabber

Timestamp:

2015-02-20T23:16:08Z (10 years ago)

Author:

dequis <dx@…>

Parents:

5ebff60

git-author:

dequis <dx@…> (27-12-14 04:06:45)

git-committer:

dequis <dx@…> (20-02-15 23:16:08)

Message:

Reorganize include files to avoid conflicts with other libs

• Change all header includes to be relative to the project root
• Remove -I${includedir} from bitlbee.pc Cflags
• Install lib and protocols headers to their own directories. So now it is:

/usr/include/bitlbee/*.h
/usr/include/bitlbee/lib/*.h
/usr/include/bitlbee/protocols/*.h

This breaks backwards compatibility of third party plugins, but now
they don't have to do ambiguous includes like #include <proxy.h>

This also fixes trac ticket 1170 - conflicts when libproxy and liboauth
are installed at the same time bitlbee is built, which the macports
project ran into several times.

Location:

protocols/jabber

Files:

• conference.c (modified) (1 diff)
• io.c (modified) (1 diff)
• iq.c (modified) (1 diff)
• jabber.c (modified) (1 diff)
• jabber.h (modified) (1 diff)
• jabber_util.c (modified) (1 diff)
• s5bytestream.c (modified) (1 diff)
• sasl.c (modified) (1 diff)
• si.c (modified) (1 diff)

protocols/jabber/conference.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "sha1.h"
+#include "lib/sha1.h"
 
 static xt_status jabber_chat_join_failed(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);

protocols/jabber/io.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "ssl_client.h"
+#include "lib/ssl_client.h"
 
 static gboolean jabber_write_callback(gpointer data, gint fd, b_input_condition cond);

protocols/jabber/iq.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "sha1.h"
+#include "lib/sha1.h"
 
 static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);

protocols/jabber/jabber.c

@@ -28 +28 @@
 #include <stdio.h>
 
-#include "ssl_client.h"
-#include "xmltree.h"
+#include "lib/ssl_client.h"
+#include "lib/xmltree.h"
 #include "bitlbee.h"
 #include "jabber.h"
-#include "oauth.h"
-#include "md5.h"
+#include "lib/oauth.h"
+#include "lib/md5.h"
 
 GSList *jabber_connections;

protocols/jabber/jabber.h

@@ -28 +28 @@
 
 #include "bitlbee.h"
-#include "md5.h"
-#include "xmltree.h"
+#include "lib/md5.h"
+#include "lib/xmltree.h"
 
 extern GSList *jabber_connections;

protocols/jabber/jabber_util.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "md5.h"
-#include "base64.h"
+#include "lib/md5.h"
+#include "lib/base64.h"
 
 static unsigned int next_id = 1;

protocols/jabber/s5bytestream.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "sha1.h"
+#include "lib/sha1.h"
 #include "lib/ftutil.h"
 #include <poll.h>

protocols/jabber/sasl.c

@@ -25 +25 @@
 
 #include "jabber.h"
-#include "base64.h"
-#include "oauth2.h"
-#include "oauth.h"
+#include "lib/base64.h"
+#include "lib/oauth2.h"
+#include "lib/oauth.h"
 
 const struct oauth2_service oauth2_service_google =

protocols/jabber/si.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "sha1.h"
+#include "lib/sha1.h"
 
 void jabber_si_answer_request(file_transfer_t *ft);