aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/reference/evolution-util/evolution-util-sections.txt4
-rw-r--r--doc/reference/evolution-util/evolution-util.types1
-rw-r--r--e-util/Makefile.am2
-rw-r--r--e-util/e-attachment-handler-sendto.c229
-rw-r--r--e-util/e-attachment-handler-sendto.h66
-rw-r--r--e-util/e-attachment-view.c2
-rw-r--r--e-util/e-util.h1
-rw-r--r--po/POTFILES.in1
8 files changed, 0 insertions, 306 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt
index 8e0c917638..a7185c023e 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -351,7 +351,6 @@ EAttachmentDialogPrivate
<TITLE>EAttachmentHandler</TITLE>
EAttachmentHandler
EAttachmentHandlerImage
-EAttachmentHandlerSendto
e_attachment_handler_get_view
e_attachment_handler_get_drag_actions
e_attachment_handler_get_target_table
@@ -376,14 +375,11 @@ E_IS_ATTACHMENT_HANDLER_SENDTO_CLASS
E_ATTACHMENT_HANDLER_SENDTO_GET_CLASS
EAttachmentHandlerClass
EAttachmentHandlerImageClass
-EAttachmentHandlerSendtoClass
e_attachment_handler_get_type
e_attachment_handler_image_get_type
-e_attachment_handler_sendto_get_type
<SUBSECTION Private>
EAttachmentHandlerPrivate
EAttachmentHandlerImagePrivate
-EAttachmentHandlerSendtoPrivate
</SECTION>
<SECTION>
diff --git a/doc/reference/evolution-util/evolution-util.types b/doc/reference/evolution-util/evolution-util.types
index ac366915b4..4c44b4f69d 100644
--- a/doc/reference/evolution-util/evolution-util.types
+++ b/doc/reference/evolution-util/evolution-util.types
@@ -15,7 +15,6 @@ e_attachment_dialog_get_type
e_attachment_get_type
e_attachment_handler_get_type
e_attachment_handler_image_get_type
-e_attachment_handler_sendto_get_type
e_attachment_icon_view_get_type
e_attachment_paned_get_type
e_attachment_store_get_type
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 1f9644892c..b703ba0702 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -118,7 +118,6 @@ evolution_util_include_HEADERS = \
e-attachment-button.h \
e-attachment-dialog.h \
e-attachment-handler-image.h \
- e-attachment-handler-sendto.h \
e-attachment-handler.h \
e-attachment-icon-view.h \
e-attachment-paned.h \
@@ -357,7 +356,6 @@ libevolution_util_la_SOURCES = \
e-attachment-button.c \
e-attachment-dialog.c \
e-attachment-handler-image.c \
- e-attachment-handler-sendto.c \
e-attachment-handler.c \
e-attachment-icon-view.c \
e-attachment-paned.c \
diff --git a/e-util/e-attachment-handler-sendto.c b/e-util/e-attachment-handler-sendto.c
deleted file mode 100644
index f0fe698713..0000000000
--- a/e-util/e-attachment-handler-sendto.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * e-attachment-handler-sendto.c
- *
- * Copyright (C) 2009 Matthew Barnes
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-attachment-handler-sendto.h"
-
-#include <errno.h>
-
-#include <glib/gi18n-lib.h>
-
-static const gchar *ui =
-"<ui>"
-" <popup name='context'>"
-" <placeholder name='custom-actions'>"
-" <menuitem action='sendto'/>"
-" </placeholder>"
-" </popup>"
-"</ui>";
-
-G_DEFINE_TYPE (
- EAttachmentHandlerSendto,
- e_attachment_handler_sendto,
- E_TYPE_ATTACHMENT_HANDLER)
-
-static void
-sendto_save_finished_cb (EAttachment *attachment,
- GAsyncResult *result,
- EAttachmentHandler *handler)
-{
- EAttachmentView *view;
- EAttachmentStore *store;
- GtkWidget *dialog;
- gchar **uris;
- gpointer parent;
- gchar *arguments;
- gchar *command_line;
- guint n_uris = 1;
- GError *error = NULL;
-
- view = e_attachment_handler_get_view (handler);
- store = e_attachment_view_get_store (view);
-
- uris = e_attachment_store_get_uris_finish (store, result, &error);
-
- if (uris != NULL)
- n_uris = g_strv_length (uris);
-
- if (error != NULL)
- goto error;
-
- arguments = g_strjoinv (" ", uris);
- command_line = g_strdup_printf ("nautilus-sendto %s", arguments);
-
- g_message ("Command: %s", command_line);
- g_spawn_command_line_async (command_line, &error);
-
- g_free (command_line);
- g_free (arguments);
-
- if (error != NULL)
- goto error;
-
- goto exit;
-
-error:
- parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
- parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
-
- dialog = gtk_message_dialog_new_with_markup (
- parent, GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
- "<big><b>%s</b></big>",
- ngettext ("Could not send attachment",
- "Could not send attachments", n_uris));
-
- gtk_message_dialog_format_secondary_text (
- GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
-
- gtk_dialog_run (GTK_DIALOG (dialog));
-
- gtk_widget_destroy (dialog);
- g_error_free (error);
-
-exit:
- g_object_unref (handler);
- g_strfreev (uris);
-}
-
-static void
-action_sendto_cb (GtkAction *action,
- EAttachmentHandler *handler)
-{
- EAttachmentView *view;
- EAttachmentStore *store;
- GList *selected;
-
- view = e_attachment_handler_get_view (handler);
- store = e_attachment_view_get_store (view);
-
- selected = e_attachment_view_get_selected_attachments (view);
- g_return_if_fail (selected != NULL);
-
- e_attachment_store_get_uris_async (
- store, selected, (GAsyncReadyCallback)
- sendto_save_finished_cb, g_object_ref (handler));
-
- g_list_foreach (selected, (GFunc) g_object_unref, NULL);
- g_list_free (selected);
-}
-
-static GtkActionEntry standard_entries[] = {
-
- { "sendto",
- "document-send",
- N_("_Send To..."),
- NULL,
- N_("Send the selected attachments somewhere"),
- G_CALLBACK (action_sendto_cb) }
-};
-
-static void
-attachment_handler_sendto_update_actions_cb (EAttachmentView *view,
- EAttachmentHandler *handler)
-{
- GtkActionGroup *action_group;
- GList *selected, *iter;
- gboolean visible = FALSE;
- gchar *program;
-
- program = g_find_program_in_path ("nautilus-sendto");
- selected = e_attachment_view_get_selected_attachments (view);
-
- if (program == NULL || selected == NULL)
- goto exit;
-
- /* Make sure no file transfers are in progress. */
- for (iter = selected; iter != NULL; iter = iter->next) {
- EAttachment *attachment = iter->data;
-
- if (e_attachment_get_loading (attachment))
- goto exit;
-
- if (e_attachment_get_saving (attachment))
- goto exit;
- }
-
- visible = TRUE;
-
-exit:
- action_group = e_attachment_view_get_action_group (view, "sendto");
- gtk_action_group_set_visible (action_group, visible);
-
- g_list_foreach (selected, (GFunc) g_object_unref, NULL);
- g_list_free (selected);
-
- g_free (program);
-}
-
-static void
-attachment_handler_sendto_constructed (GObject *object)
-{
- EAttachmentHandler *handler;
- EAttachmentView *view;
- GtkActionGroup *action_group;
- GtkUIManager *ui_manager;
- GError *error = NULL;
-
- handler = E_ATTACHMENT_HANDLER (object);
-
- /* Chain up to parent's constructed() method. */
- G_OBJECT_CLASS (e_attachment_handler_sendto_parent_class)->constructed (object);
-
- view = e_attachment_handler_get_view (handler);
- ui_manager = e_attachment_view_get_ui_manager (view);
-
- action_group = gtk_action_group_new ("sendto");
- gtk_action_group_set_translation_domain (
- action_group, GETTEXT_PACKAGE);
- gtk_action_group_add_actions (
- action_group, standard_entries,
- G_N_ELEMENTS (standard_entries), object);
- gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
-
- gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
-
- if (error != NULL) {
- g_warning ("%s", error->message);
- g_error_free (error);
- }
-
- g_signal_connect (
- view, "update-actions",
- G_CALLBACK (attachment_handler_sendto_update_actions_cb),
- object);
-}
-
-static void
-e_attachment_handler_sendto_class_init (EAttachmentHandlerSendtoClass *class)
-{
- GObjectClass *object_class;
-
- object_class = G_OBJECT_CLASS (class);
- object_class->constructed = attachment_handler_sendto_constructed;
-}
-
-static void
-e_attachment_handler_sendto_init (EAttachmentHandlerSendto *handler)
-{
-}
diff --git a/e-util/e-attachment-handler-sendto.h b/e-util/e-attachment-handler-sendto.h
deleted file mode 100644
index ea0fc02827..0000000000
--- a/e-util/e-attachment-handler-sendto.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * e-attachment-handler-sendto.h
- *
- * Copyright (C) 2009 Matthew Barnes
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)
-#error "Only <e-util/e-util.h> should be included directly."
-#endif
-
-#ifndef E_ATTACHMENT_HANDLER_SENDTO_H
-#define E_ATTACHMENT_HANDLER_SENDTO_H
-
-#include <e-util/e-attachment-handler.h>
-
-/* Standard GObject macros */
-#define E_TYPE_ATTACHMENT_HANDLER_SENDTO \
- (e_attachment_handler_sendto_get_type ())
-#define E_ATTACHMENT_HANDLER_SENDTO(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST \
- ((obj), E_TYPE_ATTACHMENT_HANDLER_SENDTO, EAttachmentHandlerSendto))
-#define E_ATTACHMENT_HANDLER_SENDTO_CLASS(cls) \
- (G_TYPE_CHECK_CLASS_CAST \
- ((cls), E_TYPE_ATTACHMENT_HANDLER_SENDTO, EAttachmentHandlerSendtoClass))
-#define E_IS_ATTACHMENT_HANDLER_SENDTO(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE \
- ((obj), E_TYPE_ATTACHMENT_HANDLER_SENDTO))
-#define E_IS_ATTACHMENT_HANDLER_SENDTO_CLASS(cls) \
- (G_TYPE_CHECK_CLASS_TYPE \
- ((cls), E_TYPE_ATTACHMENT_HANDLER_SENDTO))
-#define E_ATTACHMENT_HANDLER_SENDTO_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS \
- ((obj), E_TYPE_ATTACHMENT_HANDLER_SENDTO, EAttachmentHandlerSendtoClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EAttachmentHandlerSendto EAttachmentHandlerSendto;
-typedef struct _EAttachmentHandlerSendtoClass EAttachmentHandlerSendtoClass;
-
-struct _EAttachmentHandlerSendto {
- EAttachmentHandler parent;
-};
-
-struct _EAttachmentHandlerSendtoClass {
- EAttachmentHandlerClass parent_class;
-};
-
-GType e_attachment_handler_sendto_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* E_ATTACHMENT_HANDLER_SENDTO_H */
diff --git a/e-util/e-attachment-view.c b/e-util/e-attachment-view.c
index 1fb868ed8b..a287f8e430 100644
--- a/e-util/e-attachment-view.c
+++ b/e-util/e-attachment-view.c
@@ -30,7 +30,6 @@
#include "e-attachment-dialog.h"
#include "e-attachment-handler-image.h"
-#include "e-attachment-handler-sendto.h"
#include "e-misc-utils.h"
#include "e-selection.h"
@@ -870,7 +869,6 @@ e_attachment_view_default_init (EAttachmentViewInterface *interface)
/* Register known handler types. */
g_type_ensure (E_TYPE_ATTACHMENT_HANDLER_IMAGE);
- g_type_ensure (E_TYPE_ATTACHMENT_HANDLER_SENDTO);
}
void
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 0299c968d3..9fbced42a6 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -36,7 +36,6 @@
#include <e-util/e-attachment-button.h>
#include <e-util/e-attachment-dialog.h>
#include <e-util/e-attachment-handler-image.h>
-#include <e-util/e-attachment-handler-sendto.h>
#include <e-util/e-attachment-handler.h>
#include <e-util/e-attachment-icon-view.h>
#include <e-util/e-attachment-paned.h>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3f5364aa9d..9f18248d31 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -183,7 +183,6 @@ e-util/e-alert-dialog.c
e-util/e-attachment-bar.c
e-util/e-attachment-dialog.c
e-util/e-attachment-handler-image.c
-e-util/e-attachment-handler-sendto.c
e-util/e-attachment-icon-view.c
e-util/e-attachment-paned.c
e-util/e-attachment-store.c