aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-22 18:39:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-22 18:39:17 +0800
commit0272da48071b607da189fb571e20cde8a488641b (patch)
tree8003a81bc4d3a1f90c243de636dde64262dcbb08
parente5648bccea44c87c00f72f7501048810276a6d27 (diff)
downloadgsoc2013-empathy-0272da48071b607da189fb571e20cde8a488641b.tar
gsoc2013-empathy-0272da48071b607da189fb571e20cde8a488641b.tar.gz
gsoc2013-empathy-0272da48071b607da189fb571e20cde8a488641b.tar.bz2
gsoc2013-empathy-0272da48071b607da189fb571e20cde8a488641b.tar.lz
gsoc2013-empathy-0272da48071b607da189fb571e20cde8a488641b.tar.xz
gsoc2013-empathy-0272da48071b607da189fb571e20cde8a488641b.tar.zst
gsoc2013-empathy-0272da48071b607da189fb571e20cde8a488641b.zip
remove nautilus-sendto plugin
Latest versions of nautilus-sendto doesn't support plugins any more.
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac26
-rw-r--r--nautilus-sendto-plugin/Makefile.am23
-rw-r--r--nautilus-sendto-plugin/empathy-nautilus-sendto.c306
-rw-r--r--po/POTFILES.in2
5 files changed, 1 insertions, 363 deletions
diff --git a/Makefile.am b/Makefile.am
index 28e6374d0..ae9e4dc5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,11 @@
MY_SUBDIRS = tools extensions po data telepathy-account-widgets libempathy libempathy-gtk src help tests
-NST_SUBDIRS = nautilus-sendto-plugin
GOA_SUBDIRS = goa-mc-plugin
UOA_SUBDIRS = ubuntu-online-accounts
-DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
+DIST_SUBDIRS = $(MY_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
SUBDIRS = $(MY_SUBDIRS)
-if HAVE_NST
-SUBDIRS += $(NST_SUBDIRS)
-endif
-
if HAVE_GOA
SUBDIRS += $(GOA_SUBDIRS)
endif
diff --git a/configure.ac b/configure.ac
index c5f1a709c..2ac9e5822 100644
--- a/configure.ac
+++ b/configure.ac
@@ -446,31 +446,6 @@ AC_SUBST(GEOCODE_CFLAGS)
AC_SUBST(GEOCODE_LIBS)
# -----------------------------------------------------------
-# nautilus-sendto
-# -----------------------------------------------------------
-AC_ARG_ENABLE(nautilus-sendto,
- AS_HELP_STRING([--enable-nautilus-sendto=@<:@no/yes/auto@:>@],
- [build nautilus-sendto plugin]), ,
- enable_nautilus_sendto=auto)
-
-if test "x$enable_nautilus_sendto" != "xno"; then
- PKG_CHECK_MODULES(NST,
- [
- nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
- ], have_nst="yes", have_nst="no")
-else
- have_nst=no
-fi
-
-if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
- AC_MSG_ERROR([Could not find nautilus-sendto dependencies:
-
-$NST_PKG_ERRORS])
-fi
-
-AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
-
-# -----------------------------------------------------------
# goa-mc-plugin
# -----------------------------------------------------------
AC_ARG_ENABLE(goa,
@@ -624,7 +599,6 @@ AC_CONFIG_FILES([
libempathy/Makefile
libempathy-gtk/Makefile
src/Makefile
- nautilus-sendto-plugin/Makefile
goa-mc-plugin/Makefile
ubuntu-online-accounts/Makefile
ubuntu-online-accounts/mc-plugin/Makefile
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
deleted file mode 100644
index 347988219..000000000
--- a/nautilus-sendto-plugin/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-plugindir = $(libdir)/nautilus-sendto/plugins
-
-AM_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir)/libempathy \
- -I$(top_srcdir)/libempathy-gtk \
- -DLOCALEDIR=\""$(datadir)/locale"\" \
- $(NST_CFLAGS) \
- $(WARN_CFLAGS) \
- $(ERROR_CFLAGS) \
- $(DISABLE_DEPRECATED) \
- $(TPAW_CFLAGS) \
- $(EMPATHY_CFLAGS)
-
-plugin_LTLIBRARIES = libnstempathy.la
-
-libnstempathy_la_SOURCES = empathy-nautilus-sendto.c
-libnstempathy_la_LDFLAGS = -module -avoid-version
-libnstempathy_la_LIBADD = \
- $(NST_LIBS) \
- $(TPAW_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
deleted file mode 100644
index 77947f413..000000000
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (C) 2008, 2009 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more av.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * Authors: Jonny Lamb <jonny.lamb@collabora.co.uk>
- * Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-
-#include "empathy-debug.h"
-#include "empathy-ft-factory.h"
-
-#include "empathy-roster-model-manager.h"
-#include "empathy-ui-utils.h"
-#include "empathy-roster-view.h"
-#include "empathy-roster-contact.h"
-
-
-#include "nautilus-sendto-plugin.h"
-
-static EmpathyFTFactory *factory = NULL;
-static guint transfers = 0;
-
-#define BOX_DATA_KEY "roster_view"
-
-static gboolean destroy (NstPlugin *plugin);
-
-static gboolean
-init (NstPlugin *plugin)
-{
- g_print ("Init %s plugin\n", plugin->info->id);
-
- empathy_gtk_init ();
-
- return TRUE;
-}
-
-static EmpathyContact *
-dup_contact_from_individual (FolksIndividual *individual)
-{
- EmpathyContact *contact;
- gboolean can_do_action;
-
- if (individual == NULL)
- return NULL;
-
- contact = empathy_contact_dup_best_for_action (individual,
- EMPATHY_ACTION_SEND_FILE);
- if (contact == NULL)
- return NULL;
-
- can_do_action = empathy_contact_can_do_action (contact,
- EMPATHY_ACTION_SEND_FILE);
-
- if (!can_do_action)
- {
- /* If contact can't do FT we don't care about him */
- g_object_unref (contact);
- return NULL;
- }
-
- return contact;
-}
-
-static gboolean
-filter_individual (GtkListBoxRow *child,
- gpointer user_data)
-{
- FolksIndividual *individual;
- EmpathyContact *contact;
-
- if (!EMPATHY_IS_ROSTER_CONTACT (child))
- return FALSE;
-
- individual = empathy_roster_contact_get_individual (EMPATHY_ROSTER_CONTACT (child));
-
- contact = dup_contact_from_individual (individual);
- if (contact == NULL)
- return FALSE;
-
- g_object_unref (contact);
- return TRUE;
-}
-
-static GtkWidget *
-get_contacts_widget (NstPlugin *plugin)
-{
- GtkWidget *roster_view, *box, *scrolled;
- EmpathyIndividualManager *mgr;
- EmpathyRosterModel *model;
-
- box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-
- mgr = empathy_individual_manager_dup_singleton ();
- model = EMPATHY_ROSTER_MODEL (empathy_roster_model_manager_new (mgr));
- roster_view = empathy_roster_view_new (model);
-
- g_object_unref (model);
-
- scrolled = gtk_scrolled_window_new (NULL, NULL);
-
- g_object_unref (mgr);
-
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_list_box_set_filter_func (GTK_LIST_BOX (roster_view), filter_individual,
- roster_view, NULL);
- gtk_container_add (GTK_CONTAINER (scrolled), roster_view);
-
- gtk_box_pack_start (GTK_BOX (box), scrolled, TRUE, TRUE, 0);
-
- gtk_widget_set_size_request (box, -1, 300);
- gtk_widget_show (roster_view);
- gtk_widget_show (scrolled);
- gtk_widget_show (box);
-
- g_object_set_data (G_OBJECT (box), BOX_DATA_KEY, roster_view);
-
- return box;
-}
-
-static EmpathyContact *
-get_selected_contact (GtkWidget *widget)
-{
- EmpathyRosterView *roster_view;
- FolksIndividual *individual;
- EmpathyContact *contact;
-
- roster_view = g_object_get_data (G_OBJECT (widget), BOX_DATA_KEY);
- individual = empathy_roster_view_get_selected_individual (roster_view);
-
- if (individual == NULL)
- return NULL;
-
- contact = dup_contact_from_individual (individual);
-
- g_object_unref (individual);
- return contact;
-}
-
-static gboolean
-validate_destination (NstPlugin *plugin,
- GtkWidget *contact_widget,
- gchar **error)
-{
- EmpathyContact *contact = NULL;
-
- contact = get_selected_contact (contact_widget);
-
- if (contact == NULL)
- return FALSE;
-
- g_object_unref (contact);
-
- return TRUE;
-}
-
-static void
-quit (void)
-{
- if (--transfers > 0)
- return;
-
- destroy (NULL);
- gtk_main_quit ();
-}
-
-static void
-transfer_done_cb (EmpathyFTHandler *handler,
- TpFileTransferChannel *channel,
- NstPlugin *plugin)
-{
- quit ();
-}
-
-static void
-transfer_error_cb (EmpathyFTHandler *handler,
- GError *error,
- NstPlugin *plugin)
-{
- quit ();
-}
-
-static void
-error_dialog_cb (GtkDialog *dialog,
- gint arg,
- gpointer user_data)
-{
- gtk_widget_destroy (GTK_WIDGET (dialog));
- quit ();
-}
-
-static void
-handler_ready_cb (EmpathyFTFactory *fact,
- EmpathyFTHandler *handler,
- GError *error,
- NstPlugin *plugin)
-{
- if (error != NULL)
- {
- GtkWidget *dialog;
- dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE, "%s",
- error->message ? error->message : _("No error message"));
-
- g_signal_connect (dialog, "response", G_CALLBACK (error_dialog_cb), NULL);
- gtk_widget_show (dialog);
- }
- else
- {
- g_signal_connect (handler, "transfer-done",
- G_CALLBACK (transfer_done_cb), plugin);
- g_signal_connect (handler, "transfer-error",
- G_CALLBACK (transfer_error_cb), plugin);
-
- empathy_ft_handler_start_transfer (handler);
- }
-}
-
-static gboolean
-send_files (NstPlugin *plugin,
- GtkWidget *contact_widget,
- GList *file_list)
-{
- EmpathyContact *contact;
- GList *l;
-
- contact = get_selected_contact (contact_widget);
-
- if (contact == NULL)
- return FALSE;
-
- factory = empathy_ft_factory_dup_singleton ();
-
- g_signal_connect (factory, "new-ft-handler",
- G_CALLBACK (handler_ready_cb), plugin);
-
- for (l = file_list; l; l = l->next)
- {
- gchar *path = l->data;
- GFile *file;
-
- file = g_file_new_for_uri (path);
-
- ++transfers;
-
- empathy_ft_factory_new_transfer_outgoing (factory,
- contact, file, empathy_get_current_action_time ());
-
- g_object_unref (file);
- }
-
- g_object_unref (contact);
-
- if (transfers == 0)
- {
- destroy (NULL);
- return TRUE;
- }
-
- return FALSE;
-}
-
-static gboolean
-destroy (NstPlugin *plugin)
-{
- if (factory)
- g_object_unref (factory);
-
- return TRUE;
-}
-
-static
-NstPluginInfo plugin_info = {
- "empathy",
- "empathy",
- N_("Instant Message (Empathy)"),
- GETTEXT_PACKAGE,
- NAUTILUS_CAPS_NONE,
- init,
- get_contacts_widget,
- validate_destination,
- send_files,
- destroy
-};
-
-NST_INIT_PLUGIN (plugin_info)
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d45cfc979..1521823ad 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -52,8 +52,6 @@ libempathy-gtk/empathy-webkit-utils.c
libempathy-gtk/empathy-roster-model.h
libempathy-gtk/empathy-roster-contact.c
-nautilus-sendto-plugin/empathy-nautilus-sendto.c
-
src/empathy-about-dialog.c
src/empathy-accounts.c
src/empathy-accounts-dialog.c