diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-01-28 15:01:13 +0800 |
|---|---|---|
| committer | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-01-28 21:48:36 +0800 |
| commit | 013ce5b70e85d6c9008cebd1d5efbe87a539d445 (patch) | |
| tree | 220c399960ff4583071c14097e10389e42c5db59 /calendar/gui/e-memo-table.c | |
| parent | 8bbc48cd7792901c406cf8f773372508677ceb93 (diff) | |
| download | gsoc2013-evolution-013ce5b70e85d6c9008cebd1d5efbe87a539d445.tar.gz gsoc2013-evolution-013ce5b70e85d6c9008cebd1d5efbe87a539d445.tar.zst gsoc2013-evolution-013ce5b70e85d6c9008cebd1d5efbe87a539d445.zip | |
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
Diffstat (limited to 'calendar/gui/e-memo-table.c')
| -rw-r--r-- | calendar/gui/e-memo-table.c | 40 |
1 files changed, 40 insertions, 0 deletions
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, |