Menu
▾
▴
[Gaim-commits] SF.net SVN: gaim: [17078] trunk/libgaim/plugins
|
From: <de...@us...> - 2006-08-29 04:15:40
|
Revision: 17078 Author: deryni9 Date: 2006-08-28 21:15:29 -0700 (Mon, 28 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=17078&view=rev Log Message: ----------- Reenable the perl build on non-Windows. I'm looking at making a gtk perl plugin to use the gtk stuff, we'll see if I succeed. I'm leaving the gtk stuff in here but ifdef:d out for now. I'll clean it up if I get the gtk perl plugin working. Modified Paths: -------------- trunk/libgaim/plugins/Makefile.am trunk/libgaim/plugins/perl/Makefile.am trunk/libgaim/plugins/perl/common/Makefile.PL.in trunk/libgaim/plugins/perl/common/Network.xs trunk/libgaim/plugins/perl/common/module.h trunk/libgaim/plugins/perl/common/typemap trunk/libgaim/plugins/perl/perl-handlers.h trunk/libgaim/plugins/perl/perl.c Modified: trunk/libgaim/plugins/Makefile.am =================================================================== --- trunk/libgaim/plugins/Makefile.am 2006-08-29 03:47:34 UTC (rev 17077) +++ trunk/libgaim/plugins/Makefile.am 2006-08-29 04:15:29 UTC (rev 17078) @@ -1,9 +1,7 @@ DIST_SUBDIRS = mono perl ssl tcl if USE_PERL -# Fix the perl plugin to not use gtk first -# PERL_DIR = perl -PERL_DIR = +PERL_DIR = perl endif if USE_TCL Modified: trunk/libgaim/plugins/perl/Makefile.am =================================================================== --- trunk/libgaim/plugins/perl/Makefile.am 2006-08-29 03:47:34 UTC (rev 17077) +++ trunk/libgaim/plugins/perl/Makefile.am 2006-08-29 04:15:29 UTC (rev 17078) @@ -158,8 +158,7 @@ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libgaim \ - -I$(top_srcdir)/gtk \ # FIXME $(DEBUG_CFLAGS) \ - $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) \ $(PERL_CFLAGS) Modified: trunk/libgaim/plugins/perl/common/Makefile.PL.in =================================================================== --- trunk/libgaim/plugins/perl/common/Makefile.PL.in 2006-08-29 03:47:34 UTC (rev 17077) +++ trunk/libgaim/plugins/perl/common/Makefile.PL.in 2006-08-29 04:15:29 UTC (rev 17078) @@ -11,7 +11,7 @@ AUTHOR => 'Christian Hammond <ch...@gn...>') : ()), 'LIBS' => [''], # e.g., '-lm' 'DEFINE' => '@DEBUG_CFLAGS@', # e.g., '-DHAVE_SOMETHING' - 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/src @GLIB_CFLAGS@ @GTK_CFLAGS@', # e.g., '-I. -I/usr/include/other' + 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libgaim @GLIB_CFLAGS@', # e.g., '-I. -I/usr/include/other' 'OBJECT' => '$(O_FILES)', # link all the C files too ); Modified: trunk/libgaim/plugins/perl/common/Network.xs =================================================================== --- trunk/libgaim/plugins/perl/common/Network.xs 2006-08-29 03:47:34 UTC (rev 17077) +++ trunk/libgaim/plugins/perl/common/Network.xs 2006-08-29 04:15:29 UTC (rev 17078) @@ -25,14 +25,14 @@ gaim_network_ip_atoi(ip) const char *ip -Gaim::NetworkListenData * +Gaim::NetworkListenData gaim_network_listen(port, socket_type, cb, cb_data) unsigned short port int socket_type Gaim::NetworkListenCallback cb gpointer cb_data -Gaim::NetworkListenData * +Gaim::NetworkListenData gaim_network_listen_range(start, end, socket_type, cb, cb_data) unsigned short start unsigned short end Modified: trunk/libgaim/plugins/perl/common/module.h =================================================================== --- trunk/libgaim/plugins/perl/common/module.h 2006-08-29 03:47:34 UTC (rev 17077) +++ trunk/libgaim/plugins/perl/common/module.h 2006-08-29 04:15:29 UTC (rev 17078) @@ -28,11 +28,13 @@ #include "desktopitem.h" #include "eventloop.h" #include "ft.h" +#ifdef GAIM_GTKPERL #include "gtkaccount.h" #include "gtkblist.h" #include "gtkconn.h" #include "gtkconv.h" #include "gtkutils.h" +#endif #include "imgstore.h" #include "network.h" #include "notify.h" @@ -96,7 +98,6 @@ /* conversation.h */ typedef GaimConversationType Gaim__ConversationType; -typedef GaimUnseenState Gaim__UnseenState; typedef GaimConvUpdateType Gaim__ConvUpdateType; typedef GaimTypingState Gaim__TypingState; typedef GaimMessageFlags Gaim__MessageFlags; @@ -124,6 +125,7 @@ typedef GaimXferStatusType Gaim__XferStatusType; typedef GaimXferUiOps * Gaim__XferUiOps; +#ifdef GAIM_GTKPERL /* gtkblish.h */ typedef GaimGtkBuddyList * Gaim__GTK__BuddyList; typedef GaimStatusIconSize Gaim__StatusIconSize; @@ -136,6 +138,7 @@ #endif /* _WIN32 */ /* gtkconv.h */ +typedef GaimUnseenState Gaim__UnseenState; typedef GaimGtkConversation * Gaim__GTK__Conversation; typedef GdkPixbuf * Gaim__GDK__Pixbuf; typedef GtkWidget * Gaim__GTK__Widget; @@ -146,6 +149,7 @@ typedef GtkTextView * Gaim__GTK__TextView; /* gtkconn.h */ +#endif /* imgstore.h */ typedef GaimStoredImage * Gaim__StoredImage; @@ -159,7 +163,7 @@ typedef GaimLogType Gaim__LogType; /* network.h */ -typedef GaimNetworkListenData Gaim__NetworkListenData; +typedef GaimNetworkListenData * Gaim__NetworkListenData; typedef GaimNetworkListenCallback Gaim__NetworkListenCallback; /* notify.h */ Modified: trunk/libgaim/plugins/perl/common/typemap =================================================================== --- trunk/libgaim/plugins/perl/common/typemap 2006-08-29 03:47:34 UTC (rev 17077) +++ trunk/libgaim/plugins/perl/common/typemap 2006-08-29 04:15:29 UTC (rev 17078) @@ -92,6 +92,7 @@ Gaim::Menu::Action T_GaimObj +Gaim::NetworkListenData T_GaimObj Gaim::NetworkListenCallback T_PTR Gaim::NotifyCloseCallback T_PTR Modified: trunk/libgaim/plugins/perl/perl-handlers.h =================================================================== --- trunk/libgaim/plugins/perl/perl-handlers.h 2006-08-29 03:47:34 UTC (rev 17077) +++ trunk/libgaim/plugins/perl/perl-handlers.h 2006-08-29 04:15:29 UTC (rev 17078) @@ -5,8 +5,10 @@ #include "plugin.h" #include "prefs.h" #include "pluginpref.h" +#ifdef GAIM_GTKPERL #include "gtkplugin.h" #include "gtkutils.h" +#endif typedef struct { @@ -42,7 +44,9 @@ GaimPluginPrefFrame *gaim_perl_get_plugin_frame(GaimPlugin *plugin); +#ifdef GAIM_GTKPERL GtkWidget *gaim_perl_gtk_get_plugin_frame(GaimPlugin *plugin); +#endif void gaim_perl_timeout_add(GaimPlugin *plugin, int seconds, SV *callback, SV *data); Modified: trunk/libgaim/plugins/perl/perl.c =================================================================== --- trunk/libgaim/plugins/perl/perl.c 2006-08-29 03:47:34 UTC (rev 17077) +++ trunk/libgaim/plugins/perl/perl.c 2006-08-29 04:15:29 UTC (rev 17078) @@ -304,9 +304,11 @@ /* Set id here in case we don't find one later. */ info->id = g_strdup(SvPV(*key, len)); +#ifdef GAIM_GTKPERL if ((key = hv_fetch(plugin_info, "GTK_UI", strlen("GTK_UI"), 0))) info->ui_requirement = GAIM_GTK_PLUGIN_TYPE; +#endif if ((key = hv_fetch(plugin_info, "url", strlen("url"), 0))) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
