[Commits] ldifexport_extension.c 1.4 1.5 wizard.c 1.1 1.2

[miras at claws-mail.org]

Update of /home/claws-mail/contacts/extensions/export
In directory claws-mail:/tmp/cvs-serv26200/extensions/export

Modified Files:
	ldifexport_extension.c wizard.c 
Log Message:
2011-12-13 [mir]	0.6.0cvs45

	* extensions/export/ldifexport_extension.c
	* extensions/export/wizard.c
	* src/extension-loader.c
	    Making some type casting to shutup lame
	    compiler warnings. 

Index: wizard.c
===================================================================
RCS file: /home/claws-mail/contacts/extensions/export/wizard.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wizard.c	13 Dec 2011 14:29:42 -0000	1.1
+++ wizard.c	13 Dec 2011 14:56:29 -0000	1.2
@@ -226,7 +226,7 @@
 	
 	label = gtk_label_new(_("Enter Relative DN"));
 	for (i = 0; RDN[i]; i++)
-		rdns = g_slist_prepend(rdns, RDN[i]);
+		rdns = g_slist_prepend(rdns, (gchar *) RDN[i]);
 	container->rdn = create_combo_box_text(rdns);
 	gtk_widget_set_tooltip_text(container->rdn, _("Relative DN (RDN) is the last component\n"
 										 "(read from right to left) placed before\n"

Index: ldifexport_extension.c
===================================================================
RCS file: /home/claws-mail/contacts/extensions/export/ldifexport_extension.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ldifexport_extension.c	13 Dec 2011 14:29:42 -0000	1.4
+++ ldifexport_extension.c	13 Dec 2011 14:56:29 -0000	1.5
@@ -221,11 +221,12 @@
 		return;
 		
 	debug_print("LDIF Export\n");
+
+	/* get file name for write, get abook, get contact list,
+	 * convert to ldif, save text to file*/
 	if (data->filename) {
 		name = gtk_widget_get_name(action);
 		if (strcmp("toolsmenu", name) == 0) {
-			/* get abook, get file name for write, get contact list,
-			 * convert to ldif, save text to file*/
 			view = GTK_TREE_VIEW(Main->abook_list);
 			abook = get_selected_address_book(view);
 			if (abook == NULL) {
@@ -266,26 +267,9 @@
 
 static void ldif_export(GtkWidget* widget, gpointer data) {
 	Main = (MainWindow *) data;
-/*	GtkTreeView* view;
-	GtkTreeIter* iter = NULL;
-	GtkTreeSelection* row;
-	AddressBook* abook;*/
 	
 	action = widget;
 	debug_print("LDIF Export\n");
-/*	view = GTK_TREE_VIEW(win->abook_list);
-	abook = get_selected_address_book(view);
-	if (abook == NULL) {
-		iter = set_selection_combobox(win->window,
-						_("[New Contact] Choose address book"),
-						gtk_tree_view_get_model(view),
-						BOOK_NAME_COLUMN);
-		if (! iter)
-			return;
-		row = gtk_tree_view_get_selection(view);
-		gtk_tree_selection_select_iter(row, iter);
-		g_free(iter);
-	}*/
 	show_export_wizard(Main, make_ldif);
 }
 
@@ -296,7 +280,7 @@
 	menu = gtk_image_menu_item_new_with_mnemonic("_LDIF");
 	gtk_widget_set_name(menu, "toolsmenu");
     g_signal_connect(menu, "activate",
-            G_CALLBACK(ldif_export), mainwindow);
+            G_CALLBACK(ldif_export), (gpointer) mainwindow);
     menu_item = menu_item_new();
     menu_item->menu = CONTACTS_MAIN_MENU;
     menu_item->parent = "tools";
@@ -307,7 +291,7 @@
 	menu = gtk_image_menu_item_new_with_mnemonic("_LDIF");
 	gtk_widget_set_name(menu, "contextmenu");
     g_signal_connect(menu, "activate",
-            G_CALLBACK(ldif_export), mainwindow);
+            G_CALLBACK(ldif_export), (gpointer) mainwindow);
     menu_item = menu_item_new();
     menu_item->menu = CONTACTS_ADDRESSBOOK_MENU;
     menu_item->sublabel = "_Export";