Without this evo 2.28.2 will not link/run at all

The change is needed:
1) To export the right symbols from the right dummy import library so that the loader does not look for symbols where they are not
2) Export that comp_editor_registry using a getter function for win32 so that we don't have to decorate the data string so that the autoexport works again

3 files changed, 59 insertions, 0 deletions

diff --git a/calendar/gui/cal-editor-utils.c b/calendar/gui/cal-editor-utils.c
index 4258e2ce01..d4389aa928 100644
--- a/calendar/gui/cal-editor-utils.c
+++ b/calendar/gui/cal-editor-utils.c
@@ -30,6 +30,16 @@
 #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 fd8650edad..e80d894a3b 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -75,9 +75,18 @@ 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 459fff3e15..842a14897c 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -80,6 +80,46 @@ 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,