From bcb2123941c46fb31a978e04ab6c6910b0483438 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 28 Jan 2010 16:24:17 -0500
Subject: Revert "Without this evo 2.28.2 will not link/run at all"

This reverts commit 013ce5b70e85d6c9008cebd1d5efbe87a539d445.

Looks like it was meant for gnome-2-28 branch.  In any case it contains
unresolved merge conflicts which breaks compilation.
---
 calendar/gui/cal-editor-utils.c | 10 ----------
 calendar/gui/e-calendar-view.c  |  9 ---------
 calendar/gui/e-memo-table.c     | 40 ----------------------------------------
 3 files changed, 59 deletions(-)

(limited to 'calendar/gui')

diff --git a/calendar/gui/cal-editor-utils.c b/calendar/gui/cal-editor-utils.c
index d4389aa928..4258e2ce01 100644
--- a/calendar/gui/cal-editor-utils.c
+++ b/calendar/gui/cal-editor-utils.c
@@ -30,16 +30,6 @@
 #include "dialogs/task-editor.h"
 #include "dialogs/memo-editor.h"
 
-<<<<<<< HEAD
-=======
-#ifdef G_OS_WIN32
-const ECompEditorRegistry * const comp_editor_get_registry();
-#define comp_editor_registry comp_editor_get_registry()
-#else
-extern ECompEditorRegistry *comp_editor_registry;
-#endif
-
->>>>>>> 90cd900... Without this evo 2.28.2 will not link/run at all
 /**
  * open_component_editor:
  * @client: Already opened #ECal, where to store the component
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index e80d894a3b..fd8650edad 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -75,18 +75,9 @@ struct _ECalendarViewPrivate {
 	/* The default category */
 	gchar *default_category;
 
-<<<<<<< HEAD
 	GtkTargetList *copy_target_list;
 	GtkTargetList *paste_target_list;
 };
-=======
-#ifdef G_OS_WIN32
-const ECompEditorRegistry * const comp_editor_get_registry();
-#define comp_editor_registry comp_editor_get_registry()
-#else
-extern ECompEditorRegistry *comp_editor_registry;
-#endif
->>>>>>> 90cd900... Without this evo 2.28.2 will not link/run at all
 
 enum {
 	PROP_0,
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 842a14897c..459fff3e15 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -80,46 +80,6 @@ enum {
 	PROP_SHELL_VIEW
 };
 
-<<<<<<< HEAD
-=======
-#ifdef G_OS_WIN32
-const ECompEditorRegistry * const comp_editor_get_registry();
-#define comp_editor_registry comp_editor_get_registry()
-#else
-extern ECompEditorRegistry *comp_editor_registry;
-#endif
-
-static void e_memo_table_destroy		(GtkObject	*object);
-
-static void e_memo_table_on_double_click	(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEvent	*event,
-						 EMemoTable *memo_table);
-static gint e_memo_table_show_popup_menu	(ETable *table,
-						 GdkEvent *gdk_event,
-						 EMemoTable *memo_table);
-
-static gint e_memo_table_on_right_click		(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEvent       *event,
-						 EMemoTable *memo_table);
-static gboolean e_memo_table_on_popup_menu	(GtkWidget *widget,
-						 gpointer data);
-
-static gint e_memo_table_on_key_press		(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEventKey	*event,
-						 EMemoTable *memo_table);
-static struct tm e_memo_table_get_current_time (ECellDateEdit *ecde, gpointer data);
-
-static ECalModelComponent *get_selected_comp (EMemoTable *memo_table);
-static void open_memo (EMemoTable *memo_table, ECalModelComponent *comp_data);
-
-/* Signal IDs */
->>>>>>> 90cd900... Without this evo 2.28.2 will not link/run at all
 enum {
 	OPEN_COMPONENT,
 	POPUP_EVENT,
-- 
cgit v1.2.3