Sylpheed - /src/addressbook.c - Diff - Sylpheed

Revision 2295 src/addressbook.c

     /*
      * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
      * Copyright (C) 1999-2007 Hiroyuki Yamamoto
      * Copyright (C) 1999-2009 Hiroyuki Yamamoto
+     *
      * This program is free software; you can redistribute it and/or modify
      * it under the terms of the GNU General Public License as published by
-...
     typedef enum
+    {
     	COL_NAME	= 0,
     	COL_ADDRESS	= 1,
     	COL_REMARKS	= 2
     } AddressBookColumnPos;
     	COL_FOLDER_NAME,
     	COL_OBJ,
     	COL_PIXBUF,
     	COL_PIXBUF_OPEN,
     #define N_COLS	3
     	N_TREE_COLS
     } AddressBookTreeColumnPos;
     typedef enum
+    {
     	COL_NAME,
     	COL_ADDRESS,
     	COL_REMARKS,
     	N_LIST_COLS
     } AddressBookListColumnPos;
     #define COL_NAME_WIDTH		164
     #define COL_ADDRESS_WIDTH	156
-...
     #define ADDRESSBOOK_MSGBUF_SIZE 2048
     static GdkPixbuf *folderpix;
     static GdkPixbuf *folderopenpix;
     static GdkPixbuf *grouppix;
     static GdkPixbuf *interfacepix;
     static GdkPixbuf *bookpix;
     static GdkPixbuf *addresspix;
     static GdkPixbuf *vcardpix;
     static GdkPixbuf *jpilotpix;
     static GdkPixbuf *categorypix;
     static GdkPixbuf *ldappix;
     static GdkPixmap *folderxpm;
     static GdkBitmap *folderxpmmask;
     static GdkPixmap *folderopenxpm;
-...
     static GdkBitmap *ldapxpmmask;
     /* Message buffer */
     static gchar addressbook_msgbuf[ ADDRESSBOOK_MSGBUF_SIZE ];
     static gchar addressbook_msgbuf[ADDRESSBOOK_MSGBUF_SIZE];
     /* Address list selection */
     static GList *_addressListSelection_ = NULL;
-...
     static GHashTable *_addressBookTypeHash_ = NULL;
     static GList *_addressBookTypeList_ = NULL;
     static void addressbook_refresh			(void);
     static void addressbook_reopen			(void);
     static void addressbook_create			(void);
     static gint addressbook_close			(void);
-...
     static void addressbook_close_clicked		(GtkButton	*button,
     						 gpointer	data);
     static void addressbook_tree_selected		(GtkCTree	*ctree,
     						 GtkCTreeNode	*node,
     						 gint		 column,
     						 gpointer	 data);
     static void addressbook_tree_selection_changed	(GtkTreeSelection *selection,
     						 gpointer	   data);
     static void addressbook_list_selected		(GtkCList	*clist,
     						 gint		 row,
     						 gint		 column,
-...
     						 guint		 action,
     						 GtkWidget	*widget);
     static void addressbook_change_node_name	(GtkCTreeNode	*node,
     static void addressbook_change_node_name	(GtkTreeIter	*iter,
     						 const gchar	*name);
     static void addressbook_new_address_cb		(gpointer	 data,
-...
     static void addressbook_load_tree		(void);
     void addressbook_read_file			(void);
     static GtkCTreeNode *addressbook_add_object	(GtkCTreeNode	*node,
     static gboolean addressbook_add_object		(GtkTreeIter	*iter,
     						 GtkTreeIter	*new_iter,
     						 AddressObject	*obj);
     static AddressDataSource *addressbook_find_datasource
     						(GtkCTreeNode	*node );
     						(GtkTreeIter	*iter);
     static AddressBookFile *addressbook_get_book_file();
     static GtkCTreeNode *addressbook_node_add_folder
     						(GtkCTreeNode	*node,
     						AddressDataSource *ds,
     						ItemFolder	*itemFolder,
     						AddressObjectType otype);
     static GtkCTreeNode *addressbook_node_add_group (GtkCTreeNode	*node,
     						AddressDataSource *ds,
     						ItemGroup	*itemGroup);
     static gboolean addressbook_node_add_folder	(GtkTreeIter	*iter,
     						 AddressDataSource *ds,
     						 ItemFolder	*itemFolder,
     						 AddressObjectType otype,
     						 GtkTreeIter	*new_iter);
     static gboolean addressbook_node_add_group	(GtkTreeIter	*iter,
     						 AddressDataSource *ds,
     						 ItemGroup	*itemGroup,
     						 GtkTreeIter	*new_iter);
     /* static GtkCTreeNode *addressbook_node_add_category */
     /*						(GtkCTreeNode	*node, */
     /*						 AddressDataSource *ds, */
     /*						 ItemFolder	*itemFolder); */
     static void addressbook_tree_remove_children	(GtkCTree	*ctree,
     						GtkCTreeNode	*parent);
     static void addressbook_move_nodes_up		(GtkCTree	*ctree,
     						GtkCTreeNode	*node);
     static GtkCTreeNode *addressbook_find_group_node (GtkCTreeNode	*parent,
     						ItemGroup	*group);
     static void addressbook_tree_remove_children	(GtkTreeModel	*model,
     						 GtkTreeIter	*parent);
     static void addressbook_move_nodes_up		(GtkTreeIter	*iter);
     static gboolean addressbook_find_group_node	(GtkTreeIter	*parent,
     						 GtkTreeIter	*iter,
     						 ItemGroup	*group);
     /* static void addressbook_delete_object	(AddressObject	*obj); */
-...
     						 GtkAllocation	*allocation,
     						 gpointer	 data);
     static gint addressbook_list_compare		(GtkTreeModel	*model,
     						 GtkTreeIter	*a,
     						 GtkTreeIter	*b,
     						 gpointer	 data);
     static gint addressbook_list_compare_func	(GtkCList	*clist,
     						 gconstpointer	 ptr1,
     						 gconstpointer	 ptr2);
-...
     #endif
     /* LUT's and IF stuff */
     static void addressbook_free_adapter		(GtkCTreeNode	*node);
     static void addressbook_free_child_adapters	(GtkCTreeNode	*node);
     static void addressbook_free_adapter		(GtkTreeIter	*iter);
     static void addressbook_free_child_adapters	(GtkTreeIter	*iter);
     AddressTypeControlItem *addrbookctl_lookup	(gint		 ot);
     AddressTypeControlItem *addrbookctl_lookup_iface(AddressIfType	 ifType);
-...
     void addressbook_open(Compose *target)
+    {
     	if (!addrbook.window) {
     		GtkTreeView *treeview;
     		GtkTreeModel *model;
     		GtkTreeIter iter;
     		GtkTreePath *path;
     		addressbook_read_file();
     		addressbook_create();
     		addressbook_load_tree();
     		gtk_ctree_select(GTK_CTREE(addrbook.ctree),
     				 GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list));
     		treeview = GTK_TREE_VIEW(addrbook.treeview);
     		model = gtk_tree_view_get_model(treeview);
     		if (gtk_tree_model_get_iter_first(model, &iter)) {
     			path = gtk_tree_model_get_path(model, &iter);
     			gtk_tree_view_set_cursor(treeview, path, NULL, FALSE);
     			gtk_tree_path_free(path);
+    		}
     		addressbook_menuitem_set_sensitive();
     		gtk_widget_show_all(addrbook.window);
+    	}
-...
     	return addrbook.target_compose;
+    }
     void addressbook_refresh(void)
     static void addressbook_refresh(void)
+    {
     	if (addrbook.window) {
     		if (addrbook.opened) {
     			addrbook.treeSelected = NULL;
     			gtk_ctree_select(GTK_CTREE(addrbook.ctree),
     					 addrbook.opened);
     		if (addrbook.tree_opened) {
     			addressbook_reopen();
+    		}
+    	}
     	addressbook_export_to_file();
+    }
     static void addressbook_reopen(void)
+    {
     	GtkTreePath *path;
     	if (addrbook.tree_selected) {
     		gtk_tree_row_reference_free(addrbook.tree_selected);
     		addrbook.tree_selected = NULL;
+    	}
     	if (addrbook.tree_opened) {
     		path = gtk_tree_row_reference_get_path(addrbook.tree_opened);
     		gtk_tree_view_set_cursor(GTK_TREE_VIEW(addrbook.treeview), path, NULL, FALSE);
     		gtk_tree_path_free(path);
+    	}
+    }
     /*
     * Create the address book widgets. The address book contains two CTree widgets: the
     * address index tree on the left and the address list on the right.
-...
     	GtkWidget *menubar;
     	GtkWidget *spc_hbox;
     	GtkWidget *vbox2;
     	GtkWidget *ctree_swin;
     	GtkWidget *ctree;
     	GtkWidget *tree_swin;
     	GtkWidget *treeview;
     	GtkTreeStore *tree_store;
     	GtkTreeSelection *selection;
     	GtkTreeViewColumn *column;
     	GtkCellRenderer *renderer;
     	GtkWidget *clist_vbox;
     	GtkWidget *clist_swin;
     	GtkWidget *clist;
-...
     	gint n_entries;
     	GList *nodeIf;
     	gchar *titles[N_COLS];
     	gchar *text;
     	gchar *titles[N_LIST_COLS];
     	gint i;
     	debug_print("Creating addressbook window...\n");
-...
     	vbox2 = gtk_vbox_new(FALSE, 4);
     	gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
     	ctree_swin = gtk_scrolled_window_new(NULL, NULL);
     	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ctree_swin),
     	tree_swin = gtk_scrolled_window_new(NULL, NULL);
     	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tree_swin),
     				       GTK_POLICY_AUTOMATIC,
     				       GTK_POLICY_ALWAYS);
     	gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
     	gtk_widget_set_size_request(tree_swin, COL_FOLDER_WIDTH + 40, -1);
     	/* Address index */
     	ctree = gtk_ctree_new(1, 0);
     	gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
     	gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
     	gtk_clist_set_column_width(GTK_CLIST(ctree), 0, COL_FOLDER_WIDTH);
     	gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
     	gtk_ctree_set_expander_style(GTK_CTREE(ctree),
     				     GTK_CTREE_EXPANDER_SQUARE);
     	gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
     	gtk_clist_set_compare_func(GTK_CLIST(ctree),
     				   addressbook_list_compare_func);
     	gtkut_clist_set_redraw(GTK_CLIST(ctree));
     	tree_store = gtk_tree_store_new(N_TREE_COLS, G_TYPE_STRING,
     					G_TYPE_POINTER, GDK_TYPE_PIXBUF,
     					GDK_TYPE_PIXBUF);
     	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(tree_store),
     					COL_FOLDER_NAME,
     					addressbook_list_compare,
     					NULL, NULL);
     	g_signal_connect(G_OBJECT(ctree), "tree_select_row",
     			 G_CALLBACK(addressbook_tree_selected), NULL);
     	g_signal_connect(G_OBJECT(ctree), "button_press_event",
     	treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(tree_store));
     	g_object_unref(G_OBJECT(tree_store));
     	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
     	gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
     	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
     	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), FALSE);
     	gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview),
     					COL_FOLDER_NAME);
     	gtk_tree_view_set_reorderable(GTK_TREE_VIEW(treeview), FALSE);
     	gtk_container_add(GTK_CONTAINER(tree_swin), treeview);
     	column = gtk_tree_view_column_new();
     	gtk_tree_view_column_set_spacing(column, 2);
     	gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
     	gtk_tree_view_column_set_fixed_width(column, COL_FOLDER_WIDTH);
     	gtk_tree_view_column_set_resizable(column, TRUE);
     	renderer = gtk_cell_renderer_pixbuf_new();
     	g_object_set(renderer, "ypad", 0, NULL);
     	gtk_tree_view_column_pack_start(column, renderer, FALSE);
     	gtk_tree_view_column_set_title(column, _("Folder"));
     	gtk_tree_view_column_set_attributes
     		(column, renderer, "pixbuf", COL_PIXBUF,
     		 "pixbuf-expander-open", COL_PIXBUF_OPEN,
     		 "pixbuf-expander-closed", COL_PIXBUF, NULL);
     	renderer = gtk_cell_renderer_text_new();
     #if GTK_CHECK_VERSION(2, 6, 0)
     	g_object_set(renderer, "ellipsize", PANGO_ELLIPSIZE_END, "ypad", 0,
     		     NULL);
     #else
     	g_object_set(renderer, "ypad", 0, NULL);
     #endif
     	gtk_tree_view_column_pack_start(column, renderer, TRUE);
     	gtk_tree_view_column_set_attributes(column, renderer,
     					    "text", COL_FOLDER_NAME, NULL);
     	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
     	gtk_tree_view_set_expander_column(GTK_TREE_VIEW(treeview), column);
     	g_signal_connect(G_OBJECT(selection), "changed",
     			 G_CALLBACK(addressbook_tree_selection_changed), NULL);
     	g_signal_connect(G_OBJECT(treeview), "button_press_event",
     			 G_CALLBACK(addressbook_tree_button_pressed),
     			 NULL);
     	g_signal_connect(G_OBJECT(ctree), "button_release_event",
     	g_signal_connect(G_OBJECT(treeview), "button_release_event",
     			 G_CALLBACK(addressbook_tree_button_released),
     			 NULL);
-...
     	gtk_box_pack_start(GTK_BOX(clist_vbox), clist_swin, TRUE, TRUE, 0);
     	/* Address list */
     	clist = gtk_ctree_new_with_titles(N_COLS, 0, titles);
     	clist = gtk_ctree_new_with_titles(N_LIST_COLS, 0, titles);
     	gtk_container_add(GTK_CONTAINER(clist_swin), clist);
     	gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_EXTENDED);
     	gtk_ctree_set_line_style(GTK_CTREE(clist), GTK_CTREE_LINES_NONE);
-...
     				   addressbook_list_compare_func);
     	gtkut_clist_set_redraw(GTK_CLIST(clist));
     	for (i = 0; i < N_COLS; i++)
     	for (i = 0; i < N_LIST_COLS; i++)
     		GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
     				       GTK_CAN_FOCUS);
-...
     	paned = gtk_hpaned_new();
     	gtk_box_pack_start(GTK_BOX(vbox2), paned, TRUE, TRUE, 0);
     	gtk_paned_add1(GTK_PANED(paned), ctree_swin);
     	gtk_paned_add1(GTK_PANED(paned), tree_swin);
     	gtk_paned_add2(GTK_PANED(paned), clist_vbox);
     	/* Status bar */
-...
     			 G_CALLBACK(addressbook_close_clicked), NULL);
     	/* Build icons for interface */
     	stock_pixmap_gdk( window, STOCK_PIXMAP_INTERFACE,
     			  &interfacexpm, &interfacexpmmask );
     	stock_pixbuf_gdk(window, STOCK_PIXMAP_INTERFACE, &interfacepix);
     	stock_pixmap_gdk(window, STOCK_PIXMAP_INTERFACE,
     			 &interfacexpm, &interfacexpmmask);
     	/* Build control tables */
     	addrbookctl_build_map(window);
     	addrbookctl_build_iflist();
-...
     	while( nodeIf ) {
     		AdapterInterface *adapter = nodeIf->data;
     		AddressInterface *iface = adapter->interface;
     		nodeIf = g_list_next(nodeIf);
     		if(iface->useInterface) {
     			AddressTypeControlItem *atci = adapter->atci;
     			text = atci->displayName;
     			adapter->treeNode =
     				gtk_ctree_insert_node( GTK_CTREE(ctree),
     					NULL, NULL, &text, FOLDER_SPACING,
     					interfacexpm, interfacexpmmask,
     					interfacexpm, interfacexpmmask,
     					FALSE, FALSE );
     			gtk_ctree_node_set_row_data( GTK_CTREE(ctree), adapter->treeNode, adapter );
     			gchar *text = atci->displayName;
     			GtkTreeIter iter;
     			GtkTreePath *path;
     			g_print("addressbook_create: text: %s\n", text);
     			gtk_tree_store_append(tree_store, &iter, NULL);
     			gtk_tree_store_set(tree_store, &iter,
     					   COL_FOLDER_NAME, text,
     					   COL_OBJ, adapter,
     					   COL_PIXBUF, interfacepix,
     					   COL_PIXBUF_OPEN, interfacepix, -1);
     			path = gtk_tree_model_get_path(GTK_TREE_MODEL(tree_store), &iter);
     			adapter->tree_row = gtk_tree_row_reference_new(GTK_TREE_MODEL(tree_store), path);
     			gtk_tree_path_free(path);
+    		}
+    	}
-...
     				       "<AddressBookList>", &list_factory,
     				       NULL);
     	addrbook.window  = window;
     	addrbook.menubar = menubar;
     	addrbook.ctree   = ctree;
     	addrbook.clist   = clist;
     	addrbook.entry   = entry;
     	addrbook.statusbar = statusbar;
     	addrbook.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Address Book Window" );
     	addrbook.window     = window;
     	addrbook.menubar    = menubar;
     	addrbook.treeview   = treeview;
     	addrbook.clist      = clist;
     	addrbook.entry      = entry;
     	addrbook.statusbar  = statusbar;
     	addrbook.status_cid = gtk_statusbar_get_context_id(GTK_STATUSBAR(statusbar), "Address Book Window");
     	addrbook.to_btn  = to_btn;
     	addrbook.cc_btn  = cc_btn;
-...
     	return TRUE;
+    }
     static void addressbook_status_show( gchar *msg ) {
     	if( addrbook.statusbar != NULL ) {
     		gtk_statusbar_pop( GTK_STATUSBAR(addrbook.statusbar), addrbook.status_cid );
     		if( msg ) {
     			gtk_statusbar_push( GTK_STATUSBAR(addrbook.statusbar), addrbook.status_cid, msg );
     static void addressbook_status_show(const gchar *msg)
+    {
     	if (addrbook.statusbar != NULL) {
     		gtk_statusbar_pop(GTK_STATUSBAR(addrbook.statusbar), addrbook.status_cid);
     		if (msg) {
     			gtk_statusbar_push(GTK_STATUSBAR(addrbook.statusbar), addrbook.status_cid, msg);
+    		}
+    	}
+    }
     static void addressbook_ds_show_message( AddressDataSource *ds ) {
     static void addressbook_ds_show_message(AddressDataSource *ds)
+    {
     	gint retVal;
     	gchar *name;
     	*addressbook_msgbuf = '\0';
     	if( ds ) {
     		name = addrindex_ds_get_name( ds );
     		retVal = addrindex_ds_get_status_code( ds );
     		if( retVal == MGU_SUCCESS ) {
     			if( ds ) {
     				sprintf( addressbook_msgbuf, "%s", name );
     	if (ds) {
     		name = addrindex_ds_get_name(ds);
     		retVal = addrindex_ds_get_status_code(ds);
     		if (retVal == MGU_SUCCESS) {
     			if (ds) {
     				g_snprintf(addressbook_msgbuf, sizeof(addressbook_msgbuf), "%s", name);
+    			}
+    		}
     		else {
     			if( ds == NULL ) {
     				sprintf( addressbook_msgbuf, "%s", mgu_error2string( retVal ) );
     		} else {
     			if (ds == NULL) {
     				g_snprintf(addressbook_msgbuf, sizeof(addressbook_msgbuf), "%s", mgu_error2string(retVal));
     			} else {
     				g_snprintf(addressbook_msgbuf, sizeof(addressbook_msgbuf), "%s: %s", name, mgu_error2string(retVal));
+    			}
     			else {
     				sprintf( addressbook_msgbuf, "%s: %s", name, mgu_error2string( retVal ) );
+    			}
+    		}
+    	}
     	addressbook_status_show( addressbook_msgbuf );
     	addressbook_status_show(addressbook_msgbuf);
+    }
     /*
-...
     */
     static void addressbook_del_clicked(GtkButton *button, gpointer data)
+    {
     	GtkTreeView *treeview = GTK_TREE_VIEW(addrbook.treeview);
     	GtkTreeSelection *selection;
     	GtkTreeModel *model;
     	GtkTreeIter iter;
     	GtkTreePath *path;
     	GtkCTree *clist = GTK_CTREE(addrbook.clist);
     	GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
     	AddressObject *pobj, *obj;
     	AddressObject *pobj = NULL;
     	AddressObject *obj = NULL;
     	AdapterDSource *ads = NULL;
     	GtkCTreeNode *nodeList;
     	gboolean procFlag;
-...
     	AddressBookFile *abf = NULL;
     	AddressDataSource *ds = NULL;
     	pobj = gtk_ctree_node_get_row_data(ctree, addrbook.opened );
     	if (!addrbook.tree_opened)
     		return;
     	model = gtk_tree_view_get_model(treeview);
     	selection = gtk_tree_view_get_selection(treeview);
     	path = gtk_tree_row_reference_get_path(addrbook.tree_opened);
     	gtk_tree_model_get_iter(model, &iter, path);
     	gtk_tree_path_free(path);
     	gtk_tree_model_get(model, &iter, COL_OBJ, &pobj, -1);
     	g_return_if_fail(pobj != NULL);
     	nodeList = addrbook.listSelected;
     	obj = gtk_ctree_node_get_row_data( clist, nodeList );
     	if( obj == NULL) return;
     	ds = addressbook_find_datasource( addrbook.treeSelected );
     	if( ds == NULL ) return;
     	obj = gtk_ctree_node_get_row_data(clist, nodeList);
     	if (obj == NULL)
     		return;
     	if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
     		return;
     	ds = addressbook_find_datasource(&iter);
     	if (ds == NULL)
     		return;
     	procFlag = FALSE;
     	if( pobj->type == ADDR_DATASOURCE ) {
     	if (pobj->type == ADDR_DATASOURCE) {
     		ads = ADAPTER_DSOURCE(pobj);
     		if( ads->subType == ADDR_BOOK ) procFlag = TRUE;
     		if(ads->subType == ADDR_BOOK)
     			procFlag = TRUE;
+    	}
     	else if( pobj->type == ADDR_ITEM_FOLDER ) {
     	else if (pobj->type == ADDR_ITEM_FOLDER) {
     		procFlag = TRUE;
+    	}
     	else if( pobj->type == ADDR_ITEM_GROUP ) {
     	} else if (pobj->type == ADDR_ITEM_GROUP) {
     		procFlag = TRUE;
+    	}
     	if( ! procFlag ) return;
     	if (!procFlag)
     		return;
     	abf = ds->rawDataSource;
     	if( abf == NULL ) return;
     	if (abf == NULL)
     		return;
     	/* Confirm deletion */
     	aval = alertpanel( _("Delete address(es)"),
     			_("Really delete the address(es)?"),
     			GTK_STOCK_YES, GTK_STOCK_NO, NULL );
     	if( aval != G_ALERTDEFAULT ) return;
     	aval = alertpanel(_("Delete address(es)"),
     			  _("Really delete the address(es)?"),
     			  GTK_STOCK_YES, GTK_STOCK_NO, NULL);
     	if (aval != G_ALERTDEFAULT)
     		return;
     	/* Process deletions */
     	if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
     	if (pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER) {
     		/* Items inside folders */
     		GList *node;
     		node = _addressListSelection_;
     		while( node ) {
     		while (node) {
     			AddrItemObject *aio = node->data;
     			node = g_list_next( node );
     			if( aio->type == ADDR_ITEM_GROUP ) {
     				ItemGroup *item = ( ItemGroup * ) aio;
     				GtkCTreeNode *nd = NULL;
     			node = g_list_next(node);
     			if (aio->type == ADDR_ITEM_GROUP) {
     				ItemGroup *item = (ItemGroup *)aio;
     				GtkTreeIter giter;
     				nd = addressbook_find_group_node( addrbook.opened, item );
     				item = addrbook_remove_group( abf, item );
     				if( item ) {
     					addritem_free_item_group( item );
     				addressbook_find_group_node(&iter, &giter, item);
     				item = addrbook_remove_group(abf, item);
     				if (item) {
     					addritem_free_item_group(item);
     					item = NULL;
+    				}
     				/* Remove group from parent node */
     				gtk_ctree_remove_node( ctree, nd );
+    			}
     			else if( aio->type == ADDR_ITEM_PERSON ) {
     				ItemPerson *item = ( ItemPerson * ) aio;
     				if( _clipObjectList_ ) {
     					_clipObjectList_ = g_list_remove( _clipObjectList_, item );
     				gtk_tree_store_remove(GTK_TREE_STORE(model), &giter);
     			} else if (aio->type == ADDR_ITEM_PERSON) {
     				ItemPerson *item = (ItemPerson *)aio;
     				if (_clipObjectList_) {
     					_clipObjectList_ = g_list_remove(_clipObjectList_, item);
+    				}
     				item = addrbook_remove_person( abf, item );
     				if( item ) {
     					addritem_free_item_person( item );
     				item = addrbook_remove_person(abf, item);
     				if (item) {
     					addritem_free_item_person(item);
     					item = NULL;
+    				}
+    			}
     			else if( aio->type == ADDR_ITEM_EMAIL ) {
     				ItemEMail *item = ( ItemEMail * ) aio;
     				ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(item);
     				item = addrbook_person_remove_email( abf, person, item );
     				if( item ) {
     					addritem_free_item_email( item );
     			} else if (aio->type == ADDR_ITEM_EMAIL) {
     				ItemEMail *item = (ItemEMail *)aio;
     				ItemPerson *person = (ItemPerson *)ADDRITEM_PARENT(item);
     				item = addrbook_person_remove_email(abf, person, item);
     				if (item) {
     					addritem_free_item_email(item);
     					item = NULL;
+    				}
+    			}
+    		}
     		addressbook_list_select_clear();
     		addrbook.treeSelected = NULL;
     		gtk_ctree_select( ctree, addrbook.opened );
     		addressbook_reopen();
     		return;
+    	}
     	else if( pobj->type == ADDR_ITEM_GROUP ) {
     	} else if (pobj->type == ADDR_ITEM_GROUP) {
     		/* Items inside groups */
     		GList *node;
     		ItemGroup *group = ADAPTER_GROUP(pobj)->itemGroup;
     		node = _addressListSelection_;
     		while( node ) {
     		while (node) {
     			AddrItemObject *aio = node->data;
     			node = g_list_next( node );
     			if( aio->type == ADDR_ITEM_EMAIL ) {
     				ItemEMail *item = ( ItemEMail * ) aio;
     				item = addrbook_group_remove_email( abf, group, item );
     			node = g_list_next(node);
     			if (aio->type == ADDR_ITEM_EMAIL) {
     				ItemEMail *item = (ItemEMail *)aio;
     				item = addrbook_group_remove_email(abf, group, item);
+    			}
+    		}
     		addressbook_list_select_clear();
     		addrbook.treeSelected = NULL;
     		gtk_ctree_select( ctree, addrbook.opened );
     		addressbook_reopen();
     		return;
+    	}
     	gtk_ctree_node_set_row_data( clist, nodeList, NULL );
     	gtk_ctree_remove_node( clist, nodeList );
     	addressbook_list_select_remove( obj );
     	gtk_ctree_node_set_row_data(clist, nodeList, NULL);
     	gtk_ctree_remove_node(clist, nodeList);
     	addressbook_list_select_remove(obj);
+    }
     static void addressbook_reg_clicked(GtkButton *button, gpointer data)
+    {
     	addressbook_new_address_cb( NULL, 0, NULL );
     	addressbook_new_address_cb(NULL, 0, NULL);
+    }
     gchar *addressbook_format_address( AddressObject * obj ) {
     gchar *addressbook_format_address(AddressObject *obj)
+    {
     	gchar *buf = NULL;
     	gchar *name = NULL;
     	gchar *address = NULL;
-...
+    	}
+    }
     static void addressbook_menuitem_set_sensitive(void) {
     static void addressbook_menuitem_set_sensitive(void)
+    {
     	GtkTreeView *treeview = GTK_TREE_VIEW(addrbook.treeview);
     	GtkTreeSelection *selection;
     	GtkTreeModel *model;
     	GtkTreeIter iter;
     	gboolean canAdd = FALSE;
     	gboolean canEditTree = TRUE;
     	gboolean canEditAddress = FALSE;
-...
     	menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.tree_popup));
     	menu_set_insensitive_all( GTK_MENU_SHELL(addrbook.list_popup) );
     	pobj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
     	if( pobj == NULL ) return;
     	selection = gtk_tree_view_get_selection(treeview);
     	if (!gtk_tree_selection_get_selected(selection, &model, &iter))
     		return;
     	if( addrbook.listSelected )
     		obj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.clist), addrbook.listSelected );
     	gtk_tree_model_get(model, &iter, COL_OBJ, &pobj, -1);
     	if (pobj == NULL)
     		return;
     	if( pobj->type == ADDR_INTERFACE ) {
     	if (addrbook.listSelected)
     		obj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.clist), addrbook.listSelected);
     	if (pobj->type == ADDR_INTERFACE) {
     		AdapterInterface *adapter = ADAPTER_INTERFACE(pobj);
     		iface = adapter->interface;
     		if( iface ) {
     			if( iface->haveLibrary ) {
     				/* Enable appropriate File / New command */
     				atci = adapter->atci;
     				menu_set_sensitive( addrbook.menu_factory, atci->menuCommand, TRUE );
+    			}
     		if (iface && iface->haveLibrary) {
     			/* Enable appropriate File / New command */
     			atci = adapter->atci;
     			menu_set_sensitive(addrbook.menu_factory, atci->menuCommand, TRUE);
+    		}
     		canEditTree = FALSE;
+    	}
     	else if( pobj->type == ADDR_DATASOURCE ) {
     	} else if (pobj->type == ADDR_DATASOURCE) {
     		AdapterDSource *ads = ADAPTER_DSOURCE(pobj);
     		ds = ads->dataSource;
     		iface = ds->interface;
     		if( ! iface->readOnly ) {
     		if (!iface->readOnly) {
     			canAdd = canEditAddress = TRUE;
+    		}
     		if( ! iface->haveLibrary ) {
     		if (!iface->haveLibrary) {
     			canAdd = canEditAddress = FALSE;
+    		}
     #ifdef USE_LDAP
     		if( ads->subType == ADDR_LDAP &&
     		    iface->haveLibrary && ds->rawDataSource ) {
     		if (ads->subType == ADDR_LDAP &&
     		    iface->haveLibrary && ds->rawDataSource) {
     			canLookup = TRUE;
+    		}
     #endif
+    	}
     	else if( pobj->type == ADDR_ITEM_FOLDER ) {
     		ds = addressbook_find_datasource( addrbook.treeSelected );
     		if( ds ) {
     	} else if (pobj->type == ADDR_ITEM_FOLDER) {
     		ds = addressbook_find_datasource(&iter);
     		if (ds) {
     			iface = ds->interface;
     			if( ! iface->readOnly ) {
     			if (!iface->readOnly) {
     				canAdd = canEditAddress = TRUE;
+    			}
+    		}
+    	}
     	else if( pobj->type == ADDR_ITEM_GROUP ) {
     		ds = addressbook_find_datasource( addrbook.treeSelected );
     		if( ds ) {
     	} else if (pobj->type == ADDR_ITEM_GROUP) {
     		ds = addressbook_find_datasource(&iter);
     		if (ds) {
     			iface = ds->interface;
     			if( ! iface->readOnly ) {
     			if (!iface->readOnly) {
     				canEditAddress = TRUE;
+    			}
+    		}
+    	}
     	if( obj == NULL ) canEditAddress = FALSE;
     	if (obj == NULL)
     		canEditAddress = FALSE;
     	canDelete = canEditAddress;
     	if( GTK_CLIST(addrbook.clist)->selection &&
     	    GTK_CLIST(addrbook.clist)->selection->next ) canEditAddress = FALSE;
     	if( _addressListSelection_ ) {
     	if (GTK_CLIST(addrbook.clist)->selection &&
     	    GTK_CLIST(addrbook.clist)->selection->next)
     		canEditAddress = FALSE;
     	if (_addressListSelection_) {
     		GList *cur;
     		AddressObject *item;
     		for( cur = _addressListSelection_; cur != NULL; cur = cur->next ) {
     		for (cur = _addressListSelection_; cur != NULL; cur = cur->next) {
     			item = cur->data;
     			if( item->type == ADDR_ITEM_PERSON ) {
     			if (item->type == ADDR_ITEM_PERSON) {
     				canCopy = TRUE;
     				break;
+    			}
+    		}
+    	}
     	if( _clipObjectList_ && canAdd ) canPaste = TRUE;
     	if (_clipObjectList_ && canAdd)
     		canPaste = TRUE;
     	/* Enable add */
     	menu_set_sensitive( addrbook.menu_factory, "/Address/New Address", canAdd );
-...
     	gtk_widget_set_sensitive( addrbook.lup_btn, canLookup );
+    }
     static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
     				      gint column, gpointer data)
     static void addressbook_tree_selection_changed(GtkTreeSelection *selection,
     					       gpointer data)
+    {
     	GtkTreeModel *model;
     	GtkTreeIter iter;
     	GtkTreePath *path;
     	AddressObject *obj = NULL;
     	AdapterDSource *ads = NULL;
     	AddressDataSource *ds = NULL;
     	ItemFolder *rootFolder = NULL;
     	if( addrbook.treeSelected == node ) return;
     	addrbook.treeSelected = node;
     	debug_print("addressbook_tree_selection_changed\n");
     	if (!gtk_tree_selection_get_selected(selection, &model, &iter)) {
     		debug_print("addressbook_tree_selection_changed: no selection\n");
     		gtk_tree_row_reference_free(addrbook.tree_selected);
     		addrbook.tree_selected = NULL;
     		gtk_tree_row_reference_free(addrbook.tree_opened);
     		addrbook.tree_opened = NULL;
     		addressbook_status_show("");
     		if (addrbook.entry)
     			gtk_entry_set_text(GTK_ENTRY(addrbook.entry), "");
     		if (addrbook.clist)
     			gtk_clist_clear(GTK_CLIST(addrbook.clist));
     		return;
+    	}
     	path = gtk_tree_model_get_path(model, &iter);
     	gtk_tree_row_reference_free(addrbook.tree_selected);
     	addrbook.tree_selected = gtk_tree_row_reference_new(model, path);
     	addrbook.listSelected = NULL;
     	addressbook_status_show( "" );
     	if( addrbook.entry != NULL ) gtk_entry_set_text(GTK_ENTRY(addrbook.entry), "");
     	addressbook_status_show("");
     	if (addrbook.entry)
     		gtk_entry_set_text(GTK_ENTRY(addrbook.entry), "");
     	if (addrbook.clist)
     		gtk_clist_clear(GTK_CLIST(addrbook.clist));
     	gtk_tree_model_get(model, &iter, COL_OBJ, &obj, -1);
     	if (obj == NULL) {
     		gtk_tree_path_free(path);
     		return;
+    	}
     	if( addrbook.clist ) gtk_clist_clear( GTK_CLIST(addrbook.clist) );
     	if( node ) obj = gtk_ctree_node_get_row_data( ctree, node );
     	if( obj == NULL ) return;
     	gtk_tree_row_reference_free(addrbook.tree_opened);
     	addrbook.tree_opened = gtk_tree_row_reference_new(model, path);
     	addrbook.opened = node;
     	if( obj->type == ADDR_DATASOURCE ) {
     	if (obj->type == ADDR_DATASOURCE) {
     		/* Read from file */
     		static gboolean tVal = TRUE;
     		ads = ADAPTER_DSOURCE(obj);
     		if( ads == NULL ) return;
     		if (ads == NULL) return;
     		ds = ads->dataSource;
     		if( ds == NULL ) return;
     		if (ds == NULL) return;
     		if( addrindex_ds_get_modify_flag( ds ) ) {
     			addrindex_ds_read_data( ds );
     		if (addrindex_ds_get_modify_flag(ds)) {
     			addrindex_ds_read_data(ds);
+    		}
     		if( ! addrindex_ds_get_read_flag( ds ) ) {
     			addrindex_ds_read_data( ds );
     		if (!addrindex_ds_get_read_flag(ds)) {
     			addrindex_ds_read_data(ds);
+    		}
     		addressbook_ds_show_message( ds );
     		addressbook_ds_show_message(ds);
     		if( ! addrindex_ds_get_access_flag( ds ) ) {
     		if (!addrindex_ds_get_access_flag(ds)) {
     			/* Remove existing folders and groups */
     			gtk_clist_freeze( GTK_CLIST(ctree) );
     			addressbook_tree_remove_children( ctree, node );
     			gtk_clist_thaw( GTK_CLIST(ctree) );
     			addressbook_tree_remove_children(model, &iter);
     			/* Load folders into the tree */
     			rootFolder = addrindex_ds_get_root_folder( ds );
     			if( ds->type == ADDR_IF_JPILOT ) {
     				addressbook_node_add_folder( node, ds, rootFolder, ADDR_CATEGORY );
     			rootFolder = addrindex_ds_get_root_folder(ds);
     			if (ds->type == ADDR_IF_JPILOT) {
     				addressbook_node_add_folder(&iter, ds, rootFolder, ADDR_CATEGORY, NULL);
     			} else {
     				addressbook_node_add_folder(&iter, ds, rootFolder, ADDR_ITEM_FOLDER, NULL);
+    			}
     			else {
     				addressbook_node_add_folder( node, ds, rootFolder, ADDR_ITEM_FOLDER );
+    			}
     			addrindex_ds_set_access_flag( ds, &tVal );
     			gtk_ctree_expand( ctree, node );
     			addrindex_ds_set_access_flag(ds, &tVal);
     			gtk_tree_view_expand_row(GTK_TREE_VIEW(addrbook.treeview), path, TRUE);
+    		}
+    	}
     	gtk_tree_path_free(path);
     	/* Update address list */
     	addressbook_set_clist( obj );
     	addressbook_set_clist(obj);
     	addressbook_menuitem_set_sensitive();
     	addressbook_list_select_clear();
+    }
     static void addressbook_list_selected(GtkCList *clist, gint row, gint column,
-...
+    }
     #endif
     static void addressbook_list_select_clear() {
     	if( _addressListSelection_ ) {
     		g_list_free( _addressListSelection_ );
     static void addressbook_list_select_clear(void)
+    {
     	if (_addressListSelection_) {
     		g_list_free(_addressListSelection_);
+    	}
     	_addressListSelection_ = NULL;
+    }
     static void addressbook_list_select_add( AddressObject *obj ) {
     	if( obj ) {
     		if(     obj->type == ADDR_ITEM_PERSON ||
     			obj->type == ADDR_ITEM_EMAIL ||
     			obj->type == ADDR_ITEM_GROUP ) {
     			if( ! g_list_find( _addressListSelection_, obj ) ) {
     				_addressListSelection_ = g_list_append( _addressListSelection_, obj );
     static void addressbook_list_select_add(AddressObject *obj)
+    {
     	if (obj) {
     		if (obj->type == ADDR_ITEM_PERSON ||
     		    obj->type == ADDR_ITEM_EMAIL ||
     		    obj->type == ADDR_ITEM_GROUP) {
     			if (!g_list_find(_addressListSelection_, obj)) {
     				_addressListSelection_ = g_list_append(_addressListSelection_, obj);
+    			}
+    		}
+    	}
     	/* addressbook_list_select_show(); */
+    }
     static void addressbook_list_select_remove( AddressObject *obj ) {
     	if( obj == NULL ) return;
     	if( _addressListSelection_ ) {
     		_addressListSelection_ = g_list_remove(	_addressListSelection_, obj );
     static void addressbook_list_select_remove(AddressObject *obj)
+    {
     	if (obj == NULL)
     		return;
     	if (_addressListSelection_) {
     		_addressListSelection_ = g_list_remove(_addressListSelection_, obj);
+    	}
     	/* addressbook_list_select_show(); */
+    }
     static void addressbook_list_row_selected( GtkCTree *clist, GtkCTreeNode *node, gint column, gpointer data ) {
     static void addressbook_list_row_selected(GtkCTree *clist, GtkCTreeNode *node, gint column, gpointer data)
+    {
     	GtkEntry *entry = GTK_ENTRY(addrbook.entry);
     	AddressObject *obj = NULL;
     	gtk_entry_set_text( entry, "" );
     	gtk_entry_set_text(entry, "");
     	addrbook.listSelected = node;
     	obj = gtk_ctree_node_get_row_data( clist, node );
     	if( obj != NULL ) {
     		addressbook_list_select_add( obj );
     	obj = gtk_ctree_node_get_row_data(clist, node);
     	if (obj != NULL) {
     		addressbook_list_select_add(obj);
+    	}
     	addressbook_menuitem_set_sensitive();
+    }
     static void addressbook_list_row_unselected( GtkCTree *ctree, GtkCTreeNode *node, gint column, gpointer data ) {
     static void addressbook_list_row_unselected(GtkCTree *clist, GtkCTreeNode *node, gint column, gpointer data)
+    {
     	AddressObject *obj;
     	obj = gtk_ctree_node_get_row_data( ctree, node );
     	if( obj != NULL ) {
     		addressbook_list_select_remove( obj );
     	obj = gtk_ctree_node_get_row_data(clist, node);
     	if (obj != NULL) {
     		addressbook_list_select_remove(obj);
+    	}
     	addressbook_menuitem_set_sensitive();
-...
     						GdkEventButton *event,
     						gpointer data)
+    {
     	if( ! event ) return FALSE;
     	if (!event)
     		return FALSE;
     	if( event->button == 3 ) {
     		gtk_menu_popup( GTK_MENU(addrbook.list_popup), NULL, NULL, NULL, NULL,
     		       event->button, event->time );
     	if (event->button == 3) {
     		gtk_menu_popup(GTK_MENU(addrbook.list_popup), NULL, NULL, NULL, NULL, event->button, event->time);
+    	}
     	return FALSE;
+    }
-...
     	return FALSE;
+    }
     static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
     static gboolean addressbook_tree_button_pressed(GtkWidget *widget,
     						GdkEventButton *event,
     						gpointer data)
+    {
     	GtkCList *clist = GTK_CLIST(ctree);
     	gint row, column;
     	GtkTreeView *treeview = GTK_TREE_VIEW(widget);
     	GtkTreeSelection *selection;
     	GtkTreePath *path;
     	if( ! event ) return FALSE;
     /* */
     	if( gtk_clist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
     		gtk_clist_select_row( clist, row, column );
     		gtkut_clist_set_focus_row(clist, row);
+    	}
     /* */
     	if (!event)
     		return FALSE;
     	if (!gtk_tree_view_get_path_at_pos(treeview, event->x, event->y,
     					   &path, NULL, NULL, NULL))
     		return TRUE;
     	selection = gtk_tree_view_get_selection(treeview);
     	addressbook_menuitem_set_sensitive();
     	if( event->button == 3 ) {
     		gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, NULL,
     	if (event->button == 3) {
     		gtk_tree_selection_select_path(selection, path);
     		gtk_menu_popup(GTK_MENU(addrbook.tree_popup),
     			       NULL, NULL, NULL, NULL,
     			       event->button, event->time);
+    	}
     	gtk_tree_path_free(path);
     	return FALSE;
+    }
     static gboolean addressbook_tree_button_released(GtkWidget *ctree,
     static gboolean addressbook_tree_button_released(GtkWidget *widget,
     						 GdkEventButton *event,
     						 gpointer data)
+    {
     #if 0
     	gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
     	gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree), addrbook.opened);
     #endif
     	return FALSE;
+    }
     static void addressbook_popup_close(GtkMenuShell *menu_shell, gpointer data)
+    {
     	if (!addrbook.opened) return;
     	GtkTreeView *treeview = GTK_TREE_VIEW(addrbook.treeview);
     	GtkTreeSelection *selection;
     	GtkTreePath *path;
     	gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
     	gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree),
     				  addrbook.opened);
     	g_print("addressbook_popup_close\n");
     	if (!addrbook.tree_opened)
     		return;
     	selection = gtk_tree_view_get_selection(treeview);
     	path = gtk_tree_row_reference_get_path(addrbook.tree_opened);
     	if (path) {
     		gtk_tree_selection_select_path(selection, path);
     		gtk_tree_path_free(path);
+    	}
+    }
     static void addressbook_new_folder_cb(gpointer data, guint action,
     				      GtkWidget *widget)
+    {
     	GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
     	GtkTreeView *treeview = GTK_TREE_VIEW(addrbook.treeview);
     	GtkTreeSelection *selection;
     	GtkTreeModel *model;
     	GtkTreeIter iter;
     	AddressObject *obj = NULL;
     	AddressDataSource *ds = NULL;
     	AddressBookFile *abf = NULL;
     	ItemFolder *parentFolder = NULL;
     	ItemFolder *folder = NULL;
     	if( ! addrbook.treeSelected ) return;
     	obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
     	if( obj == NULL ) return;
     	ds = addressbook_find_datasource( addrbook.treeSelected );
     	if( ds == NULL ) return;
     	selection = gtk_tree_view_get_selection(treeview);
     	if (!gtk_tree_selection_get_selected(selection, &model, &iter))
     		return;
     	if( obj->type == ADDR_DATASOURCE ) {
     		if( ADAPTER_DSOURCE(obj)->subType != ADDR_BOOK ) return;
+    	}
     	else if( obj->type == ADDR_ITEM_FOLDER ) {
     	gtk_tree_model_get(model, &iter, COL_OBJ, &obj, -1);
     	if (obj == NULL)
     		return;
     	ds = addressbook_find_datasource(&iter);
     	if (ds == NULL)
     		return;
     	if (obj->type == ADDR_DATASOURCE) {
     		if (ADAPTER_DSOURCE(obj)->subType != ADDR_BOOK) return;
     	} else if (obj->type == ADDR_ITEM_FOLDER) {
     		parentFolder = ADAPTER_FOLDER(obj)->itemFolder;
+    	}
     	else {
     	} else {
     		return;
+    	}
     	abf = ds->rawDataSource;
     	if( abf == NULL ) return;
     	folder = addressbook_edit_folder( abf, parentFolder, NULL );
     	if( folder ) {
     		GtkCTreeNode *nn;
     		nn = addressbook_node_add_folder( addrbook.treeSelected, ds, folder, ADDR_ITEM_FOLDER );
     		gtk_ctree_expand( ctree, addrbook.treeSelected );
     		if( addrbook.treeSelected == addrbook.opened ) addressbook_set_clist(obj);
     	if (abf == NULL) return;
     	folder = addressbook_edit_folder(abf, parentFolder, NULL);
     	if (folder) {
     		GtkTreeIter new_iter;
     		GtkTreePath *path;
     		addressbook_node_add_folder(&iter, ds, folder, ADDR_ITEM_FOLDER, &new_iter);
     		path = gtk_tree_model_get_path(model, &iter);
     		gtk_tree_view_expand_row(treeview, path, TRUE);
     		gtk_tree_path_free(path);
     		if (gtkut_tree_row_reference_equal(addrbook.tree_selected, addrbook.tree_opened))
     			addressbook_set_clist(obj);
+    	}
+    }
-...
     static void addressbook_new_group_cb(gpointer data, guint action,
     				     GtkWidget *widget)
+    {
     	GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
     	GtkTreeView *treeview = GTK_TREE_VIEW(addrbook.treeview);
     	GtkTreeSelection *selection;
     	GtkTreeModel *model;
     	GtkTreeIter iter;
     	AddressObject *obj = NULL;
     	AddressDataSource *ds = NULL;
     	AddressBookFile *abf = NULL;
     	ItemFolder *parentFolder = NULL;
     	ItemGroup *group = NULL;
     	if( ! addrbook.treeSelected ) return;
     	obj = gtk_ctree_node_get_row_data(ctree, addrbook.treeSelected);
     	if( obj == NULL ) return;
     	ds = addressbook_find_datasource( addrbook.treeSelected );
     	if( ds == NULL ) return;
     	selection = gtk_tree_view_get_selection(treeview);
     	if (!gtk_tree_selection_get_selected(selection, &model, &iter))
     		return;
     	if( obj->type == ADDR_DATASOURCE ) {
     		if( ADAPTER_DSOURCE(obj)->subType != ADDR_BOOK ) return;
+    	}
     	else if( obj->type == ADDR_ITEM_FOLDER ) {
     	gtk_tree_model_get(model, &iter, COL_OBJ, &obj, -1);
     	if (obj == NULL)
     		return;
     	ds = addressbook_find_datasource(&iter);
     	if (ds == NULL)
     		return;
     	if (obj->type == ADDR_DATASOURCE) {
     		if (ADAPTER_DSOURCE(obj)->subType != ADDR_BOOK) return;
     	} else if (obj->type == ADDR_ITEM_FOLDER) {
     		parentFolder = ADAPTER_FOLDER(obj)->itemFolder;
+    	}
     	else {
     	} else {
     		return;
+    	}
     	abf = ds->rawDataSource;
     	if( abf == NULL ) return;
     	group = addressbook_edit_group( abf, parentFolder, NULL );
     	if( group ) {
     		GtkCTreeNode *nn;
     		nn = addressbook_node_add_group( addrbook.treeSelected, ds, group );
     		gtk_ctree_expand( ctree, addrbook.treeSelected );
     		if( addrbook.treeSelected == addrbook.opened ) addressbook_set_clist(obj);
     	if (abf == NULL) return;
     	group = addressbook_edit_group(abf, parentFolder, NULL);
     	if (group) {
     		GtkTreeIter new_iter;
     		GtkTreePath *path;
     		addressbook_node_add_group(&iter, ds, group, &new_iter);
     		path = gtk_tree_model_get_path(model, &iter);
     		gtk_tree_view_expand_row(treeview, path, TRUE);
     		gtk_tree_path_free(path);
     		if (gtkut_tree_row_reference_equal(addrbook.tree_selected, addrbook.tree_opened))
     			addressbook_set_clist(obj);
+    	}
+    }
     static void addressbook_change_node_name(GtkCTreeNode *node, const gchar *name)
     static void addressbook_change_node_name(GtkTreeIter *iter, const gchar *name)
+    {
     	GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
     	gchar *text[1];
     	guint8 spacing;
     	GdkPixmap *pix_cl, *pix_op;
     	GdkBitmap *mask_cl, *mask_op;
     	gboolean is_leaf, expanded;
     	GtkTreeView *treeview = GTK_TREE_VIEW(addrbook.treeview);
     	GtkTreeStore *store;
     	gtk_ctree_get_node_info(ctree, node, text, &spacing,
     				&pix_cl, &mask_cl, &pix_op, &mask_op,
     				&is_leaf, &expanded);
     	gtk_ctree_set_node_info(ctree, node, name, spacing,
     				pix_cl, mask_cl, pix_op, mask_op,
     				is_leaf, expanded);
     	g_print("addressbook_change_node_name: name: %s\n", name);
     	store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
     	gtk_tree_store_set(store, iter, COL_FOLDER_NAME, name, -1);
+    }
     /*
-...
     *        node  Node in tree.
     * Return: New name of data source.
     */
     static gchar *addressbook_edit_datasource( AddressObject *obj, GtkCTreeNode *node ) {
     static gchar *addressbook_edit_datasource(AddressObject *obj, GtkTreeIter *iter)
+    {
     	gchar *newName = NULL;
     	AddressDataSource *ds = NULL;
     	AddressInterface *iface = NULL;
     	AdapterDSource *ads = NULL;
     	ds = addressbook_find_datasource( node );
     	if( ds == NULL ) return NULL;
     	ds = addressbook_find_datasource(iter);
     	if (ds == NULL)
     		return NULL;
     	iface = ds->interface;
     	if( ! iface->haveLibrary ) return NULL;
     	if (!iface->haveLibrary)
     		return NULL;
     	/* Read data from data source */
     	if( ! addrindex_ds_get_read_flag( ds ) ) {
     		addrindex_ds_read_data( ds );
     	if (!addrindex_ds_get_read_flag(ds)) {
     		addrindex_ds_read_data(ds);
+    	}
     	/* Handle edit */
     	ads = ADAPTER_DSOURCE(obj);
     	if( ads->subType == ADDR_BOOK ) {
                     if( addressbook_edit_book( _addressIndex_, ads ) == NULL ) return NULL;
+    	}
     	else if( ads->subType == ADDR_VCARD ) {
            	        if( addressbook_edit_vcard( _addressIndex_, ads ) == NULL ) return NULL;
+    	}
     	if (ads->subType == ADDR_BOOK) {
                     if (addressbook_edit_book(_addressIndex_, ads) == NULL)
     			return NULL;
     	} else if (ads->subType == ADDR_VCARD) {
            	        if (addressbook_edit_vcard(_addressIndex_, ads) == NULL)
     			return NULL;
     #ifdef USE_JPILOT
     	else if( ads->subType == ADDR_JPILOT ) {
                     if( addressbook_edit_jpilot( _addressIndex_, ads ) == NULL ) return NULL;
+    	}
     	} else if (ads->subType == ADDR_JPILOT) {
                     if (addressbook_edit_jpilot(_addressIndex_, ads) == NULL)
     			return NULL;
     #endif
     #ifdef USE_LDAP
     	else if( ads->subType == ADDR_LDAP ) {
     		if( addressbook_edit_ldap( _addressIndex_, ads ) == NULL ) return NULL;
+    	}
     	} else if (ads->subType == ADDR_LDAP) {
     		if (addressbook_edit_ldap(_addressIndex_, ads) == NULL)
     			return NULL;
     #endif
     	else {
     	} else {
     		return NULL;
+    	}
     	newName = obj->name;
-...
     * Edit an object that is in the address tree area.
     */
     static void addressbook_treenode_edit_cb(gpointer data, guint action,
     				       GtkWidget *widget)
     					 GtkWidget *widget)
+    {
     	GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
     	AddressObject *obj;
     	GtkTreeView *treeview = GTK_TREE_VIEW(addrbook.treeview);
     	GtkTreeSelection *selection;
     	GtkTreeModel *model;
     	GtkTreeIter iter, parent;
     	AddressObject *obj = NULL;
     	AddressDataSource *ds = NULL;
     	AddressBookFile *abf = NULL;
     	GtkCTreeNode *node = NULL, *parentNode = NULL;
     	gchar *name = NULL;
     	if( ! addrbook.treeSelected ) return;
     	node = addrbook.treeSelected;
     	if( GTK_CTREE_ROW(node)->level == 1 ) return;
     	obj = gtk_ctree_node_get_row_data( ctree, node );
     	if( obj == NULL ) return;
     	parentNode = GTK_CTREE_ROW(node)->parent;
     	g_print("addressbook_treenode_edit_cb\n");
     	ds = addressbook_find_datasource( node );
     	if( ds == NULL ) return;
     	selection = gtk_tree_view_get_selection(treeview);
     	if (!gtk_tree_selection_get_selected(selection, &model, &iter))
     		return;
     	if( obj->type == ADDR_DATASOURCE ) {
     		name = addressbook_edit_datasource( obj, node );
     		if( name == NULL ) return;
+    	}
     	else {
     	if (gtk_tree_store_iter_depth(GTK_TREE_STORE(model), &iter) == 0)
     		return;
     	gtk_tree_model_get(model, &iter, COL_OBJ, &obj, -1);
     	if (obj == NULL)
     		return;
     	if (!gtk_tree_model_iter_parent(model, &parent, &iter))
     		return;
     	ds = addressbook_find_datasource(&iter);
     	if (ds == NULL)
     		return;
     	if (obj->type == ADDR_DATASOURCE) {
     		name = addressbook_edit_datasource(obj, &iter);
     		if (name == NULL)
     			return;
     	} else {
     		abf = ds->rawDataSource;
     		if( abf == NULL ) return;
     		if( obj->type == ADDR_ITEM_FOLDER ) {
     		if (abf == NULL)
     			return;
     		if (obj->type == ADDR_ITEM_FOLDER) {
     			AdapterFolder *adapter = ADAPTER_FOLDER(obj);
     			ItemFolder *item = adapter->itemFolder;
     			ItemFolder *parentFolder = NULL;
     			parentFolder = ( ItemFolder * ) ADDRITEM_PARENT(item);
     			if( addressbook_edit_folder( abf, parentFolder, item ) == NULL ) return;
     			parentFolder = (ItemFolder *)ADDRITEM_PARENT(item);
     			if (addressbook_edit_folder(abf, parentFolder, item) == NULL)
     				return;
     			name = ADDRITEM_NAME(item);
+    		}
     		else if( obj->type == ADDR_ITEM_GROUP ) {
     		} else if (obj->type == ADDR_ITEM_GROUP) {
     			AdapterGroup *adapter = ADAPTER_GROUP(obj);
     			ItemGroup *item = adapter->itemGroup;
     			ItemFolder *parentFolder = NULL;
     			parentFolder = ( ItemFolder * ) ADDRITEM_PARENT(item);
     			if( addressbook_edit_group( abf, parentFolder, item ) == NULL ) return;
     			parentFolder = (ItemFolder *)ADDRITEM_PARENT(item);
     			if (addressbook_edit_group(abf, parentFolder, item) == NULL)
     				return;
     			name = ADDRITEM_NAME(item);
+    		}
+    	}
     	if( name && parentNode ) {
     	if (name) {
     		GtkTreePath *path;
     		g_print("addressbook_treenode_edit_cb: update tree\n");
     		/* Update node in tree view */
     		addressbook_change_node_name( node, name );
     		gtk_ctree_sort_node(ctree, parentNode);
     		gtk_ctree_expand( ctree, node );
     		addrbook.treeSelected = NULL;
     		gtk_ctree_select( ctree, node );
     		addressbook_change_node_name(&iter, name);
     		//gtk_ctree_sort_node(ctree, parentNode);
     		path = gtk_tree_model_get_path(model, &iter);
     		gtk_tree_view_expand_row(treeview, path, TRUE);
     		gtk_tree_view_set_cursor(treeview, path, NULL, FALSE);
     		gtk_tree_path_free(path);
+    	}
+    }
-...
     static void addressbook_treenode_delete_cb(gpointer data, guint action,
     					 GtkWidget *widget)
+    {
     	GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
     	GtkCTreeNode *node = NULL;
     	GtkTreeView *treeview = GTK_TREE_VIEW(addrbook.treeview);
     	GtkTreeSelection *selection;
     	GtkTreeModel *model;
     	GtkTreeIter iter, parent;
     	AddressObject *obj;
     	gchar *message;
     	AlertValue aval;
-...
     	AddressDataSource *ds = NULL;
     	gboolean remFlag = FALSE;
     	if( ! addrbook.treeSelected ) return;
     	node = addrbook.treeSelected;
     	if( GTK_CTREE_ROW(node)->level == 1 ) return;
     	g_print("addressbook_treenode_delete_cb\n");
     	obj = gtk_ctree_node_get_row_data( ctree, node );
     	selection = gtk_tree_view_get_selection(treeview);
     	if (!gtk_tree_selection_get_selected(selection, &model, &iter))
     		return;
     	if (gtk_tree_store_iter_depth(GTK_TREE_STORE(model), &iter) == 0)
     		return;

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff