aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-calendar-view.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:16:00 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:16:00 +0800
commitfaf1c14c11f3e6026f786e9587715c10b13c723e (patch)
tree3dbf5816532cbea2510b4438c7c40d91fc426d3a /calendar/gui/e-calendar-view.c
parent86fdd3a1cba7c156cfa127322e258f5636b45a99 (diff)
downloadgsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.gz
gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.zst
gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.zip
Manual conflict resolution
Diffstat (limited to 'calendar/gui/e-calendar-view.c')
-rw-r--r--calendar/gui/e-calendar-view.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index ddd08556fa..848a54ffa3 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -906,35 +906,6 @@ clipboard_paste_received_cb (GtkClipboard *clipboard,
g_object_unref (data);
}
-static void
-e_calendar_view_paste_text (ECalendarView *cal_view)
-{
- g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
- if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text)
- E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text (cal_view);
-}
-
-static void
-clipboard_paste_received_cb (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- gpointer data)
-{
- if (gtk_clipboard_wait_is_text_available (clipboard)) {
- e_calendar_view_paste_text (E_CALENDAR_VIEW (data));
- } else {
- GdkAtom type = selection_data->type;
- if (type == gdk_atom_intern (target_types[TARGET_TYPE_VCALENDAR].target, TRUE)) {
- gchar *result = NULL;
- result = g_strndup ((const gchar *) selection_data->data,
- selection_data->length);
- clipboard_get_calendar_data (E_CALENDAR_VIEW (data), result);
- g_free (result);
- }
- }
- g_object_unref (data);
-}
-
void
e_calendar_view_paste_clipboard (ECalendarView *cal_view)
{