2011-12-17 [mir] 0.6.0cvs49

	* extensions/export/ldifexport_extension.c
	    Removed function since it is now present in utils.

diff --git a/ChangeLog b/ChangeLog
index a12df0c554dfbfe7f8c52e6e780c6684c87c21b7..59833406008b469823d3b33864835d16bc8b867a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-17 [mir]       0.6.0cvs49
+
+       * extensions/export/ldifexport_extension.c
+           Removed function since it is now present in utils.
+
 2011-12-17 [mir]       0.6.0cvs48
 
        * plugins/ldap/ldap-plugin.c

diff --git a/PATCHSETS b/PATCHSETS
index cc71155898c15726887fd70d5795cec8631cf412..e0bbf66c7bb90aa8cbd19a861707bbb19607581b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -46,3 +46,4 @@
 ( cvs diff -u -r 1.4 -r 1.5 src/extension-loader.c;  ) > 0.6.0cvs46.patchset
 ( cvs diff -u -r 1.3 -r 1.4 extensions/example/src/example-extension.c;  cvs diff -u -r 1.14 -r 1.15 src/callbacks.c;  cvs diff -u -r 1.5 -r 1.6 src/extension-loader.c;  cvs diff -u -r 1.2 -r 1.3 src/extension-loader.h;  ) > 0.6.0cvs47.patchset
 ( cvs diff -u -r 1.13 -r 1.14 plugins/ldap/ldap-plugin.c;  cvs diff -u -r 1.11 -r 1.12 src/utils.c;  cvs diff -u -r 1.10 -r 1.11 src/utils.h;  ) > 0.6.0cvs48.patchset
+( cvs diff -u -r 1.5 -r 1.6 extensions/export/ldifexport_extension.c;  ) > 0.6.0cvs49.patchset

diff --git a/configure.ac b/configure.ac
index 918a570c587b2961e91cdc416616d91e8c741711..d8211aa372b7622fe132c9adf2d94e77b393101b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/extensions/export/ldifexport_extension.c b/extensions/export/ldifexport_extension.c
index 85cc4a06562c8a9fdb651e9c9d284fcf0100e4f0..fee7698224fe247ce7c2abb64d9688b504b20811 100644 (file)
--- a/extensions/export/ldifexport_extension.c
+++ b/extensions/export/ldifexport_extension.c
@@ -61,21 +61,6 @@ static GtkTreeView* view;
 GtkWidget* action;
 MainWindow* Main = NULL;
 
-static const gchar* native2ldap(const gchar* attr) {
-       if (strcasecmp(attr, "email") == 0)
-               return "mail";
-       else if (strcasecmp(attr, "first-name") == 0)
-               return "givenName";
-       else if (strcasecmp(attr, "last-name") == 0)
-               return "sn";
-       else if (strcasecmp(attr, "nick-name") == 0)
-               return "displayName";
-       else if (strcasecmp(attr, "image") == 0)
-               return "jpegPhoto";
-       else
-               return attr;
-}
-
 static gchar* get_dn(Contact* contact, ExportData* data) {
        gchar *tmp = NULL, *dn = NULL;
        
@@ -297,7 +282,6 @@ static void setup(const MainWindow* mainwindow, gpointer object) {
     menu_item->sublabel = "_Export";
     menu_item->submenu = TRUE;
        add_menu_item(GTK_IMAGE_MENU_ITEM(menu), menu_item);
-
 }
 
 /**