[evolution-kolab/ek-wip-gui: 1/13] EPlugin: restructuring (account setup)

[Christian Hilberg <chilberg src gnome org>]

commit 9c41f0b5f624a7972e34cd2584f7eb317c8fc6b2
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Wed Feb 8 16:09:04 2012 +0100

    EPlugin: restructuring (account setup)
    
    * change in naming: prefix files (API functions)
      with 'e-' ('e_')
    * export account setup API via header file
      (will move EPlugin entry points to a
      to-be-created new file in a second step)

 src/eplugin/Makefile.am                            |    9 ++-
 ...lab-account-setup.c => e-kolab-account-setup.c} |   51 ++++++--------------
 ...lab-account-setup.h => e-kolab-account-setup.h} |   22 ++++++++-
 src/eplugin/org-gnome-kolab.eplug.xml              |    4 +-
 4 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/src/eplugin/Makefile.am b/src/eplugin/Makefile.am
index 850b509..30f7e5a 100644
--- a/src/eplugin/Makefile.am
+++ b/src/eplugin/Makefile.am
@@ -9,8 +9,9 @@ AM_CPPFLAGS =			\
 	$(CFLAGS)		\
 	$(ADD_CFLAGS)
 
-noinst_HEADERS = \
-	kolab-account-setup.h
+noinst_HEADERS =		\
+	e-kolab-account-setup.h	\
+	e-kolab-plugin.h
 
 @EVO_PLUGIN_RULE@
 
@@ -18,7 +19,9 @@ plugin_DATA = org-gnome-kolab.eplug
 
 plugin_LTLIBRARIES = liborg-gnome-kolab.la
 
-liborg_gnome_kolab_la_SOURCES = kolab-account-setup.c
+liborg_gnome_kolab_la_SOURCES =		\
+	e-kolab-account-setup.c		\
+	e-kolab-plugin.c
 
 liborg_gnome_kolab_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/eplugin/kolab-account-setup.c b/src/eplugin/e-kolab-account-setup.c
similarity index 93%
rename from src/eplugin/kolab-account-setup.c
rename to src/eplugin/e-kolab-account-setup.c
index 989d2e8..692f48b 100644
--- a/src/eplugin/kolab-account-setup.c
+++ b/src/eplugin/e-kolab-account-setup.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /***************************************************************************
- *            kolab-account-setup.c
+ *            e-kolab-account-setup.c
  *
  *  Wed Jun 16 15:37:05 2010
  *  Copyright  2010  Christian Hilberg
@@ -41,7 +41,7 @@
 #include <libekolabutil/kolab-util-folder.h>
 #include <libekolabutil/kolab-util-types.h>
 
-#include "kolab-account-setup.h"
+#include "e-kolab-account-setup.h"
 
 /*----------------------------------------------------------------------------*/
 
@@ -49,11 +49,6 @@
 #define _KOLAB_CONTACT_WIDGET "kolabcontactwidget"
 #define KOLAB_EPLUGIN_WIDGET_NAME "Evolution-Kolab EPlugin"
 
-typedef enum {
-	KOLAB_CALENDAR_WIDGET,
-	KOLAB_CONTACT_WIDGET
-} KolabWidgetType;
-
 enum {
 	NAME_COL,
 	FID_COL,
@@ -75,22 +70,6 @@ typedef struct {
 } kolab_ui_data;
 
 /*----------------------------------------------------------------------------*/
-
-GtkWidget*
-kolab_account_setup_create_backend (EPlugin *epl,
-                                    EConfigHookItemFactoryData *data,
-                                    KolabWidgetType widget_type);
-
-GtkWidget*
-kolab_account_setup_create_calendar (EPlugin *epl,
-                                     EConfigHookItemFactoryData *data);
-
-GtkWidget*
-kolab_account_setup_create_addressbook (EPlugin *epl,
-                                        EConfigHookItemFactoryData *data);
-
-
-/*----------------------------------------------------------------------------*/
 /* internal statics */
 
 static void
@@ -374,9 +353,9 @@ org_gnome_kolab_check_options(EPlugin *epl,
 }
 
 GtkWidget*
-kolab_account_setup_create_backend (EPlugin *epl,
-                                    EConfigHookItemFactoryData *data,
-                                    KolabWidgetType widget_type)
+e_kolab_account_setup_create_backend (EPlugin *epl,
+                                      EConfigHookItemFactoryData *data,
+                                      KolabWidgetType widget_type)
 {
 	EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
 	GtkWidget *parent = data->parent;
@@ -581,26 +560,26 @@ kolab_account_setup_create_backend (EPlugin *epl,
 }
 
 GtkWidget*
-kolab_account_setup_create_calendar (EPlugin *epl,
-                                     EConfigHookItemFactoryData *data)
+e_kolab_account_setup_create_calendar (EPlugin *epl,
+                                       EConfigHookItemFactoryData *data)
 {
 	g_assert (E_IS_PLUGIN (epl));
 
-	kolab_account_setup_create_backend (epl,
-	                                    data,
-	                                    KOLAB_CALENDAR_WIDGET);
+	e_kolab_account_setup_create_backend (epl,
+	                                      data,
+	                                      KOLAB_CALENDAR_WIDGET);
 	return NULL;
 }
 
 GtkWidget*
-kolab_account_setup_create_addressbook (EPlugin *epl,
-                                        EConfigHookItemFactoryData *data)
+e_kolab_account_setup_create_addressbook (EPlugin *epl,
+                                          EConfigHookItemFactoryData *data)
 {
 	g_assert (E_IS_PLUGIN (epl));
 
-	kolab_account_setup_create_backend (epl,
-	                                    data,
-	                                    KOLAB_CONTACT_WIDGET);
+	e_kolab_account_setup_create_backend (epl,
+	                                      data,
+	                                      KOLAB_CONTACT_WIDGET);
 	return NULL;
 }
 
diff --git a/src/eplugin/kolab-account-setup.h b/src/eplugin/e-kolab-account-setup.h
similarity index 74%
rename from src/eplugin/kolab-account-setup.h
rename to src/eplugin/e-kolab-account-setup.h
index de33bea..ca64a4a 100644
--- a/src/eplugin/kolab-account-setup.h
+++ b/src/eplugin/e-kolab-account-setup.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /***************************************************************************
- *            kolab-account-setup.h
+ *            e-kolab-account-setup.h
  *
  *  Wed Jun 16 15:37:05 2010
  *  Copyright  2010  Christian Hilberg
@@ -38,7 +38,12 @@
 
 /*----------------------------------------------------------------------------*/
 
-/* prototypes */
+typedef enum {
+	KOLAB_CALENDAR_WIDGET,
+	KOLAB_CONTACT_WIDGET
+} KolabWidgetType;
+
+/*----------------------------------------------------------------------------*/
 
 gint
 e_plugin_lib_enable (EPlugin*, gint);
@@ -51,6 +56,19 @@ gboolean
 org_gnome_kolab_check_options(EPlugin *epl,
                               EConfigHookPageCheckData *data);
 
+GtkWidget*
+e_kolab_account_setup_create_backend (EPlugin *epl,
+                                      EConfigHookItemFactoryData *data,
+                                      KolabWidgetType widget_type);
+
+GtkWidget*
+e_kolab_account_setup_create_calendar (EPlugin *epl,
+                                       EConfigHookItemFactoryData *data);
+
+GtkWidget*
+e_kolab_account_setup_create_addressbook (EPlugin *epl,
+                                          EConfigHookItemFactoryData *data);
+
 /*----------------------------------------------------------------------------*/
 
 #endif /* _KOLAB_ACCOUNT_SETUP_H_ */
diff --git a/src/eplugin/org-gnome-kolab.eplug.xml b/src/eplugin/org-gnome-kolab.eplug.xml
index 0360592..5802080 100644
--- a/src/eplugin/org-gnome-kolab.eplug.xml
+++ b/src/eplugin/org-gnome-kolab.eplug.xml
@@ -18,7 +18,7 @@
 			       check="org_gnome_kolab_check_options">
 				<item type="item"
 				      path="00.general/10.display/50.createcontacts"
-				      factory="kolab_account_setup_create_addressbook">
+				      factory="e_kolab_account_setup_create_addressbook">
 				</item>
 			</group>
 		</hook>
@@ -28,7 +28,7 @@
 			       check="org_gnome_kolab_check_options">
 				<item type="item_table"
 				      path="00.general/00.source/99.kolabcalendar"
-				      factory="kolab_account_setup_create_calendar">
+				      factory="e_kolab_account_setup_create_calendar">
 				</item>
 			</group>
 		</hook>