org.guifications.plugins.smartear: b459dd956b446010f04ffcdd1e7e452404efb727

[grim at guifications.org]

-----------------------------------------------------------------
Revision: b459dd956b446010f04ffcdd1e7e452404efb727
Ancestor: 7aa3f08f27c31ae302f255a02602610de17127f7
Author: grim at guifications.org
Date: 2008-03-24T05:37:57
Branch: org.guifications.plugins.smartear

Added files:
        smartear/.build smartear/.purple-plugin
Modified files:
        configure.ac smartear/Makefile.am smartear/gtksmartear.c

ChangeLog: 

This compiles again, although I think i'm going to move the plugins to their own directories


-----------------------------------------------------------------
This revision's diffstat output:
 configure.ac           |    7 ++++++
 smartear/Makefile.am   |   50 +++++++++++++++++++++++++++++++++++++------------
 smartear/gtksmartear.c |   11 ++++------
 3 files changed, 50 insertions(+), 18 deletions(-)
-------------- next part --------------
============================================================
--- smartear/.build	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ smartear/.build	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- smartear/.purple-plugin	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ smartear/.purple-plugin	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- configure.ac	f120392abb6dcc7c924f5a5d756f2739f4f3a14a
+++ configure.ac	445b5e440f68a4160238027b1e5cc7f0d40eed44
@@ -209,6 +209,13 @@ AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+HAVE_GNT="no"
+GNT_CFLAGS=""
+GNT_LIBS=""
+PKG_CHECK_MODULES(GNT, [gnt], HAVE_GNT="yes", HAVE_GNT="no")
+AC_SUBST(GNT_CFLAGS)
+AC_SUBST(GNT_CFLAGS)
+
 dnl #######################################################################
 dnl # Plugin dependency checking
 dnl #######################################################################
============================================================
--- smartear/Makefile.am	245ffd86018c9ad3a4d36a078fb4c3f79e3b970d
+++ smartear/Makefile.am	080195b607465676344b9d5caf1b3a85aed24974
@@ -1,36 +1,62 @@ EXTRA_DIST= \
 EXTRA_DIST= \
 	.build \
+	.pidgin-plugin \
 	.purple-plugin \
-	.pidgin-plugin \
 	.finch-plugin \
 	Makefile.mingw
 
-smarteardir = $(PIDGIN_LIBDIR)
 
+if HAVE_PURPLE
+smarteardir = $(PURPLE_LIBDIR)
 smartear_la_LDFLAGS = -module -avoid-version
+smartear_la_CPPFLAGS = \
+	-DLIBDIR=\"$(PURPLE_LIBDIR)\" \
+	-DDATADIR=\"$(PURPLE_DATADIR)\" \
+	-DPIXMAPSDIR=\"$(PURPLE_PIXMAPSDIR)\" \
+	$(DEBUG_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(PURPLE_CFLAGS)
 
-if HAVE_PURPLE
 smartear_LTLIBRARIES = smartear.la
 smartear_la_SOURCES = smartear.c
 smartear_la_LIBADD = $(PURPLE_LIBS)
 endif
 
 if HAVE_PIDGIN
+gtksmarteardir = $(PIDGIN_LIBDIR)
+gtksmartear_la_LDFLAGS = -module -avoid-version
+gtksmartear_la_CPPFLAGS = \
+	-DLIBDIR=\"$(PIDGIN_LIBDIR)\" \
+	-DDATADIR=\"$(PIDGIN_DATADIR)\" \
+	-DPIXMAPSDIR=\"$(PIDGIN_PIIXMAPSDIR)\" \
+	$(GTK_CFLAGS) \
+	$(PIDGIN_CFLAGS)
+
 gtksmartear_LTLIBRARIES = gtksmartear.la
 gtksmartear_la_SOURCES = gtksmartear.c
-gtksmartear_la_LIBADD = $(PIDGIN_LIBS)
+gtksmartear_la_LIBADD = \
+	$(GTK_LIBS) \
+	$(PIDGIN_LIBS) \
+	$(PURPLE_LIBS)
+
 endif
 
 if HAVE_FINCH
+gntsmarteardir = $(FINCH_LIBDIR)
+gntsmartear_la_LDFLAGS = -module -avoid-version
+gntsmartear_la_CPPFLAGS = \
+	-DLIBDIR=\"$(FINCH_LIBDIR)\" \
+	-DDATADIR=\"$(FINCH_DATADIR)\" \
+	-DPIXMAPSDIR=\"$(FINCH_PIIXMAPSDIR)\" \
+	$(FINCH_CFLAGS) \
+	$(GNT_CFLAGS)
+
 gntsmartear_LTLIBRARIES = gntsmartear.la
 gntsmartear_la_SOURCES = gntsmartear.c
-gntsmartear_la_LIBADD = $(FINCH_LIBS)
-endif
+gntsmartear_la_LIBADD = \
+	$(FINCH_LIBS) \
+	$(GNT_LIBS) \
+	$(PURPLE_LIBS)
 
-AM_CPPFLAGS = \
-	-DLIBDIR=\"$(PURPLE_LIBDIR)\" \
-	-DDATADIR=\"$(PURPLE_DATADIR)\" \
-	-DPIXMAPSDIR=\"$(PURPLE_PIXMAPSDIR)\" \
-	$(DEBUG_CFLAGS) \
-	$(PURPLE_CFLAGS)
+endif
 
============================================================
--- smartear/gtksmartear.c	1677b22071a29454fccd9c8275d9642ee5df7aa4
+++ smartear/gtksmartear.c	61dadaaab9ce9928e4ea6846c25d83dd89dc4622
@@ -25,8 +25,6 @@
 /* Pack/Local headers */
 #include "../common/pp_internal.h"
 
-#define PLUGIN_AUTHOR		"John Bailey <rekkanoryo at rekkanoryo.org>"
-
 /* System headers */
 #include <gdk/gdk.h>
 #include <glib.h>
@@ -60,7 +58,7 @@ static PurplePluginInfo info = {
 	PP_VERSION,					/* version				*/
 	NULL,						/* summary				*/
 	NULL,						/* description			*/
-	PLUGIN_AUTHOR,				/* author				*/
+	"John Bailey <rekkanoryo at rekkanoryo.org>",
 	PP_WEBSITE,					/* website				*/
 
 	plugin_load,				/* load					*/
@@ -85,9 +83,10 @@ init_plugin(PurplePlugin *plugin) {
 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 #endif /* ENABLE_NLS */
 
-	info.name = _(PLUGIN_NAME);
-	info.summary = _(PLUGIN_SUMMARY);
-	info.description = _(PLUGIN_DESCRIPTION);
+	info.name = _("gtksmartear");
+	info.summary = _("GTK+ Configuration for smartear");
+	info.description = _("This plugin is just a frontend for the libpurple "
+						 "plugin, smartear");
 }
 
 PURPLE_INIT_PLUGIN(PLUGIN_STATIC_NAME, init_plugin, info)