commit 225ab1ccaf5316550576135f416b773d3f45360a parent 79d58875a8e9f1092e12c39321836da3424cfa39 Author: Paul <paul@claws-mail.org> Date: Mon, 7 Dec 2015 10:40:25 +0000 call 'new' address book 'alternate' address book Diffstat:
27 files changed, 131 insertions(+), 131 deletions(-)
diff --git a/configure.ac b/configure.ac @@ -275,9 +275,9 @@ AC_ARG_ENABLE(valgrind, [ --disable-valgrind Do not build valgrind support for debugging], [enable_valgrind=$enableval], [enable_valgrind=yes]) -AC_ARG_ENABLE(new-addrbook, - [ --enable-new-addrbook Build new external address book support], - [enable_new_addrbook=$enableval], [enable_new_addrbook=no]) +AC_ARG_ENABLE(alternate-addrbook, + [ --enable-alternate-addrbook Build alternate external address book support], + [enable_alternate_addrbook=$enableval], [enable_alternate_addrbook=no]) AC_ARG_ENABLE(gtk3, [ --enable-gtk3 Build GTK3 support], @@ -681,37 +681,37 @@ dnl # Configure address book support dnl ####################################################################### dnl ####################################################################### -dnl # Check for new address book support +dnl # Check for alternate address book support dnl ####################################################################### -AC_MSG_CHECKING([whether DBUS support for new address book is present]) +AC_MSG_CHECKING([whether DBUS support for alternate address book is present]) if test x"$enable_dbus_glib" = xyes; then AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([whether to enable new address book]) - if test x"$enable_new_addrbook" = xyes; then + AC_MSG_CHECKING([whether to enable alternate address book]) + if test x"$enable_alternate_addrbook" = xyes; then AC_MSG_RESULT([yes]) PKG_CHECK_MODULES(CONTACTS, [claws-contacts], [ - AC_DEFINE(USE_NEW_ADDRBOOK, 1, [Define if new address book is to be activated.]) - enable_new_addrbook=yes + AC_DEFINE(USE_ALT_ADDRBOOK, 1, [Define if alternate address book is to be activated.]) + enable_alternate_addrbook=yes AC_SUBST(CONTACTS_CFLAGS) AC_SUBST(CONTACTS_LIBS) ], [ - enable_new_addrbook=no + enable_alternate_addrbook=no ]) else AC_MSG_RESULT([no]) - enable_new_addrbook=no + enable_alternate_addrbook=no fi else AC_MSG_RESULT([no]) - enable_new_addrbook=no + enable_alternate_addrbook=no fi dnl ####################################################################### dnl # Check for old address book support dnl ####################################################################### -if test x"$enable_new_addrbook" = xno; then +if test x"$enable_alternate_addrbook" = xno; then dnl for LDAP support in addressbook dnl no check for libraries; dynamically loaded AC_MSG_CHECKING([whether to use LDAP]) @@ -817,7 +817,7 @@ if test x"$enable_new_addrbook" = xno; then fi fi -AM_CONDITIONAL(BUILD_NEWADDRBOOK, test x"$enable_new_addrbook" = x"yes") +AM_CONDITIONAL(BUILD_ALTADDRBOOK, test x"$enable_alternate_addrbook" = x"yes") dnl ####################################################################### dnl # Check for NetworkManager support @@ -1925,10 +1925,10 @@ dnl Output the configuration summary echo "" echo "$PACKAGE $VERSION" echo "" -if test x"$enable_new_addrbook" = xyes; then - echo "Using Address Book : New experimental interface" +if test x"$enable_alternate_addrbook" = xyes; then + echo "Using Address Book : Alternate experimental interface" else - echo "Using Address Book : Old stable interface" + echo "Using Address Book : Original stable interface" echo "JPilot : $enable_jpilot" echo "LDAP : $enable_ldap" fi diff --git a/src/Makefile.am b/src/Makefile.am @@ -33,9 +33,9 @@ claws_mail_res_ldflag = claws_mail_deps = endif -new_abook_source = \ +alt_abook_source = \ addressbook-dbus.c -old_abook_source = \ +orig_abook_source = \ addrbook.c \ addrclip.c \ addrcustomattr.c \ @@ -73,12 +73,12 @@ old_abook_source = \ pine.c \ vcard.c -if BUILD_NEWADDRBOOK -abook_source = $(new_abook_source) -abook_extra = $(old_abook_source) +if BUILD_ALTADDRBOOK +abook_source = $(alt_abook_source) +abook_extra = $(orig_abook_source) else -abook_source = $(old_abook_source) -abook_extra = $(new_abook_source) +abook_source = $(orig_abook_source) +abook_extra = $(alt_abook_source) endif abook_headers = \ @@ -357,7 +357,7 @@ BUILT_SOURCES = \ client-bindings.h client-bindings.h: claws-contacts.xml -if BUILD_NEWADDRBOOK +if BUILD_ALTADDRBOOK dbus-binding-tool --prefix=abook --mode=glib-client --output=$@ claws-contacts.xml CLEANFILES = \ diff --git a/src/addr_compl.c b/src/addr_compl.c @@ -46,7 +46,7 @@ #include "stock_pixmap.h" #include <pthread.h> -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addrindex.h" #else #include "addressbook-dbus.h" @@ -375,7 +375,7 @@ static void read_address_book(gchar *folderpath) { free_all_addresses(); free_completion_list(); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addrindex_load_completion( add_address, folderpath ); #else GError* error = NULL; @@ -857,7 +857,7 @@ static CompletionWindow *addrcompl_create_window( void ) { */ static void addrcompl_destroy_window( CompletionWindow *cw ) { /* Stop all searches currently in progress */ -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addrindex_stop_search( _queryID_ ); #endif /* Remove idler function... or application may not terminate */ @@ -1094,7 +1094,7 @@ static gboolean addrcompl_idle( gpointer data ) { * criteria. * \param data Query data. */ -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static gint addrcompl_callback_entry( gpointer sender, gint queryID, GList *listEMail, gpointer data ) { @@ -1166,7 +1166,7 @@ static void addrcompl_load_local( void ) { * Start the search. */ static void addrcompl_start_search( void ) { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK gchar *searchTerm; searchTerm = g_strdup( _compWindow_->searchTerm ); @@ -1186,7 +1186,7 @@ static void addrcompl_start_search( void ) { g_idle_add( (GSourceFunc) addrcompl_idle, NULL ); /* g_print( "addrindex_start_search::queryID=%d\n", _queryID_ ); */ -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addrindex_start_search( _queryID_ ); #else diff --git a/src/addressadd.c b/src/addressadd.c @@ -38,7 +38,7 @@ #include "prefs_common.h" #include "prefs_gtk.h" #include "addressadd.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addritem.h" #include "addrbook.h" #include "addrindex.h" @@ -50,7 +50,7 @@ #include "manage_window.h" #include "alertpanel.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK typedef struct { AddressBookFile *book; ItemFolder *folder; @@ -78,7 +78,7 @@ static GdkPixbuf *bookXpm; static gboolean addressadd_cancelled; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static FolderInfo *addressadd_create_folderinfo( AddressBookFile *abf, ItemFolder *folder ) { FolderInfo *fi = g_new0( FolderInfo, 1 ); @@ -94,7 +94,7 @@ static FolderInfo *addressadd_create_folderinfo(gchar* book) { } #endif -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void addressadd_free_folderinfo( FolderInfo *fi ) { fi->book = NULL; fi->folder = NULL; @@ -310,7 +310,7 @@ static void addressadd_create( void ) { &folderXpm ); } -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void addressadd_load_folder( GtkCMCTreeNode *parentNode, ItemFolder *parentFolder, FolderInfo *fiParent ) { @@ -411,7 +411,7 @@ static void addressadd_load_data() { } #endif -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name, const gchar *address, const gchar *remarks, GdkPixbuf *picture ) { #else @@ -419,7 +419,7 @@ gboolean addressadd_selection(const gchar *name, const gchar *address, const gchar *remarks, GdkPixbuf *picture ) { #endif gboolean retVal = FALSE; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK ItemPerson *person = NULL; #endif FolderInfo *fi = NULL; @@ -428,7 +428,7 @@ gboolean addressadd_selection(const gchar *name, const gchar *address, if( ! addressadd_dlg.window ) addressadd_create(); addressadd_dlg.fiSelected = NULL; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressadd_load_data( addrIndex ); #else addressadd_load_data(); @@ -467,7 +467,7 @@ gboolean addressadd_selection(const gchar *name, const gchar *address, fi = addressadd_dlg.fiSelected; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK person = addrbook_add_contact( fi->book, fi->folder, returned_name, address, @@ -541,7 +541,7 @@ gboolean addressadd_selection(const gchar *name, const gchar *address, #endif g_free(returned_name); g_free(returned_remarks); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK if( person ) retVal = TRUE; #endif } diff --git a/src/addressadd.h b/src/addressadd.h @@ -24,12 +24,12 @@ #ifndef __ADDRESS_ADD_H__ #define __ADDRESS_ADD_H__ -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addrindex.h" #endif #include "gtk/gtk.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name, const gchar *address, const gchar *remarks, GdkPixbuf *picture ); #else diff --git a/src/addrgather.c b/src/addrgather.c @@ -47,7 +47,7 @@ #include "prefs_gtk.h" #include "addrharvest.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addrindex.h" #include "addrbook.h" #else @@ -79,7 +79,7 @@ static struct _AddrHarvest { GtkWidget *labelFolder; GtkWidget *entryBook; GtkWidget *checkHeader[ NUM_FIELDS ]; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK GtkWidget *spinbtnFolder; #endif GtkWidget *checkRecurse; @@ -93,7 +93,7 @@ static struct _AddrHarvest { GtkWidget *clistCount; } addrgather_dlg; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static AddressIndex *_harv_addressIndex_; static AddressBookFile *_harv_addressBook_; #endif @@ -153,7 +153,7 @@ static gboolean addrgather_dlg_harvest() { gchar *text[ FIELDS_N_COLS ]; AddressHarvester *harvester; gchar *name; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK AddressBookFile *abf; gchar *newFile; #else @@ -164,7 +164,7 @@ static gboolean addrgather_dlg_harvest() { gchar str[ FMT_BUFSIZE ]; gint cnt; gint i; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK gint sz; name = gtk_editable_get_chars( GTK_EDITABLE(addrgather_dlg.entryBook), 0, -1 ); @@ -207,13 +207,13 @@ static gboolean addrgather_dlg_harvest() { /* Go fer it */ addrgather_dlg_status_show( _( "Collecting addresses..." ) ); GTK_EVENTS_FLUSH(); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK sz = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( addrgather_dlg.spinbtnFolder ) ); addrharvest_set_folder_size( harvester, sz ); #endif -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK /* Create address book */ abf = addrbook_create_book(); addrbook_set_path( abf, _harv_addressIndex_->filePath ); @@ -225,7 +225,7 @@ static gboolean addrgather_dlg_harvest() { #endif /* Harvest addresses */ -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addrharvest_harvest( harvester, abf->addressCache, _harv_messageList_ ); /* save address book */ @@ -315,7 +315,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl) GtkWidget *entryBook; GtkWidget *frameHeader; GtkWidget *checkHeader[NUM_FIELDS]; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK GtkWidget *hboxs; GtkWidget *spinbtnFolder; GtkAdjustment *adjFolder; @@ -323,7 +323,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl) GtkWidget *checkRecurse; gint top; gint i; -#ifdef USE_NEW_ADDRBOOK +#ifdef USE_ALT_ADDRBOOK GError* error = NULL; GSList *books, *cur; #endif @@ -363,7 +363,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl) gtk_table_attach( GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0 ); gtk_misc_set_alignment( GTK_MISC(label), 1.0, 0.5 ); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK entryBook = gtk_entry_new(); #else books = addressbook_dbus_get_books(&error); @@ -383,7 +383,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl) gtk_table_attach( GTK_TABLE(table), entryBook, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0 ); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK /* Third row */ top = 2; label = gtk_label_new(_("Address book folder size:")); @@ -429,7 +429,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl) addrgather_dlg.labelFolder = labelFolder; addrgather_dlg.entryBook = entryBook; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addrgather_dlg.spinbtnFolder = spinbtnFolder; #endif addrgather_dlg.checkRecurse = checkRecurse; @@ -571,7 +571,7 @@ static void addrgather_dlg_create(void) * msgList List of message numbers, or NULL to process folder. * Return: Populated address book file, or NULL if none created. */ -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK AddressBookFile *addrgather_dlg_execute(FolderItem *folderItem, AddressIndex *addrIndex, gboolean sourceInd, GList *msgList) #else @@ -580,7 +580,7 @@ void addrgather_dlg_execute(FolderItem *folderItem, gboolean sourceInd, GList *m { gint i; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK _harv_addressIndex_ = addrIndex; _harv_addressBook_ = NULL; #endif @@ -598,7 +598,7 @@ void addrgather_dlg_execute(FolderItem *folderItem, gboolean sourceInd, GList *m /* Setup some default values */ gtk_label_set_text(GTK_LABEL(addrgather_dlg.labelFolder), folderItem->path); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK gtk_entry_set_text(GTK_ENTRY(addrgather_dlg.entryBook), folderItem->path); #endif @@ -637,7 +637,7 @@ void addrgather_dlg_execute(FolderItem *folderItem, gboolean sourceInd, GList *m addrgather_dlg.folderPath = NULL; gtk_widget_hide(addrgather_dlg.window); gtk_window_set_modal(GTK_WINDOW(addrgather_dlg.window), FALSE); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK _harv_addressIndex_ = NULL; if (addrgather_dlg.cancelled == TRUE) diff --git a/src/addrgather.h b/src/addrgather.h @@ -27,7 +27,7 @@ /* Function prototypes */ #include "folder.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addrbook.h" AddressBookFile *addrgather_dlg_execute( FolderItem *folderItem, diff --git a/src/addrharvest.c b/src/addrharvest.c @@ -32,7 +32,7 @@ #include "addrharvest.h" #include "codeconv.h" #include "addritem.h" -#ifdef USE_NEW_ADDRBOOK +#ifdef USE_ALT_ADDRBOOK #include "addressbook-dbus.h" #endif @@ -66,7 +66,7 @@ struct _HeaderEntry { gint count; }; -#ifdef USE_NEW_ADDRBOOK +#ifdef USE_ALT_ADDRBOOK typedef enum { FIRST = 0, LAST, @@ -280,7 +280,7 @@ void addrharvest_free( AddressHarvester *harvester ) { g_free( harvester ); } -#ifdef USE_NEW_ADDRBOOK +#ifdef USE_ALT_ADDRBOOK static gchar* get_namepart(const gchar* name, Namepart namepart) { gchar *pos, *part = NULL; gchar *token = g_strdup(name); @@ -319,7 +319,7 @@ static void addrharvest_insert_cache( AddressCache *cache, const gchar *name, const gchar *address ) { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK ItemPerson *person; ItemFolder *folder; gchar *folderName; @@ -343,7 +343,7 @@ static void addrharvest_insert_cache( /* Insert address */ key = g_utf8_strdown( address, -1 ); person = g_hash_table_lookup( harvester->dupTable, key ); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK if( person ) { /* Update existing person to use longest name */ value = ADDRITEM_NAME(person); @@ -583,7 +583,7 @@ static void addrharvest_parse_address( name = conv_unmime_header(buffer, NULL, TRUE); /* Insert into address book */ -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addrharvest_insert_cache( harvester, entry, cache, name, email ); #else @@ -852,12 +852,12 @@ gint addrharvest_harvest( retVal = MGU_BAD_ARGS; cm_return_val_if_fail( harvester != NULL, retVal ); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK cm_return_val_if_fail( cache != NULL, retVal ); #endif cm_return_val_if_fail( harvester->path != NULL, retVal ); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK /* Clear cache */ addrcache_clear( cache ); cache->dataRead = FALSE; @@ -887,7 +887,7 @@ gint addrharvest_harvest( } mgu_free_dlist( listHdr ); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK /* Mark cache */ cache->modified = FALSE; cache->dataRead = TRUE; diff --git a/src/addrharvest.h b/src/addrharvest.h @@ -47,7 +47,7 @@ struct _AddressHarvester { gboolean folderRecurse; }; -#ifdef USE_NEW_ADDRBOOK +#ifdef USE_ALT_ADDRBOOK typedef struct { gchar* first_name; gchar* last_name; diff --git a/src/compose.c b/src/compose.c @@ -61,7 +61,7 @@ #include "main.h" #include "mainwindow.h" #include "compose.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #else #include "addressbook-dbus.h" @@ -6798,7 +6798,7 @@ static void compose_add_to_addressbook_cb(GtkMenuItem *menuitem, gpointer user_d if (*address != '\0') { gchar *name = procheader_get_fromname(address); extract_address(address); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_add_contact(name, address, NULL, NULL); #else debug_print("%s: %s\n", name, address); @@ -8082,7 +8082,7 @@ static Compose *compose_create(PrefsAccount *account, gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))), prefs_common_translated_header_name("Newsgroups:")); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_set_target_compose(compose); #endif if (mode != COMPOSE_REDIRECT) @@ -8850,7 +8850,7 @@ static void compose_destroy(Compose *compose) g_free(compose->privacy_system); g_free(compose->encdata); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK if (addressbook_get_target_compose() == compose) addressbook_set_target_compose(NULL); #endif @@ -10495,7 +10495,7 @@ static void compose_address_cb(GtkAction *action, gpointer data) { Compose *compose = (Compose *)data; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_open(compose); #else GError* error = NULL; diff --git a/src/filtering.c b/src/filtering.c @@ -34,7 +34,7 @@ #include "compose.h" #include "prefs_common.h" #include "addritem.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addrbook.h" #include "addressbook.h" #else @@ -468,7 +468,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info) case MATCHACTION_ADD_TO_ADDRESSBOOK: { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK AddressDataSource *book = NULL; AddressBookFile *abf = NULL; ItemFolder *folder = NULL; @@ -477,7 +477,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info) Header *header; gint errors = 0; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK if (!addressbook_peek_folder_exists(action->destination, &book, &folder)) { g_warning("addressbook folder not found '%s'", action->destination?action->destination:"(null)"); return FALSE; @@ -519,7 +519,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info) gchar *name = procheader_get_fromname(walk->data); debug_print("adding address '%s' to addressbook '%s'\n", stripped_addr, action->destination); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK if (!addrbook_add_contact(abf, folder, name, stripped_addr, NULL)) { #else if (!addressadd_selection(name, stripped_addr, NULL, NULL)) { diff --git a/src/headerview.c b/src/headerview.c @@ -260,7 +260,7 @@ static gint headerview_show_avatar (HeaderView *headerview, MsgInfo *msginfo) static void headerview_save_contact_pic (HeaderView *headerview, MsgInfo *msginfo) { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK gchar *filename = NULL; GError *error = NULL; GdkPixbuf *picture = NULL; @@ -290,7 +290,7 @@ static void headerview_save_contact_pic (HeaderView *headerview, MsgInfo *msginf static gint headerview_show_contact_pic (HeaderView *headerview, MsgInfo *msginfo) { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK GtkWidget *hbox = headerview->hbox; GtkWidget *image; gchar *filename = NULL; diff --git a/src/main.c b/src/main.c @@ -102,7 +102,7 @@ #include "manage_window.h" #include "alertpanel.h" #include "statusbar.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #else #include "addressbook-dbus.h" @@ -1264,7 +1264,7 @@ int main(int argc, char *argv[]) prefs_actions_read_config(); prefs_display_header_read_config(); /* prefs_filtering_read_config(); */ -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_read_file(); #else g_clear_error(&error); @@ -1631,7 +1631,7 @@ static void exit_claws(MainWindow *mainwin) prefs_common_write_config(); account_write_config_all(); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_export_to_file(); #endif filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL); @@ -1674,7 +1674,7 @@ static void exit_claws(MainWindow *mainwin) prefs_toolbar_done(); avatars_done(); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_destroy(); #endif prefs_themes_done(); diff --git a/src/mainwindow.c b/src/mainwindow.c @@ -55,7 +55,7 @@ #include "prefs_template.h" #include "action.h" #include "account.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #else #include "addressbook-dbus.h" @@ -2320,7 +2320,7 @@ static gboolean reflect_prefs_timeout_cb(gpointer data) folderview_reinit_fonts(mainwin->folderview); summary_reflect_prefs_pixmap_theme(mainwin->summaryview); foldersel_reflect_prefs_pixmap_theme(); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_reflect_prefs_pixmap_theme(); #endif #ifndef GENERIC_UMPC @@ -4285,7 +4285,7 @@ static void online_switch_clicked (GtkButton *btn, gpointer data) static void addressbook_open_cb(GtkAction *action, gpointer data) { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_open(NULL); #else GError* error = NULL; diff --git a/src/messageview.c b/src/messageview.c @@ -68,7 +68,7 @@ #include "statusbar.h" #include "folder_item_prefs.h" #include "avatars.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #else #include "addressadd.h" @@ -2835,7 +2835,7 @@ static void reply_cb(GtkAction *gaction, gpointer data) static void addressbook_open_cb(GtkAction *action, gpointer data) { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_open(NULL); #else GError* error = NULL; @@ -2874,7 +2874,7 @@ static void add_address_cb(GtkAction *action, gpointer data) if (avatarr->image != NULL) picture = gtk_image_get_pixbuf(GTK_IMAGE(avatarr->image)); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_add_contact(msginfo->fromname, from, NULL, picture); #else if (addressadd_selection(msginfo->fromname, from, NULL, picture)) { diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c @@ -64,7 +64,7 @@ static PrefParam param[] = { {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL} }; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void select_addressbook_clicked_cb(GtkWidget *widget, gpointer data) { const gchar *folderpath = NULL; gchar *new_path = NULL; @@ -120,7 +120,7 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page, path_button = gtk_button_new_with_label(_("Select...")); gtk_box_pack_start(GTK_BOX(path_hbox), path_button, FALSE, FALSE, 0); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK g_signal_connect(G_OBJECT (path_button), "clicked", G_CALLBACK (select_addressbook_clicked_cb), path_entry); diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c @@ -90,7 +90,7 @@ static void spam_handle_combobox_callback(GtkWidget *widget, gpointer user_data) } } -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void bogofilter_whitelist_ab_select_cb(GtkWidget *widget, gpointer data) { struct BogofilterPage *page = (struct BogofilterPage *) data; @@ -313,7 +313,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page, SET_TOGGLE_SENSITIVITY(save_unsure_checkbtn, save_unsure_folder_entry); SET_TOGGLE_SENSITIVITY(save_unsure_checkbtn, save_unsure_folder_select); SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, whitelist_ab_folder_combo); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, whitelist_ab_select_btn); #endif SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, learn_from_whitelist_chkbtn); @@ -324,7 +324,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page, G_CALLBACK(foldersel_cb), save_spam_folder_entry); g_signal_connect(G_OBJECT(save_unsure_folder_select), "clicked", G_CALLBACK(foldersel_cb), save_unsure_folder_entry); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK g_signal_connect(G_OBJECT (whitelist_ab_select_btn), "clicked", G_CALLBACK(bogofilter_whitelist_ab_select_cb), page); #else diff --git a/src/plugins/bsfilter/bsfilter_gtk.c b/src/plugins/bsfilter/bsfilter_gtk.c @@ -77,7 +77,7 @@ static void foldersel_cb(GtkWidget *widget, gpointer data) } } -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void bsfilter_whitelist_ab_select_cb(GtkWidget *widget, gpointer data) { struct BsfilterPage *page = (struct BsfilterPage *) data; @@ -244,7 +244,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page, g_signal_connect(G_OBJECT(save_spam_folder_select), "clicked", G_CALLBACK(foldersel_cb), save_spam_folder_entry); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK g_signal_connect(G_OBJECT (whitelist_ab_select_btn), "clicked", G_CALLBACK(bsfilter_whitelist_ab_select_cb), page); #else diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c @@ -30,7 +30,7 @@ #include "mainwindow.h" #include "procmsg.h" #include "folder.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addrindex.h" #endif #include "common/utils.h" @@ -385,7 +385,7 @@ static gboolean notification_libnotify_create(MsgInfo *msginfo, /* Icon */ pixbuf = NULL; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK if(msginfo && msginfo->from) { gchar *icon_path; icon_path = addrindex_get_picture_file(msginfo->from); diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c @@ -41,7 +41,7 @@ #include "prefs_common.h" #include "alertpanel.h" #include "gtk/menu.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #include "addrindex.h" #else @@ -472,7 +472,7 @@ static void trayicon_compose_acc_cb(GtkMenuItem *menuitem, gpointer data) static void trayicon_addressbook_cb(GtkAction *action, gpointer data) { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_open(NULL); #else GError* error = NULL; @@ -648,7 +648,7 @@ static gboolean notification_trayicon_popup_create(MsgInfo *msginfo, /* Icon */ pixbuf = NULL; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK if(msginfo && msginfo->from) { gchar *icon_path; icon_path = addrindex_get_picture_file(msginfo->from); diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c @@ -92,7 +92,7 @@ struct Transport transports[] = { { N_("Unix Socket"), SPAMASSASSIN_TRANSPORT_UNIX, PAGE_UNIX, 0 }, }; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void spamassassin_whitelist_ab_select_cb(GtkWidget *widget, gpointer data) { struct SpamAssassinPage *page = (struct SpamAssassinPage *) data; @@ -458,14 +458,14 @@ static void spamassassin_create_widget_func(PrefsPage * _page, SET_TOGGLE_SENSITIVITY(enable_sa_checkbtn, hbox_process_emails); SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, mark_as_read_checkbtn); SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, whitelist_ab_folder_combo); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, whitelist_ab_select_btn); #endif config = spamassassin_get_config(); g_signal_connect(G_OBJECT(save_spam_folder_select), "clicked", G_CALLBACK(foldersel_cb), page); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK g_signal_connect(G_OBJECT (whitelist_ab_select_btn), "clicked", G_CALLBACK(spamassassin_whitelist_ab_select_cb), page); #else diff --git a/src/prefs_common.c b/src/prefs_common.c @@ -60,7 +60,7 @@ #include "stock_pixmap.h" #include "prefswindow.h" #include "colorlabel.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addrcustomattr.h" #endif @@ -1283,7 +1283,7 @@ void prefs_common_read_config(void) prefs_common_read_history(MESSAGE_SEARCH_HISTORY); prefs_common.compose_save_to_history = prefs_common_read_history(COMPOSE_SAVE_TO_HISTORY); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK prefs_common.addressbook_custom_attributes = addressbook_update_custom_attr_from_prefs(); #endif colorlabel_update_colortable_from_prefs(); @@ -1382,7 +1382,7 @@ void prefs_common_write_config(void) prefs_common_save_history(COMPOSE_SAVE_TO_HISTORY, prefs_common.compose_save_to_history); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK prefs_common_save_history_to_dir(ADDRBOOK_DIR, ADDRESSBOOK_CUSTOM_ATTRIBUTES, prefs_common.addressbook_custom_attributes); diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c @@ -56,7 +56,7 @@ #include "colorlabel.h" #include "combobox.h" #include "account.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #endif @@ -81,7 +81,7 @@ static gint prefs_filtering_action_deleted(GtkWidget *widget, static void prefs_filtering_action_type_selection_changed(GtkWidget *widget, gpointer user_data); static void prefs_filtering_action_select_dest(void); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void prefs_filtering_action_select_addressbook(void); #endif static void prefs_filtering_action_up(void); @@ -127,7 +127,7 @@ static struct FilteringAction_ { #endif GtkWidget *header_combo; GtkWidget *header_entry; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK GtkWidget *addressbook_btn; #endif GtkWidget *score_entry; @@ -350,7 +350,7 @@ static void prefs_filtering_action_create(void) GtkWidget *account_combo; GtkWidget *header_combo; GtkWidget *header_entry; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK GtkWidget *addressbook_btn; #endif GtkWidget *dest_entry; @@ -576,7 +576,7 @@ static void prefs_filtering_action_create(void) G_CALLBACK(prefs_filtering_action_select_dest), NULL); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_btn = gtk_button_new_with_label (_("Select...")); gtk_box_pack_start (GTK_BOX (hbox1), addressbook_btn, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (addressbook_btn), "clicked", @@ -677,7 +677,7 @@ static void prefs_filtering_action_create(void) filtering_action.score_entry = score_entry; filtering_action.header_combo = header_combo; filtering_action.header_entry = header_entry; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK filtering_action.addressbook_btn = addressbook_btn; #endif filtering_action.ok_btn = ok_btn; @@ -1302,7 +1302,7 @@ static void prefs_filtering_action_select_dest(void) g_free(path); } -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void prefs_filtering_action_select_addressbook(void) { const gchar *folderpath = NULL; @@ -1407,7 +1407,7 @@ static void prefs_filtering_action_type_selection_changed(GtkWidget *combo, prefs_filtering_action_enable_widget(filtering_action.header_combo, (value == ACTION_ADD_TO_ADDRESSBOOK)); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK prefs_filtering_action_enable_widget(filtering_action.addressbook_btn, (value == ACTION_ADD_TO_ADDRESSBOOK)); #endif diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c @@ -55,11 +55,11 @@ #include "matcher_parser.h" #include "colorlabel.h" #include "tags.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #endif -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void prefs_matcher_addressbook_select(void); #endif static void prefs_matcher_test_info(GtkWidget *widget, GtkWidget *parent); @@ -678,7 +678,7 @@ static void prefs_matcher_create(void) addressbook_select_btn = gtk_button_new_with_label(_("Select...")); gtk_box_pack_start(GTK_BOX(upper_hbox), addressbook_select_btn, FALSE, FALSE, 0); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK g_signal_connect(G_OBJECT (addressbook_select_btn), "clicked", G_CALLBACK(prefs_matcher_addressbook_select), NULL); @@ -859,7 +859,7 @@ static void prefs_matcher_create(void) matcher.regexp_checkbtn = regexp_checkbtn; matcher.bool_op_combo = bool_op_combo; matcher.test_btn = test_btn; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK matcher.addressbook_select_btn = addressbook_select_btn; #endif #if !GTK_CHECK_VERSION(3, 0, 0) @@ -2197,7 +2197,7 @@ static void prefs_matcher_test_info(GtkWidget *widget, GtkWidget *parent) description_window_create(&test_desc_win); } -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void prefs_matcher_addressbook_select(void) { const gchar *folderpath = NULL; diff --git a/src/summaryview.c b/src/summaryview.c @@ -57,7 +57,7 @@ #include "colorlabel.h" #include "inc.h" #include "imap.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #else #include "addressbook-dbus.h" @@ -4738,7 +4738,7 @@ void summary_add_address(SummaryView *summaryview) if (avatarr->image) picture = gtk_image_get_pixbuf(GTK_IMAGE(avatarr->image)); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_add_contact(msginfo->fromname, from, NULL, picture); #else if (addressadd_selection(msginfo->fromname, from, NULL, picture)) { diff --git a/src/textview.c b/src/textview.c @@ -48,7 +48,7 @@ #include "html.h" #include "enriched.h" #include "compose.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #include "addrindex.h" #else @@ -2034,7 +2034,7 @@ void textview_show_icon(TextView *textview, const gchar *stock_id) static void textview_save_contact_pic(TextView *textview) { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK MsgInfo *msginfo = textview->messageview->msginfo; gchar *filename = NULL; GError *error = NULL; @@ -2068,7 +2068,7 @@ static void textview_save_contact_pic(TextView *textview) static void textview_show_contact_pic(TextView *textview) { -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK MsgInfo *msginfo = textview->messageview->msginfo; GtkTextView *text = GTK_TEXT_VIEW(textview->text); int x = 0; @@ -3150,7 +3150,7 @@ static void add_uri_to_addrbook_cb (GtkAction *action, TextView *textview) avatars_avatarrender_free(avatarr); } -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_add_contact( fromname, fromaddress, NULL, picture); #else if (addressadd_selection(fromname, fromaddress, NULL, picture)) { diff --git a/src/toolbar.c b/src/toolbar.c @@ -60,7 +60,7 @@ #include "imap.h" #include "account.h" #include "send_message.h" -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK #include "addressbook.h" #else #include "addressbook-dbus.h" @@ -1311,7 +1311,7 @@ static void toolbar_addrbook_cb(GtkWidget *widget, gpointer data) default: return; } -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK addressbook_open(compose); #else GError* error = NULL;