diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-05 16:57:39 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-27 20:39:52 +0800 |
| commit | 410d7f6e391a3b88961fd4002a6048ca79640384 (patch) | |
| tree | f1dea33836f64b6f1710fe9b53a4b1fe51d9cf22 | |
| parent | 973ebccf5c1ba3664677a8c5d1bdfe52009f82be (diff) | |
| download | gsoc2013-empathy-410d7f6e391a3b88961fd4002a6048ca79640384.tar gsoc2013-empathy-410d7f6e391a3b88961fd4002a6048ca79640384.tar.gz gsoc2013-empathy-410d7f6e391a3b88961fd4002a6048ca79640384.tar.bz2 gsoc2013-empathy-410d7f6e391a3b88961fd4002a6048ca79640384.tar.lz gsoc2013-empathy-410d7f6e391a3b88961fd4002a6048ca79640384.tar.xz gsoc2013-empathy-410d7f6e391a3b88961fd4002a6048ca79640384.tar.zst gsoc2013-empathy-410d7f6e391a3b88961fd4002a6048ca79640384.zip | |
nautilus-sendto-plugin: depend on 2.31.7 when building with GTK+2
This version will have the same API that 2.90.0 so we don't have to stay
compatible with the old API.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | nautilus-sendto-plugin/empathy-nautilus-sendto.c | 18 |
2 files changed, 1 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 525272e86..48dd5ea48 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ GEOCLUE_REQUIRED=0.11 ISO_CODES_REQUIRED=0.35 LIBCHAMPLAIN_GTK_REQUIRED=0.7.1 LIBCHAMPLAIN_REQUIRED=0.7.1 -NAUTILUS_SENDTO_REQUIRED=2.28.1 +NAUTILUS_SENDTO_REQUIRED=2.31.7 NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 WEBKIT_REQUIRED=1.1.15 @@ -466,8 +466,6 @@ if test "x$enable_nautilus_sendto" != "xno"; then nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED nautilus-sendto < 2.90.0 ], have_nst="yes", have_nst="no") - - AC_DEFINE(HAVE_OLD_NST, [], [Legacy compat mode with old nautilus-sendto] ) else PKG_CHECK_MODULES(NST, [ diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c index 346624aff..c480e02f7 100644 --- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c +++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c @@ -235,15 +235,12 @@ destroy (NstPlugin *plugin) return TRUE; } -/* Legacy from old versions (< 2.90.0) */ -#ifdef HAVE_OLD_NST static NstPluginInfo plugin_info = { "im", "empathy", N_("Instant Message (Empathy)"), GETTEXT_PACKAGE, - TRUE, NAUTILUS_CAPS_NONE, init, get_contacts_widget, @@ -251,21 +248,6 @@ NstPluginInfo plugin_info = { send_files, destroy }; -#else -static -NstPluginInfo plugin_info = { - "im", - "empathy", - N_("Instant Message (Empathy)"), - GETTEXT_PACKAGE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, - validate_destination, - send_files, - destroy -}; -#endif NST_INIT_PLUGIN (plugin_info) |