[evolution-kolab] EPlugin: remove showcase for sync conflict dialog



commit d5b7fff1c279d4c31648d144abe59c31b760a892
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Feb 21 15:23:20 2012 +0100

    EPlugin: remove showcase for sync conflict dialog
    
    * disabled the hook for showing the sync conflict
      dialog on EPlugin start
    * the hook just serves as a trigger to show the
      dialog, it needs to be removed entirely, once
      we have the evo<->e-d-s extra comm in place
      which will allow the backend to request this
      dialog be opened

 src/eplugin/e-kolab-plugin.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/src/eplugin/e-kolab-plugin.c b/src/eplugin/e-kolab-plugin.c
index d3ad1b4..54b4c51 100644
--- a/src/eplugin/e-kolab-plugin.c
+++ b/src/eplugin/e-kolab-plugin.c
@@ -26,7 +26,7 @@
 
 /*----------------------------------------------------------------------------*/
 
-#define d(x) x
+#define d(x)
 
 /*----------------------------------------------------------------------------*/
 
@@ -62,7 +62,15 @@ e_plugin_lib_enable (EPlugin *epl,
 		g_debug ("%s(): Kolab plugin disabled", __func__);
 	}
 
-	/* FIXME remove me! */
+	/* FIXME
+	 *
+	 * This needs to be removed entirely. It just serves
+	 * as a showcase for the sync conflict resolution
+	 * dialog until we have the evo<->e-d-s extra communication
+	 * established so the dialog can be shown on backend request.
+	 *
+	 * This call does not belong here!
+	 */
 	d (e_kolab_backend_sync_ui_conflict_cb (NULL);)
 
 	return 0;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]