nautilus-sendto r378 - in trunk: . src src/plugins src/plugins/balsa src/plugins/bluetooth src/plugins/empathy src/plugins/evolution src/plugins/gaim src/plugins/gajim src/plugins/nautilus-burn src/plugins/pidgin src/plugins/sylpheed-claws src/plugins/thunderbird src/plugins/upnp
- From: hadess svn gnome org
- To: svn-commits-list gnome org
- Subject: nautilus-sendto r378 - in trunk: . src src/plugins src/plugins/balsa src/plugins/bluetooth src/plugins/empathy src/plugins/evolution src/plugins/gaim src/plugins/gajim src/plugins/nautilus-burn src/plugins/pidgin src/plugins/sylpheed-claws src/plugins/thunderbird src/plugins/upnp
- Date: Wed, 7 Jan 2009 11:26:58 +0000 (UTC)
Author: hadess
Date: Wed Jan 7 11:26:57 2009
New Revision: 378
URL: http://svn.gnome.org/viewvc/nautilus-sendto?rev=378&view=rev
Log:
2009-01-07 Bastien Nocera <hadess hadess net>
* configure.in:
* src/nautilus-sendto-command.c
(nautilus_sendto_plugin_dir_process),
(nautilus_sendto_plugin_init):
* src/plugins/Makefile.am:
* src/plugins/balsa.c:
* src/plugins/balsa/Makefile.am:
* src/plugins/balsa/balsa.c:
* src/plugins/bluetooth-marshal.list:
* src/plugins/bluetooth.c:
* src/plugins/bluetooth/Makefile.am:
* src/plugins/bluetooth/bluetooth.c:
* src/plugins/e-contact-entry.c:
* src/plugins/e-contact-entry.h:
* src/plugins/econtactentry-marshal.list:
* src/plugins/empathy.c:
* src/plugins/empathy/Makefile.am:
* src/plugins/empathy/empathy.c:
* src/plugins/evolution.c:
* src/plugins/evolution/Makefile.am:
* src/plugins/evolution/evolution.c:
* src/plugins/gaim.c:
* src/plugins/gaim/Makefile.am:
* src/plugins/gaim/gaim.c:
* src/plugins/gajim.c:
* src/plugins/gajim/Makefile.am:
* src/plugins/gajim/gajim.c:
* src/plugins/nautilus-burn.c:
* src/plugins/nautilus-burn/Makefile.am:
* src/plugins/nautilus-burn/nautilus-burn.c:
* src/plugins/pidgin.c:
* src/plugins/pidgin/Makefile.am:
* src/plugins/pidgin/pidgin.c:
* src/plugins/sylpheed-claws.c:
* src/plugins/sylpheed-claws/Makefile.am:
* src/plugins/sylpheed-claws/sylpheed-claws.c:
* src/plugins/thunderbird.c:
* src/plugins/thunderbird/Makefile.am:
* src/plugins/thunderbird/thunderbird.c:
* src/plugins/update-from-egg.sh:
* src/plugins/upnp.c:
* src/plugins/upnp/Makefile.am:
* src/plugins/upnp/upnp.c: Add a better way to enable/disable
plugins in nautilus-sendto, ripped from Totem (Closes: #525020)
Added:
trunk/src/plugins/balsa/
trunk/src/plugins/balsa/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/balsa/balsa.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/balsa.c
trunk/src/plugins/bluetooth/
trunk/src/plugins/bluetooth/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/bluetooth/bluetooth-marshal.list (props changed)
- copied unchanged from r375, /trunk/src/plugins/bluetooth-marshal.list
trunk/src/plugins/bluetooth/bluetooth.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/bluetooth.c
trunk/src/plugins/empathy/
trunk/src/plugins/empathy/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/empathy/empathy.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/empathy.c
trunk/src/plugins/evolution/
trunk/src/plugins/evolution/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/evolution/e-contact-entry.c (props changed)
- copied unchanged from r375, /trunk/src/plugins/e-contact-entry.c
trunk/src/plugins/evolution/e-contact-entry.h (props changed)
- copied unchanged from r375, /trunk/src/plugins/e-contact-entry.h
trunk/src/plugins/evolution/econtactentry-marshal.list (props changed)
- copied unchanged from r375, /trunk/src/plugins/econtactentry-marshal.list
trunk/src/plugins/evolution/evolution.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/evolution.c
trunk/src/plugins/evolution/update-from-egg.sh (props changed)
- copied unchanged from r375, /trunk/src/plugins/update-from-egg.sh
trunk/src/plugins/gaim/
trunk/src/plugins/gaim/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/gaim/gaim.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/gaim.c
trunk/src/plugins/gajim/
trunk/src/plugins/gajim/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/gajim/gajim.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/gajim.c
trunk/src/plugins/nautilus-burn/
trunk/src/plugins/nautilus-burn/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/nautilus-burn/nautilus-burn.c (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/nautilus-burn.c
trunk/src/plugins/pidgin/
trunk/src/plugins/pidgin/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/pidgin/pidgin.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/pidgin.c
trunk/src/plugins/sylpheed-claws/
trunk/src/plugins/sylpheed-claws/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/sylpheed-claws/sylpheed-claws.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/sylpheed-claws.c
trunk/src/plugins/thunderbird/
trunk/src/plugins/thunderbird/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/thunderbird/thunderbird.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/thunderbird.c
trunk/src/plugins/upnp/
trunk/src/plugins/upnp/Makefile.am (contents, props changed)
- copied, changed from r377, /trunk/src/plugins/Makefile.am
trunk/src/plugins/upnp/upnp.c (contents, props changed)
- copied, changed from r375, /trunk/src/plugins/upnp.c
Removed:
trunk/src/plugins/balsa.c
trunk/src/plugins/bluetooth-marshal.list
trunk/src/plugins/bluetooth.c
trunk/src/plugins/e-contact-entry.c
trunk/src/plugins/e-contact-entry.h
trunk/src/plugins/econtactentry-marshal.list
trunk/src/plugins/empathy.c
trunk/src/plugins/evolution.c
trunk/src/plugins/gaim.c
trunk/src/plugins/gajim.c
trunk/src/plugins/nautilus-burn.c
trunk/src/plugins/pidgin.c
trunk/src/plugins/sylpheed-claws.c
trunk/src/plugins/thunderbird.c
trunk/src/plugins/update-from-egg.sh
trunk/src/plugins/upnp.c
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/src/nautilus-sendto-command.c
trunk/src/plugins/Makefile.am
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Jan 7 11:26:57 2009
@@ -70,225 +70,221 @@
NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
AC_SUBST(NAUTILUS_EXTENSION_DIR)
-dnl Libebook support
-dnl ---------------------------------
-
-PKG_CHECK_MODULES(NST_EBOOK, libebook-1.2 >= $EBOOK_REQUIRED,
- [
- AC_SUBST(NST_EBOOK_CFLAGS)
- AC_SUBST(NST_EBOOK_LIBS)
- echo "Using libebook-1.2 !"
- enable_evolution=yes
- ],
- [
- echo "Building without evolution"
- enable_evolution=no
- ]
-)
-
-AM_CONDITIONAL(HAVE_EVOLUTION, test "x$enable_evolution" = "xyes")
-
-saved_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $NST_EBOOK_CFLAGS"
-AC_CHECK_TYPES([EContactPhotoType], , , [#include <libebook/e-contact.h>])
-CPPFLAGS="$saved_CPPFLAGS"
-
-dnl Gaim support if it's installed
-dnl ---------------------------------
-
-
-PKG_CHECK_MODULES(GAIM, gaim >= $GAIM_REQUIRED,
- [
- AC_SUBST(GAIM_CFLAGS)
- AC_SUBST(GAIM_LIBS)
- GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
- GAIM_DATADIR=`pkg-config --variable=datadir gaim`
- AC_SUBST(GAIM_LIBDIR)
- AC_SUBST(GAIM_DATADIR)
- enable_gaim=yes
- ],
- [
- echo "Building without gaim"
- enable_gaim=no
- ]
-)
-
-AM_CONDITIONAL(HAVE_GAIM, test "x$enable_gaim" = "xyes")
-
-dnl Pidgin support if it's installed
-dnl ---------------------------------
+# The full list of plugins
+allowed_plugins="balsa bluetooth empathy evolution gaim gajim nautilus-burn pidgin sylpheed-claws thunderbird upnp"
+plugin_error_or_ignore()
+{
+ if test "${error_on_bad_plugin}" = "1" ; then
+ AC_MSG_ERROR([$1])
+ else
+ AC_MSG_WARN([$1 (disabling plugin)])
+ fi
+}
-PKG_CHECK_MODULES(PIDGIN, pidgin >= $PIDGIN_REQUIRED purple >= $PIDGIN_REQUIRED,
- [
- AC_SUBST(PIDGIN_CFLAGS)
- AC_SUBST(PIDGIN_LIBS)
- PIDGIN_LIBDIR=`pkg-config --variable=libdir purple`
- PIDGIN_DATADIR=`pkg-config --variable=datadir purple`
- AC_SUBST(PIDGIN_LIBDIR)
- AC_SUBST(PIDGIN_DATADIR)
- enable_pidgin=yes
- ],
- [
- echo "Building without pidgin"
- enable_pidgin=no
- ]
-)
+AC_ARG_WITH([plugins],
+ [AS_HELP_STRING([--with-plugins],[Which nautilus-sendto plugins to compile (default: auto; "all", "autodetect" are valid)])],
+ [], [with_plugins=autodetect])
+
+used_plugins=""
+used_plugins2=""
+
+if test "x${with_plugins}" = "xautodetect" ; then
+ # Default to all plugins and just ignore them if they won't compile
+ with_plugins="all"
+ error_on_bad_plugin="0"
+else
+ # Clean up the plugin list and error if a plugin won't compile
+ with_plugins=`echo ,"${with_plugins}", | sed -e 's/[[ ,]][[ ,]]*/ /g' -e 's/,$//'`
+ error_on_bad_plugin="1"
+fi
+
+# Iterate through the wanted plugins and weed out bad ones (or error)
+for wanted_plugin in ${with_plugins}; do
+ for allowed_plugin in ${allowed_plugins}; do
+ case ${wanted_plugin} in
+ all)
+ # List all plugins as being used
+ used_plugins=${allowed_plugins}
+ ;;
+ autodetect)
+ # List all plugins as being used
+ used_plugins=${allowed_plugins}
+ ;;
+ ${allowed_plugin}) used_plugins="${used_plugins} ${wanted_plugin}";; # List the plugin
+ *) ;;
+ esac
+ done
+done
+
+# Check for plugin-specific requirements and error if necessary
+for plugin in ${used_plugins}; do
+ add_plugin="1"
+
+ case ${plugin} in
+ balsa)
+ add_plugin="1"
+ ;;
+ bluetooth)
+ PKG_CHECK_MODULES(BLUETOOTH, dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
+ enable_bluetooth=yes, enable_bluetooth=no)
+ if test "${enable_bluetooth}" != "yes" ; then
+ plugin_error_or_ignore "you need dbus-glib to build the Bluetooth plugin"
+ add_plugin="0"
+ fi
+ ;;
+ empathy)
+ PKG_CHECK_MODULES(EMPATHY, libempathy >= $EMPATHY_REQUIRED libempathy-gtk >= $EMPATHY_GTK_REQUIRED gio-2.0 telepathy-glib,
+ enable_empathy=yes, enable_empathy=no)
+ if test "${enable_empathy}" != "yes" ; then
+ plugin_error_or_ignore "you need libempathy and libempathy-gtk to build the Empathy plugin"
+ add_plugin="0"
+ fi
+ ;;
+ evolution)
+ PKG_CHECK_MODULES(NST_EBOOK, libebook-1.2 >= $EBOOK_REQUIRED,
+ enable_evolution=yes, enable_evolution=no)
+ if test "${enable_evolution}" != "yes" ; then
+ plugin_error_or_ignore "you need libebook from evolution-data-server to build the Evolution plugin"
+ add_plugin="0"
+ else
+ saved_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $NST_EBOOK_CFLAGS"
+ AC_CHECK_TYPES([EContactPhotoType], , , [#include <libebook/e-contact.h>])
+ CPPFLAGS="$saved_CPPFLAGS"
+ fi
+ ;;
+ gaim)
+ PKG_CHECK_MODULES(GAIM, gaim >= $GAIM_REQUIRED,
+ [
+ GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
+ GAIM_DATADIR=`pkg-config --variable=datadir gaim`
+ AC_SUBST(GAIM_LIBDIR)
+ AC_SUBST(GAIM_DATADIR)
+ enable_gaim=yes
+ ],
+ [
+ enable_gaim=no
+ ]
+ )
+ if test "${enable_gaim}" != "yes" ; then
+ plugin_error_or_ignore "you need gaim to build the gaim plugin"
+ add_plugin="0"
+ fi
+ ;;
+ gajim)
+ AC_ARG_WITH(gajim,
+ [AS_HELP_STRING(--with-gajim,[Path to Gajim install prefix])],
+ [GAJIM_PATH="$withval"],[GAJIM_PATH="$prefix"])
+
+ GAJIM_SHARE_DIR="$GAJIM_PATH"/share/gajim
+
+ PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
+ [
+ AC_SUBST(DBUS_CFLAGS)
+ AC_SUBST(DBUS_LIBS)
+ if test -f "$GAJIM_SHARE_DIR"/data/pixmaps/gajim.png ; then
+ enable_gajim=yes
+ AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])
+ else
+ enable_gajim=no
+ fi
+ ],
+ [
+ enable_gajim=no
+ ]
+ )
+ if test "${enable_gajim}" != "yes" ; then
+ plugin_error_or_ignore "you need gajim and dbus-glib installed for the gajim plugin"
+ add_plugin="0"
+ fi
+ ;;
+ nautilus-burn)
+ PKG_CHECK_MODULES(GIO, gio-2.0,
+ enable_burn=no, enable_burn=no)
+ if test "${enable_burn}" != "yes" ; then
+ plugin_error_or_ignore "you need gio installed for the nautilus-burn plugin"
+ add_plugin="0"
+ fi
+ ;;
+ pidgin)
+ PKG_CHECK_MODULES(PIDGIN, pidgin >= $PIDGIN_REQUIRED purple >= $PIDGIN_REQUIRED,
+ [
+ PIDGIN_LIBDIR=`pkg-config --variable=libdir purple`
+ PIDGIN_DATADIR=`pkg-config --variable=datadir purple`
+ AC_SUBST(PIDGIN_LIBDIR)
+ AC_SUBST(PIDGIN_DATADIR)
+ enable_pidgin=yes
+ ],
+ [
+ enable_pidgin=no
+ ]
+ )
+ if test "${enable_pidgin}" != "yes" ; then
+ plugin_error_or_ignore "you need pidgin and libpurple installed for the pidgin plugin"
+ add_plugin="0"
+ fi
+ ;;
+ sylpheed-claws)
+ add_plugin="1"
+ ;;
+ thunderbird)
+ AC_ARG_WITH([thunderbird-name],
+ [AS_HELP_STRING([--with-thunderbird-name],[Binary name for Thunderbird (default: thunderbird)])],
+ [with_thunderbird_name=$withval])
+ if test "x$with_thunderbird_name" = "x" ; then
+ with_thunderbird_name=thunderbird
+ fi
+ THUNDERBIRD_NAME=$with_thunderbird_name
+ AC_SUBST(THUNDERBIRD_NAME)
+
+ AC_DEFINE_UNQUOTED(THUNDERBIRD_NAME, "$THUNDERBIRD_NAME", [name of the Thunderbird binary])
+
+ add_plugin="1"
+ ;;
+ upnp)
+ PKG_CHECK_MODULES(UPNP, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED,
+ enable_upnp=yes, enable_upnp=no)
+ if test "${enable_upnp}" != "yes" ; then
+ plugin_error_or_ignore "you need gupnp-av installed for the upnp plugin"
+ add_plugin="0"
+ fi
+ ;;
+ esac
+
+ # Add the specified plugin
+ if test "${add_plugin}" = "1" ; then
+ used_plugins2="${used_plugins2} ${plugin}"
+ fi
+done
-AM_CONDITIONAL(HAVE_PIDGIN, test "x$enable_pidgin" = "xyes")
+ALL_PLUGINS=$allowed_plugins
+PLUGINS=$used_plugins2
-dnl Bluetooth support if it's installed
-dnl -----------------------------------
+dnl Error out if no plugins will be built
+if test -z "${PLUGINS}" ; then
+ AC_MSG_ERROR([No plugins will be built, and nautilus-sendto requires at least one])
+fi
-PKG_CHECK_MODULES(BLUETOOTH, dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
- [
- AC_SUBST(BLUETOOTH_CFLAGS)
- AC_SUBST(BLUETOOTH_LIBS)
- enable_bluetooth=yes
- ],
- [
- echo "Building without Bluetooth"
- enable_bluetooth=no
- ]
-)
-
-AM_CONDITIONAL(HAVE_BLUETOOTH, test "x$enable_bluetooth" = "xyes")
-
-PKG_CHECK_MODULES(UPNP, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED,
- [
- AC_SUBST(UPNP_CFLAGS)
- AC_SUBST(UPNP_LIBS)
- enable_upnp=yes
- ],
- [
- echo "Building without UPnP"
- enable_upnp=no
- ]
-)
+AC_MSG_CHECKING([which plugins to compile])
+AC_MSG_RESULT([$PLUGINS])
-dnl GUPnP AV if it's installed
-dnl -----------------------------------
+AC_SUBST([ALL_PLUGINS])
+AC_SUBST([PLUGINS])
-AM_CONDITIONAL(HAVE_UPNP, test "x$enable_upnp" = "xyes")
+dnl For the gaim and pidgin plugins
+AM_CONDITIONAL(HAVE_GAIM, test "x$enable_gaim" = "xyes")
+AM_CONDITIONAL(HAVE_PIDGIN, test "x$enable_pidgin" = "xyes")
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
-dnl Nautilus burn support if it's installed
-dnl -----------------------------------
-
-# FIXME enable_burn should yes at the top,
-# when we know how to copy directories
-
-PKG_CHECK_MODULES(GIO, gio-2.0,
- [
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
- enable_burn=no
- ],
- [
- echo "Building without Nautilus-cd-burner support"
- enable_burn=no
- ]
-)
-
-AM_CONDITIONAL(HAVE_BURN, test "x$enable_burn" = "xyes")
-
-dnl --------------------------------------------------
-
-dnl Balsa support
-dnl -------------------------------------------------
-
-enable_balsa=no
-AM_CONDITIONAL(HAVE_BALSA, test "x$enable_balsa" = "xyes")
-dnl -------------------------------------------------
-
-
-dnl Sylpheed support
-dnl -------------------------------------------------
-
-enable_sylpheed=yes
-AM_CONDITIONAL(HAVE_SYLPHEED, test "x$enable_sylpheed" = "xyes")
-dnl -------------------------------------------------
-
-
-dnl Thunderbird support
-dnl -------------------------------------------------
-
-AC_ARG_WITH([thunderbird-name],
- [AS_HELP_STRING([--with-thunderbird-name],[Binary name for Thunderbird (default: thunderbird)])],
- [with_thunderbird_name=$withval])
-if test "x$with_thunderbird_name" = "x" ; then
- with_thunderbird_name=thunderbird
-fi
-
-THUNDERBIRD_NAME=$with_thunderbird_name
-AC_SUBST(THUNDERBIRD_NAME)
-
-AC_DEFINE_UNQUOTED(THUNDERBIRD_NAME, "$THUNDERBIRD_NAME", [name of the Thunderbird binary])
-
-enable_thunderbird=yes
-AM_CONDITIONAL(HAVE_THUNDERBIRD, test "x$enable_thunderbird" = "xyes")
-
-dnl -------------------------------------------------
-
-dnl Gajim support
-dnl -------------------------------------------------
-
-AC_ARG_WITH(gajim,
- [AS_HELP_STRING(--with-gajim,[Path to Gajim install prefix])],
- [GAJIM_PATH="$withval"],[GAJIM_PATH="$prefix"])
-
-GAJIM_SHARE_DIR="$GAJIM_PATH"/share/gajim
-
-PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
- [
- AC_SUBST(DBUS_CFLAGS)
- AC_SUBST(DBUS_LIBS)
- if test -f "$GAJIM_SHARE_DIR"/data/pixmaps/gajim.png ;
- then
- enable_gajim=yes
- AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])
- else
- echo "Building without Gajim support"
- enable_gajim=no
- fi
- ],
- [
- echo "Building without Gajim support"
- enable_gajim=no
- ]
-)
-
-AM_CONDITIONAL(HAVE_GAJIM, test "x$enable_gajim" = "xyes")
-
-dnl -------------------------------------------------
-
-dnl Empathy support
-dnl -------------------------------------------------
-
-PKG_CHECK_MODULES(EMPATHY, libempathy >= $EMPATHY_REQUIRED libempathy-gtk >= $EMPATHY_GTK_REQUIRED gio-2.0 telepathy-glib,
- [
- AC_SUBST(EMPATHY_CFLAGS)
- AC_SUBST(EMPATHY_LIBS)
- enable_empathy=yes
- ],
- [
- echo "Building without empathy"
- enable_empathy=no
- ]
-)
-
-AM_CONDITIONAL(HAVE_EMPATHY, test "x$enable_empathy" = "xyes")
-
-dnl -------------------------------------------------
-
IT_PROG_INTLTOOL([0.35.0])
GETTEXT_PACKAGE=nautilus-sendto
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
-
+
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(GCONFTOOL, gconftool-2)
@@ -298,6 +294,17 @@
Makefile
src/Makefile
src/plugins/Makefile
+src/plugins/balsa/Makefile
+src/plugins/bluetooth/Makefile
+src/plugins/empathy/Makefile
+src/plugins/evolution/Makefile
+src/plugins/gaim/Makefile
+src/plugins/gajim/Makefile
+src/plugins/nautilus-burn/Makefile
+src/plugins/pidgin/Makefile
+src/plugins/sylpheed-claws/Makefile
+src/plugins/thunderbird/Makefile
+src/plugins/upnp/Makefile
gaim_plugin/Makefile
pidgin_plugin/Makefile
po/Makefile.in
@@ -306,70 +313,21 @@
echo "-------------------------------------------------------"
echo " "
-if test "x${enable_evolution}" = "xyes" ; then
- echo " ** Enable evolution plugin : YES"
-else
- echo " Enable evolution plugin : NO"
-fi
-
-if test "x${enable_gaim}" = "xyes" ; then
- echo " ** Enable gaim plugin : YES"
-else
- echo " Enable gaim plugin : NO"
-fi
-
-if test "x${enable_pidgin}" = "xyes" ; then
- echo " ** Enable pidgin plugin : YES"
-else
- echo " Enable pidgin plugin : NO"
-fi
-
-if test "x${enable_bluetooth}" = "xyes" ; then
- echo " ** Enable bluetooth plugin : YES"
-else
- echo " Enable bluetooth plugin : NO"
-fi
-
-if test "x${enable_burn}" = "xyes" ; then
- echo " ** Enable nautilus-cd-burner plugin : YES"
-else
- echo " Enable nautilus-cd-burner plugin : NO"
-fi
-
-if test "x${enable_upnp}" = "xyes" ; then
- echo " ** Enable UPnP plugin : YES"
-else
- echo " Enable UPnP plugin : NO"
-fi
-
-if test "x${enable_balsa}" = "xyes" ; then
- echo " ** Enable balsa plugin : YES"
-else
- echo " Enable balsa plugin (under development, don't support attachments) : NO"
-fi
-
-if test "x${enable_sylpheed}" = "xyes" ; then
- echo " ** Enable sylpheed plugin : YES"
-else
- echo " Enable sylpheed plugin : NO"
-fi
-
-if test "x${enable_thunderbird}" = "xyes" ; then
- echo " ** Enable thunderbird plugin : YES (binary name: $THUNDERBIRD_NAME)"
-else
- echo " Enable thunderbird plugin : NO"
-fi
-
-if test "x${enable_gajim}" = "xyes" ; then
- echo " ** Enable gajim plugin : YES"
-else
- echo " Enable gajim plugin : NO"
-fi
-
-if test "x${enable_empathy}" = "xyes" ; then
- echo " ** Enable empathy plugin : YES"
+if test "x${PLUGINS}" != "x" ; then
+ for allowed_plugin in ${ALL_PLUGINS}; do
+ for plugin in ${PLUGINS}; do
+ case ${allowed_plugin} in
+ ${plugin})
+ AC_MSG_NOTICE([** ${allowed_plugin} plugin enabled])
+ continue 2
+ ;;
+ *);;
+ esac
+ done
+ AC_MSG_NOTICE([ ${allowed_plugin} plugin disabled])
+ done
else
- echo " Enable empathy plugin : NO"
+ AC_MSG_NOTICE([ No Totem plugins enabled])
fi
echo " "
Modified: trunk/src/nautilus-sendto-command.c
==============================================================================
--- trunk/src/nautilus-sendto-command.c (original)
+++ trunk/src/nautilus-sendto-command.c Wed Jan 7 11:26:57 2009
@@ -37,7 +37,7 @@
#define NAUTILUS_SENDTO_LAST_COMPRESS NAUTILUS_SENDTO_GCONF"/last_compress"
#define NAUTILUS_SENDTO_STATUS_LABEL_TIMEOUT_SECONDS 10
-#define UNINSTALLED_PLUGINDIR "plugins/.libs"
+#define UNINSTALLED_PLUGINDIR "plugins/sylpheed-claws"
#define UNINSTALLED_SOURCE "nautilus-sendto-command.c"
/* Options */
@@ -583,21 +583,14 @@
}
-static gboolean
-nautilus_sendto_plugin_init (void)
+static void
+nautilus_sendto_plugin_dir_process (const char *plugindir)
{
GDir *dir;
const char *item;
NstPlugin *p = NULL;
gboolean (*nst_init_plugin)(NstPlugin *p);
GError *err = NULL;
- const char *plugindir;
-
- if (g_file_test (UNINSTALLED_SOURCE, G_FILE_TEST_EXISTS) != FALSE &&
- g_file_test (UNINSTALLED_PLUGINDIR, G_FILE_TEST_IS_DIR) != FALSE)
- plugindir = UNINSTALLED_PLUGINDIR;
- else
- plugindir = PLUGINDIR;
dir = g_dir_open (plugindir, 0, &err);
@@ -605,7 +598,6 @@
g_warning ("Can't open the plugins dir: %s", err ? err->message : "No reason");
if (err)
g_error_free (err);
- return FALSE;
} else {
while ((item = g_dir_read_name(dir))) {
if (g_str_has_suffix (item, SOEXT)) {
@@ -639,6 +631,38 @@
}
g_dir_close (dir);
}
+}
+
+static gboolean
+nautilus_sendto_plugin_init (void)
+{
+ if (g_file_test (UNINSTALLED_PLUGINDIR, G_FILE_TEST_IS_DIR) != FALSE) {
+ /* Try to load the local plugins */
+ GError *err = NULL;
+ GDir *dir;
+ const char *item;
+
+ dir = g_dir_open ("plugins/", 0, &err);
+ if (dir == NULL) {
+ g_warning ("Can't open the plugins dir: %s", err ? err->message : "No reason");
+ if (err)
+ g_error_free (err);
+ return FALSE;
+ }
+ while ((item = g_dir_read_name(dir))) {
+ char *plugindir;
+
+ plugindir = g_strdup_printf ("plugins/%s/.libs/", item);
+ if (g_file_test (plugindir, G_FILE_TEST_IS_DIR) != FALSE)
+ nautilus_sendto_plugin_dir_process (plugindir);
+ g_free (plugindir);
+ }
+ g_dir_close (dir);
+ }
+
+ if (g_list_length (plugin_list) == 0)
+ nautilus_sendto_plugin_dir_process (PLUGINDIR);
+
return g_list_length (plugin_list) != 0;
}
Modified: trunk/src/plugins/Makefile.am
==============================================================================
--- trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/Makefile.am Wed Jan 7 11:26:57 2009
@@ -1,155 +1,3 @@
-plugindir = $(libdir)/nautilus-sendto/plugins
-
-INCLUDES = \
- -DDATADIR=\"$(datadir)\" \
- -DICONDIR=\"$(icondir)\" \
- -DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -DGLADEDIR=\""$(gladedir)"\" \
- $(NAUTILUS_SENDTO_CFLAGS) \
- $(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
-
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
+SUBDIRS = $(PLUGINS)
+DIST_SUBDIRS = $(ALL_PLUGINS)
Copied: trunk/src/plugins/balsa/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/balsa/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,152 +4,15 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
- $(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
+ $(WARN_CFLAGS)
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
+plugin_LTLIBRARIES = libnstbalsa.la
libnstbalsa_la_SOURCES = balsa.c
libnstbalsa_la_LDFLAGS = -module -avoid-version
#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
-
Copied: trunk/src/plugins/balsa/balsa.c (from r375, /trunk/src/plugins/balsa.c)
==============================================================================
--- /trunk/src/plugins/balsa.c (original)
+++ trunk/src/plugins/balsa/balsa.c Wed Jan 7 11:26:57 2009
@@ -25,7 +25,7 @@
#include "config.h"
#include <glib/gi18n-lib.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
static GHashTable *hash = NULL;
Copied: trunk/src/plugins/bluetooth/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/bluetooth/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,112 +4,15 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
- $(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
$(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
$(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
-
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
+ $(WARN_CFLAGS)
+
+plugin_LTLIBRARIES = libnstbluetooth.la
bluetooth-marshal.h: bluetooth-marshal.list
$(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
@@ -122,34 +25,6 @@
libnstbluetooth_la_LDFLAGS = -module -avoid-version
libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
+EXTRA_DIST = bluetooth-marshal.list
+CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c
Copied: trunk/src/plugins/bluetooth/bluetooth.c (from r375, /trunk/src/plugins/bluetooth.c)
==============================================================================
--- /trunk/src/plugins/bluetooth.c (original)
+++ trunk/src/plugins/bluetooth/bluetooth.c Wed Jan 7 11:26:57 2009
@@ -29,7 +29,7 @@
#include <glib/gi18n-lib.h>
#include <gconf/gconf-client.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
#define OBEX_FILETRANS_SVCLASS_ID_STR "0x1106"
#define LAST_OBEX_DEVICE "/desktop/gnome/nautilus-sendto/last_obex_device"
Copied: trunk/src/plugins/empathy/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/empathy/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,152 +4,16 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
- $(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
$(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
+ $(EMPATHY_CFLAGS)
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
+plugin_LTLIBRARIES = libnstempathy.la
libnstempathy_la_SOURCES = empathy.c
libnstempathy_la_LDFLAGS = -module -avoid-version
libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
-
Copied: trunk/src/plugins/empathy/empathy.c (from r375, /trunk/src/plugins/empathy.c)
==============================================================================
--- /trunk/src/plugins/empathy.c (original)
+++ trunk/src/plugins/empathy/empathy.c Wed Jan 7 11:26:57 2009
@@ -33,7 +33,7 @@
#include <libempathy-gtk/empathy-contact-list-store.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
static EmpathyContactManager *manager = NULL;
static MissionControl *mc = NULL;
Copied: trunk/src/plugins/evolution/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/evolution/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,85 +4,12 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
$(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
-
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
+ $(WARN_CFLAGS)
MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
BUILT_SOURCES = $(MARSHALFILES)
@@ -93,63 +20,16 @@
( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
+CLADIR = $(srcdir)/../../../../contact-lookup-applet/src/
regenerate-built-sources:
EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
+plugin_LTLIBRARIES = libnstevolution.la
libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
libnstevolution_la_LDFLAGS = -module -avoid-version
libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
+EXTRA_DIST = $(CLA_FILES)
+CLEANFILES = econtactentry-marshal.c econtactentry-marshal.h
Copied: trunk/src/plugins/evolution/evolution.c (from r375, /trunk/src/plugins/evolution.c)
==============================================================================
--- /trunk/src/plugins/evolution.c (original)
+++ trunk/src/plugins/evolution/evolution.c Wed Jan 7 11:26:57 2009
@@ -26,7 +26,7 @@
#include <e-contact-entry.h>
#include <glib/gi18n-lib.h>
#include <string.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
#define GCONF_COMPLETION "/apps/evolution/addressbook"
#define GCONF_COMPLETION_SOURCES GCONF_COMPLETION "/sources"
Copied: trunk/src/plugins/gaim/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/gaim/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,152 +4,17 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
$(NST_EBOOK_CFLAGS) \
$(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
+ $(WARN_CFLAGS)
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
+plugin_LTLIBRARIES = libnstgaim.la
libnstgaim_la_SOURCES = gaim.c
libnstgaim_la_LDFLAGS = -module -avoid-version
libnstgaim_la_LIBADD = $(GAIM_LIBS)
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
-
Copied: trunk/src/plugins/gaim/gaim.c (from r375, /trunk/src/plugins/gaim.c)
==============================================================================
--- /trunk/src/plugins/gaim.c (original)
+++ trunk/src/plugins/gaim/gaim.c Wed Jan 7 11:26:57 2009
@@ -24,7 +24,7 @@
#include "config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
static GList *contact_list;
static gchar *blist_online;
Copied: trunk/src/plugins/gajim/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/gajim/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,152 +4,15 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
- $(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
+ $(WARN_CFLAGS)
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
+plugin_LTLIBRARIES = libnstgajim.la
libnstgajim_la_SOURCES = gajim.c
libnstgajim_la_LDFLAGS = -module -avoid-version
libnstgajim_la_LIBADD = $(DBUS_LIBS)
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
-
Copied: trunk/src/plugins/gajim/gajim.c (from r375, /trunk/src/plugins/gajim.c)
==============================================================================
--- /trunk/src/plugins/gajim.c (original)
+++ trunk/src/plugins/gajim/gajim.c Wed Jan 7 11:26:57 2009
@@ -26,7 +26,7 @@
#include <glib/gi18n-lib.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
#define OBJ_PATH "/org/gajim/dbus/RemoteObject"
#define INTERFACE "org.gajim.dbus.RemoteInterface"
Copied: trunk/src/plugins/nautilus-burn/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/nautilus-burn/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,152 +4,16 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
- $(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
$(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
$(GIO_CFLAGS)
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
+plugin_LTLIBRARIES = libnstburn.la
libnstburn_la_SOURCES = nautilus-burn.c
libnstburn_la_LDFLAGS = -module -avoid-version
libnstburn_la_LIBADD = $(GIO_LIBS)
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
-
Copied: trunk/src/plugins/nautilus-burn/nautilus-burn.c (from r377, /trunk/src/plugins/nautilus-burn.c)
==============================================================================
--- /trunk/src/plugins/nautilus-burn.c (original)
+++ trunk/src/plugins/nautilus-burn/nautilus-burn.c Wed Jan 7 11:26:57 2009
@@ -24,7 +24,7 @@
#include "config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
#define COMBOBOX_OPTION_EXISTING_DVD 0
#define COMBOBOX_OPTION_NEW_DVD 1
Copied: trunk/src/plugins/pidgin/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/pidgin/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,152 +4,17 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
$(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
$(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
+ $(WARN_CFLAGS)
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
+plugin_LTLIBRARIES = libnstpidgin.la
libnstpidgin_la_SOURCES = pidgin.c
libnstpidgin_la_LDFLAGS = -module -avoid-version
libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
-
Copied: trunk/src/plugins/pidgin/pidgin.c (from r375, /trunk/src/plugins/pidgin.c)
==============================================================================
--- /trunk/src/plugins/pidgin.c (original)
+++ trunk/src/plugins/pidgin/pidgin.c Wed Jan 7 11:26:57 2009
@@ -24,7 +24,7 @@
#include "config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
static GList *contact_list;
static gchar *blist_online;
Copied: trunk/src/plugins/sylpheed-claws/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/sylpheed-claws/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,152 +4,15 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
- $(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
+ $(WARN_CFLAGS)
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
+plugin_LTLIBRARIES = libnstsylpheed.la
libnstsylpheed_la_SOURCES = sylpheed-claws.c
libnstsylpheed_la_LDFLAGS = -module -avoid-version
#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
-
Copied: trunk/src/plugins/sylpheed-claws/sylpheed-claws.c (from r375, /trunk/src/plugins/sylpheed-claws.c)
==============================================================================
--- /trunk/src/plugins/sylpheed-claws.c (original)
+++ trunk/src/plugins/sylpheed-claws/sylpheed-claws.c Wed Jan 7 11:26:57 2009
@@ -25,7 +25,7 @@
#include "config.h"
#include <glib/gi18n-lib.h>
#include <string.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
static GHashTable *hash = NULL;
Copied: trunk/src/plugins/thunderbird/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/thunderbird/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,152 +4,15 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
- $(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
- $(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
+ $(WARN_CFLAGS)
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
-
-libnstupnp_la_SOURCES = upnp.c
-libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(UPNP_LIBS)
-
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
+plugin_LTLIBRARIES = libnstthunderbird.la
libnstthunderbird_la_SOURCES = thunderbird.c
libnstthunderbird_la_LDFLAGS = -module -avoid-version
#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
-
Copied: trunk/src/plugins/thunderbird/thunderbird.c (from r375, /trunk/src/plugins/thunderbird.c)
==============================================================================
--- /trunk/src/plugins/thunderbird.c (original)
+++ trunk/src/plugins/thunderbird/thunderbird.c Wed Jan 7 11:26:57 2009
@@ -23,7 +23,7 @@
*/
#include "config.h"
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
#include <string.h>
#include <glib/gi18n-lib.h>
Copied: trunk/src/plugins/upnp/Makefile.am (from r377, /trunk/src/plugins/Makefile.am)
==============================================================================
--- /trunk/src/plugins/Makefile.am (original)
+++ trunk/src/plugins/upnp/Makefile.am Wed Jan 7 11:26:57 2009
@@ -4,152 +4,16 @@
-DDATADIR=\"$(datadir)\" \
-DICONDIR=\"$(icondir)\" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-I$(top_builddir) \
-DGLADEDIR=\""$(gladedir)"\" \
$(NAUTILUS_SENDTO_CFLAGS) \
- $(NST_EBOOK_CFLAGS) \
- $(GAIM_CFLAGS) \
- $(PIDGIN_CFLAGS) \
- $(BLUETOOTH_CFLAGS) \
$(UPNP_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS) \
- $(GIO_CFLAGS)
+ $(WARN_CFLAGS)
-if HAVE_GAIM
-GAIM_PLUGIN = libnstgaim.la
-else
-GAIM_PLUGIN =
-endif
-
-if HAVE_PIDGIN
-PIDGIN_PLUGIN = libnstpidgin.la
-else
-PIDGIN_PLUGIN =
-endif
-
-if HAVE_BLUETOOTH
-BLUETOOTH_PLUGIN = libnstbluetooth.la
-else
-BLUETOOTH_PLUGIN =
-endif
-
-if HAVE_BURN
-BURN_PLUGIN = libnstburn.la
-else
-BURN_PLUGIN =
-endif
-
-if HAVE_UPNP
-UPNP_PLUGIN = libnstupnp.la
-else
-UPNP_PLUGIN =
-endif
-
-if HAVE_EVOLUTION
-EVOLUTION_PLUGIN = libnstevolution.la
-else
-EVOLUTION_PLUGIN =
-endif
-
-if HAVE_BALSA
-BALSA_PLUGIN = libnstbalsa.la
-else
-BALSA_PLUGIN =
-endif
-
-if HAVE_SYLPHEED
-SYLPHEED_PLUGIN = libnstsylpheed.la
-else
-SYLPHEED_PLUGIN =
-endif
-
-if HAVE_THUNDERBIRD
-THUNDERBIRD_PLUGIN = libnstthunderbird.la
-else
-THUNDERBIRD_PLUGIN =
-endif
-
-if HAVE_GAJIM
-GAJIM_PLUGIN = libnstgajim.la
-else
-GAJIM_PLUGIN =
-endif
-
-if HAVE_EMPATHY
-EMPATHY_PLUGIN = libnstempathy.la
-else
-EMPATHY_PLUGIN =
-endif
-
-MARSHALFILES = econtactentry-marshal.c econtactentry-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-econtactentry-marshal.c: econtactentry-marshal.h
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header --body > econtactentry-marshal.c )
-econtactentry-marshal.h: econtactentry-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=econtactentry_marshal $(srcdir)/econtactentry-marshal.list --header > econtactentry-marshal.h )
-
-CLA_FILES = e-contact-entry.h e-contact-entry.c econtactentry-marshal.list
-CLADIR = $(srcdir)/../../../contact-lookup-applet/src/
-regenerate-built-sources:
- EGGFILES="$(CLA_FILES) econtactentry-marshal.list" EGGDIR="$(CLADIR)" $(srcdir)/update-from-egg.sh || true
-
-plugin_LTLIBRARIES = $(EVOLUTION_PLUGIN) $(GAIM_PLUGIN) $(PIDGIN_PLUGIN) $(BLUETOOTH_PLUGIN) $(UPNP_PLUGIN) $(BALSA_PLUGIN) $(SYLPHEED_PLUGIN) $(THUNDERBIRD_PLUGIN) $(GAJIM_PLUGIN) $(EMPATHY_PLUGIN) $(BURN_PLUGIN)
-
-libnstevolution_la_SOURCES = evolution.c $(CLA_FILES) $(MARSHALFILES)
-libnstevolution_la_LDFLAGS = -module -avoid-version
-libnstevolution_la_LIBADD = $(NST_EBOOK_LIBS)
-
-libnstgaim_la_SOURCES = gaim.c
-libnstgaim_la_LDFLAGS = -module -avoid-version
-libnstgaim_la_LIBADD = $(GAIM_LIBS)
-
-libnstpidgin_la_SOURCES = pidgin.c
-libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(PIDGIN_LIBS)
-
-bluetooth-marshal.h: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --header > $@
-
-bluetooth-marshal.c: bluetooth-marshal.list
- $(GLIB_GENMARSHAL) --prefix=nst_bluetooth_marshal $< --body > $@
-bluetooth.c: bluetooth-marshal.c bluetooth-marshal.h
-
-libnstbluetooth_la_SOURCES = bluetooth.c bluetooth-marshal.h bluetooth-marshal.c
-libnstbluetooth_la_LDFLAGS = -module -avoid-version
-libnstbluetooth_la_LIBADD = $(BLUETOOTH_LIBS)
-
-libnstburn_la_SOURCES = nautilus-burn.c
-libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(GIO_LIBS)
+plugin_LTLIBRARIES = libnstupnp.la
libnstupnp_la_SOURCES = upnp.c
libnstupnp_la_LDFLAGS = -module -avoid-version
libnstupnp_la_LIBADD = $(UPNP_LIBS)
-libnstbalsa_la_SOURCES = balsa.c
-libnstbalsa_la_LDFLAGS = -module -avoid-version
-#libnstbalsa_la_LIBADD = $(BALSA_LIBS)
-
-libnstsylpheed_la_SOURCES = sylpheed-claws.c
-libnstsylpheed_la_LDFLAGS = -module -avoid-version
-#libnstsylpheed_la_LIBADD = $(SYLPHEED_LIBS)
-
-libnstthunderbird_la_SOURCES = thunderbird.c
-libnstthunderbird_la_LDFLAGS = -module -avoid-version
-#libnstthunderbird_la_LIBADD = $(THUNDERBIRD_LIBS)
-
-libnstgajim_la_SOURCES = gajim.c
-libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(DBUS_LIBS)
-
-libnstempathy_la_SOURCES = empathy.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = $(EMPATHY_LIBS)
-
-EXTRA_DIST = bluetooth-marshal.list $(CLA_FILES)
-CLEANFILES = bluetooth-marshal.h bluetooth-marshal.c econtactentry-marshal.c econtactentry-marshal.h
-
Copied: trunk/src/plugins/upnp/upnp.c (from r375, /trunk/src/plugins/upnp.c)
==============================================================================
--- /trunk/src/plugins/upnp.c (original)
+++ trunk/src/plugins/upnp/upnp.c Wed Jan 7 11:26:57 2009
@@ -29,7 +29,7 @@
#include <glib/gi18n-lib.h>
#include <libgupnp-av/gupnp-av.h>
-#include "../nautilus-sendto-plugin.h"
+#include "nautilus-sendto-plugin.h"
#define MEDIA_SERVER "urn:schemas-upnp-org:device:MediaServer:*"
#define CDS "urn:schemas-upnp-org:service:ContentDirectory"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
