changeset 11272:80ee726755d4

[gaim-migrate @ 13455] another commit to crazy c committer: Tailor Script <[e-mail]>

--- a/plugins/crazychat/Makefile.am	Mon Aug 15 06:52:45 2005 +0000
+++ b/plugins/crazychat/Makefile.am	Mon Aug 15 08:25:31 2005 +0000
@@ -3,41 +3,38 @@
 if ENABLE_DEBUG
 DEBUG_CPPFLAGS = -g -pg
 # DEBUG_CPPFLAGS = -D_DEBUG_ -g -pg 
-DEBUG_LDFLAGS = -pg
+DEBUG_LFLAGS = -pg
 else
 DEBUG_CPPFLAGS = -O2
-DEBUG_LDFLAGS =
+DEBUG_LFLAGS =
 endif
 
 plugin_LTLIBRARIES = crazychat.la
-if DISABLE_QT
-crazychat_la_LDFLAGS = -module -avoid-version $(DEBUG_LDFLAGS)
+
+if DISABLE_MODELS
+MD_CPPFLAGS = -DDISABLE_MODELS
+else
+MD_CPPFLAGS =
+endif
+
+crazychat_la_LDFLAGS = -module -avoid-version $(GTK_LIBS) $(DEBUG_LFLAGS)
 crazychat_la_SOURCES = cc_gaim_plugin.c cc_gtk_gl.c cc_gtk_gl.h \
-	cc_interface.h crazychat.c crazychat.h util.h \
+	cc_interface.h crazychat.c crazychat.h util.h\
 	cc_network.c cc_network.h filter.c filter.h\
 	cc_output.c face.c face.h doggy.c doggy.h glm.h glm.c sharky.h sharky.c models.h models.c
 
 QT_CPPFLAGS = -D_DISABLE_QT_
-else
-crazychat_la_LDFLAGS = -module -avoid-version $(DEBUG_LDFLAGS) \
-	-XCClinker -framework -XCClinker Carbon -XCClinker -framework \
-	-XCClinker QuickTime
+
+crazychat_la_LIBADD = $(GTKGLEXT_LIBS)
 
-crazychat_la_SOURCES = cc_features.c cc_gaim_plugin.c cc_gtk_gl.c cc_gtk_gl.h \
-	cc_interface.h crazychat.c crazychat.h util.h \
-	cc_network.c cc_network.h filter.c filter.h\
-	cc_output.c face.c face.h doggy.c doggy.h glm.h glm.c sharky.h sharky.c models.h models.c\
-	QTUtilities.c Utilities.c camdata.c camproc.c Utilities.h
-
-QT_CPPFLAGS =
-endif
-
-crazychat_la_LIBADD = $(PTHREAD_LIB) $(GTKGLEXT_LIBS)
-
-AM_CFLAGS = $(GTK_CFLAGS) \
-	$(GTKGLEXT_CFLAGS) \
-	-I$(top_srcdir)/include
+#AM_CFLAGS = $(GTK_CFLAGS) \
+#$(GTKGLEXT_CFLAGS) \
+#-I$(top_srcdir)/include
 
 AM_CPPFLAGS = -DGAIM_PLUGINS \
+	-I$(top_srcdir)/src \
+	$(GTK_CFLAGS) \
+	$(GTKGLEXT_CFLAGS) \
 	$(DEBUG_CPPFLAGS) \
-	$(QT_CPPFLAGS)
+	$(QT_CPPFLAGS) \
+	$(MD_CPPFLAGS)

--- a/plugins/crazychat/cc_network.c	Mon Aug 15 06:52:45 2005 +0000
+++ b/plugins/crazychat/cc_network.c	Mon Aug 15 08:25:31 2005 +0000
@@ -110,7 +110,7 @@
 	}
 	im = gaim_conversation_get_im_data(conv);
 	snprintf(buf, BUFSIZ, "%s%s!%d", CRAZYCHAT_INVITE_CODE,
-		gaim_network_get_ip_for_account(account, -1), cc->tcp_port);
+		gaim_network_get_my_ip(-1), cc->tcp_port);
 	Debug("Sent invite to %s for port: %d\n", name, cc->tcp_port);
 	gaim_conv_im_send(im, buf);
 }
@@ -196,7 +196,7 @@
 	struct sockaddr_in my_addr;
 	my_addr.sin_family = AF_INET;
 	my_addr.sin_port = htons(session->cc->tcp_port);
-	assert(inet_aton(gaim_network_get_ip_for_account(account, -1),
+	assert(inet_aton(gaim_network_get_my_ip(-1),
 			&my_addr.sin_addr));
 	memset(&my_addr.sin_zero, 0, sizeof(my_addr.sin_zero));
 	assert(bind(session->tcp_sock, (struct sockaddr*)&my_addr,
@@ -271,7 +271,7 @@
 		session->peer_ip = args->peer_ip;
 		session->peer_port = args->peer_port;
 		snprintf(buf, BUFSIZ, "%s%s", CRAZYCHAT_ACCEPT_CODE,
-			gaim_network_get_ip_for_account(args->account, -1));
+			gaim_network_get_my_ip(-1));
 		conv = gaim_find_conversation_with_account(GAIM_CONV_ANY, args->name,
 				args->account);
 		if (!conv) {
@@ -375,7 +375,7 @@
 	
 	my_addr.sin_family = AF_INET;
 	my_addr.sin_port = htons(session->cc->udp_port);
-	assert(inet_aton(gaim_network_get_ip_for_account(account, -1),
+	assert(inet_aton(gaim_network_get_my_ip(-1),
 				&my_addr.sin_addr));
 	memset(my_addr.sin_zero, 0, sizeof(my_addr.sin_zero));
 	assert(!bind(session->udp_sock, (struct sockaddr*)&my_addr,

--- a/plugins/crazychat/cc_output.c	Mon Aug 15 06:52:45 2005 +0000
+++ b/plugins/crazychat/cc_output.c	Mon Aug 15 08:25:31 2005 +0000
@@ -4,7 +4,7 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <math.h>
-#include "util.h"
+/*#include "util.h"*/
 #include "cc_interface.h"
 #include "crazychat.h"
 #include <stdio.h>