/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
#include <string.h>
#include <setjmp.h>
+#include <sys/types.h>
+#include <dirent.h>
#include "main.h"
#include "addressbook.h"
#include "addrbook.h"
#include "addrindex.h"
#include "addressadd.h"
+#include "addrduplicates.h"
#include "addressbook_foldersel.h"
#include "vcard.h"
#include "editvcard.h"
#include "exphtmldlg.h"
#include "expldifdlg.h"
#include "browseldap.h"
-
+#include "addrcustomattr.h"
+#ifdef G_OS_WIN32
+#undef interface
+#endif
typedef enum
{
COL_SOURCES = 0,
#define ADDRESSBOOK_MSGBUF_SIZE 2048
-static GdkPixmap *folderxpm;
-static GdkBitmap *folderxpmmask;
-static GdkPixmap *folderopenxpm;
-static GdkBitmap *folderopenxpmmask;
-static GdkPixmap *groupxpm;
-static GdkBitmap *groupxpmmask;
-static GdkPixmap *interfacexpm;
-static GdkBitmap *interfacexpmmask;
-static GdkPixmap *bookxpm;
-static GdkBitmap *bookxpmmask;
-static GdkPixmap *addressxpm;
-static GdkBitmap *addressxpmmask;
-static GdkPixmap *vcardxpm;
-static GdkBitmap *vcardxpmmask;
-static GdkPixmap *jpilotxpm;
-static GdkBitmap *jpilotxpmmask;
-static GdkPixmap *categoryxpm;
-static GdkBitmap *categoryxpmmask;
-static GdkPixmap *ldapxpm;
-static GdkBitmap *ldapxpmmask;
-static GdkPixmap *addrsearchxpm;
-static GdkPixmap *addrsearchxpmmask;
+static GdkPixbuf *folderxpm = NULL;
+static GdkPixbuf *folderopenxpm = NULL;
+static GdkPixbuf *groupxpm = NULL;
+static GdkPixbuf *interfacexpm = NULL;
+static GdkPixbuf *bookxpm = NULL;
+static GdkPixbuf *addressxpm = NULL;
+static GdkPixbuf *vcardxpm = NULL;
+static GdkPixbuf *jpilotxpm = NULL;
+static GdkPixbuf *categoryxpm = NULL;
+static GdkPixbuf *ldapxpm = NULL;
+static GdkPixbuf *addrsearchxpm = NULL;
/* Message buffer */
static gchar addressbook_msgbuf[ ADDRESSBOOK_MSGBUF_SIZE ];
static void addressbook_create (void);
static gint addressbook_close (void);
-static void addressbook_button_set_sensitive (void);
static gboolean address_index_has_focus = FALSE;
static gboolean address_list_has_focus = FALSE;
static void addressbook_close_clicked (GtkButton *button,
gpointer data);
-static void addressbook_tree_selected (GtkCTree *ctree,
- GtkCTreeNode *node,
+static void addressbook_tree_selected (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gint column,
gpointer data);
-static void addressbook_select_row_tree (GtkCTree *ctree,
- GtkCTreeNode *node,
+static void addressbook_select_row_tree (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gint column,
gpointer data);
-static void addressbook_list_row_selected (GtkCTree *clist,
- GtkCTreeNode *node,
+static void addressbook_list_row_selected (GtkCMCTree *clist,
+ GtkCMCTreeNode *node,
gint column,
gpointer data);
-static void addressbook_list_row_unselected (GtkCTree *clist,
- GtkCTreeNode *node,
+static void addressbook_list_row_unselected (GtkCMCTree *clist,
+ GtkCMCTreeNode *node,
gint column,
gpointer data);
-static void addressbook_person_expand_node (GtkCTree *ctree,
+static void addressbook_person_expand_node (GtkCMCTree *ctree,
GList *node,
gpointer *data );
-static void addressbook_person_collapse_node (GtkCTree *ctree,
+static void addressbook_person_collapse_node (GtkCMCTree *ctree,
GList *node,
gpointer *data );
+static void addressbook_entry_activated (GtkWidget *widget,
+ gpointer data);
+
static gboolean addressbook_list_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
GdkEventButton *event,
gpointer data);
-static void addressbook_new_folder_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void addressbook_new_group_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void addressbook_treenode_edit_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void addressbook_treenode_delete_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void addressbook_change_node_name (GtkCTreeNode *node,
+static void addressbook_new_folder_cb (GtkAction *action,
+ gpointer data);
+static void addressbook_new_group_cb (GtkAction *action,
+ gpointer data);
+static void addressbook_treenode_edit_cb (GtkAction *action,
+ gpointer data);
+static void addressbook_treenode_delete_cb (GtkAction *action,
+ gpointer data);
+
+static void addressbook_change_node_name (GtkCMCTreeNode *node,
const gchar *name);
-static void addressbook_new_address_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void addressbook_edit_address_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void addressbook_delete_address_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void close_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void addressbook_file_save_cb (gpointer data,
- guint action,
- GtkWidget *widget);
+static void addressbook_new_address_cb (GtkAction *action,
+ gpointer data);
+static void addressbook_edit_address_cb (GtkAction *action,
+ gpointer data);
+static void addressbook_delete_address_cb (GtkAction *action,
+ gpointer data);
+
+static void close_cb (GtkAction *action,
+ gpointer data);
+static void addressbook_file_save_cb (GtkAction *action,
+ gpointer data);
/* Data source edit stuff */
-static void addressbook_new_book_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void addressbook_new_vcard_cb (gpointer data,
- guint action,
- GtkWidget *widget);
+static void addressbook_new_book_cb (GtkAction *action,
+ gpointer data);
+static void addressbook_new_vcard_cb (GtkAction *action,
+ gpointer data);
#ifdef USE_JPILOT
-static void addressbook_new_jpilot_cb (gpointer data,
- guint action,
- GtkWidget *widget);
+static void addressbook_new_jpilot_cb (GtkAction *action,
+ gpointer data);
#endif
#ifdef USE_LDAP
-static void addressbook_new_ldap_cb (gpointer data,
- guint action,
- GtkWidget *widget);
+static void addressbook_new_ldap_cb (GtkAction *action,
+ gpointer data);
#endif
static void addressbook_set_clist (AddressObject *obj,
static void addressbook_load_tree (void);
void addressbook_read_file (void);
-static GtkCTreeNode *addressbook_add_object (GtkCTreeNode *node,
+static GtkCMCTreeNode *addressbook_add_object (GtkCMCTreeNode *node,
AddressObject *obj);
static void addressbook_treenode_remove_item ( void );
static AddressDataSource *addressbook_find_datasource
- (GtkCTreeNode *node );
+ (GtkCMCTreeNode *node );
static AddressBookFile *addressbook_get_book_file(void);
-static GtkCTreeNode *addressbook_node_add_folder
- (GtkCTreeNode *node,
+static GtkCMCTreeNode *addressbook_node_add_folder
+ (GtkCMCTreeNode *node,
AddressDataSource *ds,
ItemFolder *itemFolder,
AddressObjectType otype);
-static GtkCTreeNode *addressbook_node_add_group (GtkCTreeNode *node,
+static GtkCMCTreeNode *addressbook_node_add_group (GtkCMCTreeNode *node,
AddressDataSource *ds,
ItemGroup *itemGroup);
-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,
+static void addressbook_tree_remove_children (GtkCMCTree *ctree,
+ GtkCMCTreeNode *parent);
+static void addressbook_move_nodes_up (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node);
+static GtkCMCTreeNode *addressbook_find_group_node (GtkCMCTreeNode *parent,
ItemGroup *group);
static gboolean addressbook_entry_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static gint addressbook_treenode_compare_func (GtkCList *clist,
+static gint addressbook_treenode_compare_func (GtkCMCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static void addressbook_folder_load_one_person (GtkCTree *clist,
+static void addressbook_folder_load_one_person (GtkCMCTree *clist,
ItemPerson *person,
AddressTypeControlItem *atci,
AddressTypeControlItem *atciMail);
-static void addressbook_folder_refresh_one_person(GtkCTree *clist,
+static void addressbook_folder_refresh_one_person(GtkCMCTree *clist,
ItemPerson *person);
-static void addressbook_folder_remove_one_person(GtkCTree *clist,
+static void addressbook_folder_remove_one_person(GtkCMCTree *clist,
ItemPerson *person);
-static void addressbook_folder_remove_node (GtkCTree *clist,
- GtkCTreeNode *node);
+static void addressbook_folder_remove_node (GtkCMCTree *clist,
+ GtkCMCTreeNode *node);
static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
gboolean force_focus );
AddressDataSource *ds );
static void addressbook_list_select_remove ( AddrItemObject *aio );
-static void addressbook_import_ldif_cb ( void );
-static void addressbook_import_mutt_cb ( void );
-static void addressbook_import_pine_cb ( void );
-static void addressbook_export_html_cb ( void );
-static void addressbook_export_ldif_cb ( void );
-static void addressbook_select_all_cb ( void );
-static void addressbook_clip_cut_cb ( void );
-static void addressbook_clip_copy_cb ( void );
-static void addressbook_clip_paste_cb ( void );
-static void addressbook_treenode_cut_cb ( void );
-static void addressbook_treenode_copy_cb ( void );
-static void addressbook_treenode_paste_cb ( void );
-
-static void addressbook_mail_to_cb ( void );
+static void addressbook_import_ldif_cb ( GtkAction *action, gpointer data );
+static void addressbook_find_duplicates_cb ( GtkAction *action, gpointer data );
+static void addressbook_edit_custom_attr_cb ( GtkAction *action, gpointer data );
+static void addressbook_import_mutt_cb ( GtkAction *action, gpointer data );
+static void addressbook_import_pine_cb ( GtkAction *action, gpointer data );
+static void addressbook_export_html_cb ( GtkAction *action, gpointer data );
+static void addressbook_export_ldif_cb ( GtkAction *action, gpointer data );
+static void addressbook_select_all_cb ( GtkAction *action, gpointer data );
+static void addressbook_clip_cut_cb ( GtkAction *action, gpointer data );
+static void addressbook_clip_copy_cb ( GtkAction *action, gpointer data );
+static void addressbook_clip_paste_cb ( GtkAction *action, gpointer data );
+static void addressbook_treenode_cut_cb ( GtkAction *action, gpointer data );
+static void addressbook_treenode_copy_cb ( GtkAction *action, gpointer data );
+static void addressbook_treenode_paste_cb ( GtkAction *action, gpointer data );
+
+static void addressbook_mail_to_cb ( GtkAction *action, gpointer data );
#ifdef USE_LDAP
-static void addressbook_browse_entry_cb ( void );
+static void addressbook_browse_entry_cb ( GtkAction *action, gpointer data );
#endif
static void addressbook_edit_clicked(GtkButton *button, gpointer data);
static GtkTargetList *addressbook_target_list = NULL;
+static void about_show_cb(GtkAction *action, gpointer data)
+{
+ about_show();
+}
-static GtkItemFactoryEntry addressbook_entries[] =
+static GtkActionEntry addressbook_entries[] =
{
- {N_("/_Book"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Book/New _Book"), "<control>B", addressbook_new_book_cb, 0, NULL},
- {N_("/_Book/New _Folder"), "<control>R", addressbook_new_folder_cb, 0, NULL},
- {N_("/_Book/New _vCard"), "<control><shift>D", addressbook_new_vcard_cb, 0, NULL},
+ {"Menu", NULL, "Menu" },
+/* menus */
+ {"Book", NULL, N_("_Book") },
+ {"Address", NULL, N_("_Edit") },
+ {"Tools", NULL, N_("_Tools") },
+ {"Help", NULL, N_("_Help") },
+
+/* Book menu */
+ {"Book/NewBook", NULL, N_("New _Book"), "<control>B", NULL, G_CALLBACK(addressbook_new_book_cb) },
+ {"Book/NewFolder", NULL, N_("New _Folder"), "<control>R", NULL, G_CALLBACK(addressbook_new_folder_cb) },
+ {"Book/NewVCard", NULL, N_("New _vCard"), "<control><shift>D", NULL, G_CALLBACK(addressbook_new_vcard_cb) },
+
+
#ifdef USE_JPILOT
- {N_("/_Book/New _JPilot"), "<control>J", addressbook_new_jpilot_cb, 0, NULL},
+ {"Book/NewJPilot", NULL, N_("New _JPilot"), "<control>J", NULL, G_CALLBACK(addressbook_new_jpilot_cb) },
#endif
#ifdef USE_LDAP
- {N_("/_Book/New LDAP _Server"), "<control><shift>S", addressbook_new_ldap_cb, 0, NULL},
+ {"Book/NewLDAPServer", NULL, N_("New LDAP _Server"), "<control><shift>S", NULL, G_CALLBACK(addressbook_new_ldap_cb) },
#endif
- {N_("/_Book/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Book/_Edit book"), NULL, addressbook_treenode_edit_cb, 0, NULL},
- {N_("/_Book/_Delete book"), NULL, addressbook_treenode_delete_cb, 0, NULL},
- {N_("/_Book/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Book/_Save"), "<control>S", addressbook_file_save_cb, 0, NULL},
- {N_("/_Book/_Close"), "<control>W", close_cb, 0, NULL},
- {N_("/_Address"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Address/_Select all"), "<control>A", addressbook_select_all_cb, 0, NULL},
- {N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Address/C_ut"), "<control>X", addressbook_clip_cut_cb, 0, NULL},
- {N_("/_Address/_Copy"), "<control>C", addressbook_clip_copy_cb, 0, NULL},
- {N_("/_Address/_Paste"), "<control>V", addressbook_clip_paste_cb, 0, NULL},
- {N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Address/_Edit"), "<control>Return",addressbook_edit_address_cb, 0, NULL},
- {N_("/_Address/_Delete"), "<control>D", addressbook_delete_address_cb, 0, NULL},
- {N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Address/New _Address"), "<control>N", addressbook_new_address_cb, 0, NULL},
- {N_("/_Address/New _Group"), "<control>G", addressbook_new_group_cb, 0, NULL},
- {N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Address/_Mail To"), NULL, addressbook_mail_to_cb, 0, NULL},
- {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/Import _LDIF file..."), NULL, addressbook_import_ldif_cb, 0, NULL},
- {N_("/_Tools/Import M_utt file..."), NULL, addressbook_import_mutt_cb, 0, NULL},
- {N_("/_Tools/Import _Pine file..."), NULL, addressbook_import_pine_cb, 0, NULL},
- {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/Export _HTML..."), NULL, addressbook_export_html_cb, 0, NULL},
- {N_("/_Tools/Export LDI_F..."), NULL, addressbook_export_ldif_cb, 0, NULL},
- {N_("/_Help"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Help/_About"), NULL, about_show, 0, NULL}
+ {"Book/---", NULL, "---", NULL, NULL, NULL },
+
+ {"Book/EditBook", NULL, N_("_Edit book"), NULL, NULL, G_CALLBACK(addressbook_treenode_edit_cb) },
+ {"Book/DeleteBook", NULL, N_("_Delete book"), NULL, NULL, G_CALLBACK(addressbook_treenode_delete_cb) },
+ /* {"Book/---", NULL, "---", NULL, NULL, NULL }, */
+ {"Book/Save", NULL, N_("_Save"), "<control>S", NULL, G_CALLBACK(addressbook_file_save_cb) },
+ {"Book/Close", NULL, N_("_Close"), "<control>W", NULL, G_CALLBACK(close_cb) },
+
+/* Adress menu */
+ {"Address/SelectAll", NULL, N_("_Select all"), "<control>A", NULL, G_CALLBACK(addressbook_select_all_cb) },
+ {"Address/---", NULL, "---", NULL, NULL, NULL },
+ {"Address/Cut", NULL, N_("C_ut"), "<control>X", NULL, G_CALLBACK(addressbook_clip_cut_cb) },
+ {"Address/Copy", NULL, N_("_Copy"), "<control>C", NULL, G_CALLBACK(addressbook_clip_copy_cb) },
+ {"Address/Paste", NULL, N_("_Paste"), "<control>V", NULL, G_CALLBACK(addressbook_clip_paste_cb) },
+ /* {"Address/---", NULL, "---", NULL, NULL, NULL }, */
+ {"Address/Edit", NULL, N_("_Edit"), "<control>Return", NULL, G_CALLBACK(addressbook_edit_address_cb) },
+ {"Address/Delete", NULL, N_("_Delete"), "<control>D", NULL, G_CALLBACK(addressbook_delete_address_cb) },
+ /* {"Address/---", NULL, "---", NULL, NULL, NULL }, */
+ {"Address/NewAddress", NULL, N_("New _Address"), "<control>N", NULL, G_CALLBACK(addressbook_new_address_cb) },
+ {"Address/NewGroup", NULL, N_("New _Group"), "<control>G", NULL, G_CALLBACK(addressbook_new_group_cb) },
+ /* {"Address/---", NULL, "---", NULL, NULL, NULL }, */
+ {"Address/Mailto", NULL, N_("_Mail To"), "<control>M", NULL, G_CALLBACK(addressbook_mail_to_cb) },
+
+
+/* Tools menu */
+ {"Tools/ImportLDIF", NULL, N_("Import _LDIF file..."), NULL, NULL, G_CALLBACK(addressbook_import_ldif_cb) },
+ {"Tools/ImportMutt", NULL, N_("Import M_utt file..."), NULL, NULL, G_CALLBACK(addressbook_import_mutt_cb) },
+ {"Tools/ImportPine", NULL, N_("Import _Pine file..."), NULL, NULL, G_CALLBACK(addressbook_import_pine_cb) },
+ {"Tools/---", NULL, "---", NULL, NULL, NULL },
+ {"Tools/ExportHTML", NULL, N_("Export _HTML..."), NULL, NULL, G_CALLBACK(addressbook_export_html_cb) },
+ {"Tools/ExportLDIF", NULL, N_("Export LDI_F..."), NULL, NULL, G_CALLBACK(addressbook_export_ldif_cb) },
+ /* {"Tools/---", NULL, "---", NULL, NULL, NULL },*/
+ {"Tools/FindDuplicates", NULL, N_("Find duplicates..."), NULL, NULL, G_CALLBACK(addressbook_find_duplicates_cb) },
+ {"Tools/EditAttrs", NULL, N_("Edit custom attributes..."), NULL, NULL, G_CALLBACK(addressbook_edit_custom_attr_cb) },
+
+/* Help menu */
+ {"Help/About", NULL, N_("_About"), NULL, NULL, G_CALLBACK(about_show_cb) },
+
};
-static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
+static GtkActionEntry addressbook_tree_popup_entries[] =
{
- {N_("/_Edit"), NULL, addressbook_treenode_edit_cb, 0, NULL},
- {N_("/_Delete"), NULL, addressbook_treenode_delete_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/New _Book"), NULL, addressbook_new_book_cb, 0, NULL},
- {N_("/New _Folder"), NULL, addressbook_new_folder_cb, 0, NULL},
- {N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/C_ut"), NULL, addressbook_treenode_cut_cb, 0, NULL},
- {N_("/_Copy"), NULL, addressbook_treenode_copy_cb, 0, NULL},
- {N_("/_Paste"), NULL, addressbook_treenode_paste_cb, 0, NULL}
+ {"ABTreePopup", NULL, "ABTreePopup" },
+ {"ABTreePopup/EditBook", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK(addressbook_treenode_edit_cb) },
+ {"ABTreePopup/DeleteBook", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(addressbook_treenode_delete_cb) },
+ {"ABTreePopup/---", NULL, "---", NULL, NULL, NULL },
+ {"ABTreePopup/NewBook", NULL, N_("New _Book"), NULL, NULL, G_CALLBACK(addressbook_new_book_cb) },
+ {"ABTreePopup/NewFolder", NULL, N_("New _Folder"), NULL, NULL, G_CALLBACK(addressbook_new_folder_cb) },
+ {"ABTreePopup/NewGroup", NULL, N_("New _Group"), NULL, NULL, G_CALLBACK(addressbook_new_group_cb) },
+ /* {"ABTreePopup/---", NULL, "---", NULL, NULL, NULL }, */
+ {"ABTreePopup/Cut", NULL, N_("C_ut"), NULL, NULL, G_CALLBACK(addressbook_treenode_cut_cb) },
+ {"ABTreePopup/Copy", NULL, N_("_Copy"), NULL, NULL, G_CALLBACK(addressbook_treenode_copy_cb) },
+ {"ABTreePopup/Paste", NULL, N_("_Paste"), NULL, NULL, G_CALLBACK(addressbook_treenode_paste_cb) },
};
-static GtkItemFactoryEntry addressbook_list_popup_entries[] =
+static GtkActionEntry addressbook_list_popup_entries[] =
{
- {N_("/_Select all"), NULL, addressbook_select_all_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit"), NULL, addressbook_edit_address_cb, 0, NULL},
- {N_("/_Delete"), NULL, addressbook_delete_address_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/New _Address"), NULL, addressbook_new_address_cb, 0, NULL},
- {N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/C_ut"), NULL, addressbook_clip_cut_cb, 0, NULL},
- {N_("/_Copy"), NULL, addressbook_clip_copy_cb, 0, NULL},
- {N_("/_Paste"), NULL, addressbook_clip_paste_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
-/* {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL},*/
- {N_("/_Mail To"), NULL, addressbook_mail_to_cb, 0, NULL},
+ {"ABListPopup", NULL, "ABListPopup" },
+ {"ABListPopup/SelectAll", NULL, N_("_Select all"), NULL, NULL, G_CALLBACK(addressbook_select_all_cb) },
+ {"ABListPopup/---", NULL, "---", NULL, NULL, NULL },
+ {"ABListPopup/Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK(addressbook_edit_address_cb) },
+ {"ABListPopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(addressbook_delete_address_cb) },
+ /* {"ABListPopup/---", NULL, "---", NULL, NULL, NULL }, */
+ {"ABListPopup/NewAddress", NULL, N_("New _Address"), NULL, NULL, G_CALLBACK(addressbook_new_address_cb) },
+ {"ABListPopup/NewGroup", NULL, N_("New _Group"), NULL, NULL, G_CALLBACK(addressbook_new_group_cb) },
+ /* {"ABListPopup/---", NULL, "---", NULL, NULL, NULL }, */
+ {"ABListPopup/Cut", NULL, N_("C_ut"), NULL, NULL, G_CALLBACK(addressbook_clip_cut_cb) },
+ {"ABListPopup/Copy", NULL, N_("_Copy"), NULL, NULL, G_CALLBACK(addressbook_clip_copy_cb) },
+ {"ABListPopup/Paste", NULL, N_("_Paste"), NULL, NULL, G_CALLBACK(addressbook_clip_paste_cb) },
+ /* {"ABListPopup/---", NULL, "---", NULL, NULL, NULL }, */
+ {"ABListPopup/Mailto", NULL, N_("_Mail To"), NULL, NULL, G_CALLBACK(addressbook_mail_to_cb) },
#ifdef USE_LDAP
- {N_("/_Browse Entry"), NULL, addressbook_browse_entry_cb, 0, NULL},
-#endif
+ {"ABListPopup/BrowseEntry", NULL, N_("_Browse Entry"), NULL, NULL, G_CALLBACK(addressbook_browse_entry_cb) },
+#endif
};
/**
{ LDAPRC_NOENTRIES, N_("No LDAP entries found for search criteria") },
{ LDAPRC_STOP_FLAG, N_("LDAP search terminated on request") },
{ LDAPRC_TLS, N_("Error starting TLS connection") },
- { LDAPRC_NODN, N_("Distinguised Name (dn) is missing") },
+ { LDAPRC_NODN, N_("Distinguished Name (dn) is missing") },
{ LDAPRC_NAMING_VIOLATION, N_("Missing required information") },
{ LDAPRC_ALREADY_EXIST, N_("Another contact exists with that key") },
{ LDAPRC_STRONG_AUTH, N_("Strong(er) authentication required") },
addressbook_create();
addressbook_load_tree();
gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
- GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list));
+ GTK_CMCTREE_NODE(GTK_CMCLIST(addrbook.ctree)->row_list));
}
else {
gtk_widget_hide(addrbook.window);
}
gtk_widget_show_all(addrbook.window);
-#ifdef MAEMO
- maemo_window_full_screen_if_needed(GTK_WINDOW(addrbook.window));
- maemo_connect_key_press_to_mainwindow(GTK_WINDOW(addrbook.window));
-#endif
+
if (!prefs_common.addressbook_use_editaddress_dialog)
addressbook_edit_person_widgetset_hide();
void addressbook_set_target_compose(Compose *target)
{
addrbook.target_compose = target;
- addressbook_button_set_sensitive();
}
Compose *addressbook_get_target_compose(void)
/**
* Refresh addressbook and save to file(s).
*/
-static void addressbook_refresh( void )
+void addressbook_refresh( void )
{
if (addrbook.window) {
if (addrbook.treeSelected) {
gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
addrbook.treeSelected);
addressbook_set_clist(
- gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree),
addrbook.treeSelected),
TRUE);
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
addressbook_close();
- else if (event && event->keyval == GDK_Delete) {
+ else if (event && event->keyval == GDK_KEY_Delete) {
/* TODO: enable deletion when focus is in ctree (needs implementation in _del_clicked() */
if ( /* address_index_has_focus || */ address_list_has_focus )
addressbook_del_clicked(NULL, NULL);
static void addressbook_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.addressbookwin_width = allocation->width;
prefs_common.addressbookwin_height = allocation->height;
static GtkSortType sort_column_type = GTK_SORT_ASCENDING;
static gint list_case_sort(
- GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
+ GtkCMCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
{
- GtkCListRow *row1 = (GtkCListRow *) ptr1;
- GtkCListRow *row2 = (GtkCListRow *) ptr2;
+ GtkCMCListRow *row1 = (GtkCMCListRow *) ptr1;
+ GtkCMCListRow *row2 = (GtkCMCListRow *) ptr2;
gchar *name1 = NULL, *name2 = NULL;
- AddrItemObject *aio1 = ((GtkCListRow *)ptr1)->data;
- AddrItemObject *aio2 = ((GtkCListRow *)ptr2)->data;
+ AddrItemObject *aio1 = ((GtkCMCListRow *)ptr1)->data;
+ AddrItemObject *aio2 = ((GtkCMCListRow *)ptr2)->data;
if( aio1->type == aio2->type ) {
if( row1 )
- name1 = GTK_CELL_TEXT (row1->cell[sort_column_number])->text;
+ name1 = GTK_CMCELL_TEXT (row1->cell[sort_column_number])->text;
if( row2 )
- name2 = GTK_CELL_TEXT (row2->cell[sort_column_number])->text;
+ name2 = GTK_CMCELL_TEXT (row2->cell[sort_column_number])->text;
if( ! name1 ) return ( name2 != NULL );
if( ! name2 ) return -1;
- return strcasecmp( name1, name2 );
+ return g_utf8_collate( name1, name2 );
} else {
/* Order groups before person */
if( aio1->type == ITEMTYPE_GROUP ) {
}
}
-static void addressbook_sort_list(GtkCList *clist, const gint col,
+static void addressbook_sort_list(GtkCMCList *clist, const gint col,
const GtkSortType sort_type)
{
gint pos;
sort_column_number = col;
sort_column_type = sort_type;
- gtk_clist_set_compare_func(clist, list_case_sort);
- gtk_clist_set_sort_type(clist, sort_type);
- gtk_clist_set_sort_column(clist, col);
+ gtk_cmclist_set_compare_func(clist, list_case_sort);
+ gtk_cmclist_set_sort_type(clist, sort_type);
+ gtk_cmclist_set_sort_column(clist, col);
- gtk_clist_freeze(clist);
- gtk_clist_sort(clist);
+ gtk_cmclist_freeze(clist);
+ gtk_cmclist_sort(clist);
for(pos = 0 ; pos < N_LIST_COLS ; pos++) {
hbox = gtk_hbox_new(FALSE, 4);
}
gtk_widget_show_all(hbox);
- gtk_clist_set_column_widget(clist, pos, hbox);
+ gtk_cmclist_set_column_widget(clist, pos, hbox);
}
- gtk_clist_thaw(clist);
+ gtk_cmclist_thaw(clist);
}
-static void addressbook_name_clicked(GtkWidget *button, GtkCList *clist)
+static void addressbook_name_clicked(GtkWidget *button, GtkCMCList *clist)
{
static GtkSortType sort_type = GTK_SORT_ASCENDING;
addressbook_sort_list(clist, COL_NAME, sort_type);
}
-static void addressbook_address_clicked(GtkWidget *button, GtkCList *clist)
+static void addressbook_address_clicked(GtkWidget *button, GtkCMCList *clist)
{
static GtkSortType sort_type = GTK_SORT_ASCENDING;
addressbook_sort_list(clist, COL_ADDRESS, sort_type);
}
-static void addressbook_remarks_clicked(GtkWidget *button, GtkCList *clist)
+static void addressbook_remarks_clicked(GtkWidget *button, GtkCMCList *clist)
{
static GtkSortType sort_type = GTK_SORT_ASCENDING;
GtkWidget *close_btn;
GtkWidget *tree_popup;
GtkWidget *list_popup;
- GtkItemFactory *tree_factory;
- GtkItemFactory *list_factory;
- GtkItemFactory *menu_factory;
- gint n_entries;
GList *nodeIf;
-
+ GtkUIManager *ui_manager;
+ GtkActionGroup *action_group;
gchar *index_titles[N_INDEX_COLS];
gchar *text;
gint i;
gtk_container_add(GTK_CONTAINER(window), vbox);
/* Menu bar */
- n_entries = sizeof(addressbook_entries) /
- sizeof(addressbook_entries[0]);
- menubar = menubar_create(window, addressbook_entries, n_entries,
- "<AddressBook>", NULL);
+ ui_manager = gtk_ui_manager_new();
+ action_group = cm_menu_create_action_group_full(ui_manager,"Menu", addressbook_entries,
+ G_N_ELEMENTS(addressbook_entries), NULL);
+ gtk_action_group_add_actions(action_group, addressbook_tree_popup_entries,
+ G_N_ELEMENTS(addressbook_tree_popup_entries), NULL);
+ gtk_action_group_add_actions(action_group, addressbook_list_popup_entries,
+ G_N_ELEMENTS(addressbook_list_popup_entries), NULL);
+
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
+
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Book", "Book", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Address", "Address", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Tools", "Tools", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Help", "Help", GTK_UI_MANAGER_MENU)
+
+/* Book menu */
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "NewBook", "Book/NewBook", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "NewFolder", "Book/NewFolder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "NewVCard", "Book/NewVCard", GTK_UI_MANAGER_MENUITEM)
+#ifdef USE_JPILOT
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "NewJPilot", "Book/NewJPilot", GTK_UI_MANAGER_MENUITEM)
+#endif
+#ifdef USE_LDAP
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "NewLDAPServer", "Book/NewLDAPServer", GTK_UI_MANAGER_MENUITEM)
+#endif
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "Separator1", "Book/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "EditBook", "Book/EditBook", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "DeleteBook", "Book/DeleteBook", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "Separator2", "Book/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "Save", "Book/Save", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "Close", "Book/Close", GTK_UI_MANAGER_MENUITEM)
+
+/* Address menu */
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "SelectAll", "Address/SelectAll", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Separator1", "Address/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Cut", "Address/Cut", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Copy", "Address/Copy", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Paste", "Address/Paste", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Separator2", "Address/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Edit", "Address/Edit", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Delete", "Address/Delete", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Separator3", "Address/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "NewAddress", "Address/NewAddress", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "NewGroup", "Address/NewGroup", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Separator4", "Address/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Mailto", "Address/Mailto", GTK_UI_MANAGER_MENUITEM)
+
+/* Tools menu */
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "ImportLDIF", "Tools/ImportLDIF", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "ImportMutt", "Tools/ImportMutt", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "ImportPine", "Tools/ImportPine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "Separator1", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "ExportHTML", "Tools/ExportHTML", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "ExportLDIF", "Tools/ExportLDIF", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "Separator2", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "FindDuplicates", "Tools/FindDuplicates", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "EditAttrs", "Tools/EditAttrs", GTK_UI_MANAGER_MENUITEM)
+
+/* Help menu */
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Help", "About", "Help/About", GTK_UI_MANAGER_MENUITEM)
+
+ menubar = gtk_ui_manager_get_widget(ui_manager, "/Menu");
+
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
- menu_factory = gtk_item_factory_from_widget(menubar);
vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
/* Address index */
ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
+ gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[0].button, FALSE);
+
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),
+ gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
+ gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), 0, COL_FOLDER_WIDTH);
+ gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+ gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+ GTK_CMCTREE_EXPANDER_TRIANGLE);
+ gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
+ gtk_cmctree_set_indent(GTK_CMCTREE(ctree), CTREE_INDENT);
+ gtk_cmclist_set_compare_func(GTK_CMCLIST(ctree),
addressbook_treenode_compare_func);
g_signal_connect(G_OBJECT(ctree), "tree_select_row",
/* Address list */
clist = gtk_sctree_new_with_titles(N_LIST_COLS, 0, list_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);
- gtk_ctree_set_expander_style(GTK_CTREE(clist), GTK_CTREE_EXPANDER_SQUARE);
- gtk_ctree_set_indent(GTK_CTREE(clist), CTREE_INDENT);
- gtk_clist_set_column_width(GTK_CLIST(clist), COL_NAME,
+ gtk_cmclist_set_selection_mode(GTK_CMCLIST(clist), GTK_SELECTION_MULTIPLE);
+ gtk_cmctree_set_line_style(GTK_CMCTREE(clist), GTK_CMCTREE_LINES_NONE);
+ gtk_cmctree_set_expander_style(GTK_CMCTREE(clist),
+ GTK_CMCTREE_EXPANDER_TRIANGLE);
+ gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
+ gtk_cmctree_set_indent(GTK_CMCTREE(clist), CTREE_INDENT);
+ gtk_cmclist_set_column_width(GTK_CMCLIST(clist), COL_NAME,
COL_NAME_WIDTH);
- gtk_clist_set_column_width(GTK_CLIST(clist), COL_ADDRESS,
+ gtk_cmclist_set_column_width(GTK_CMCLIST(clist), COL_ADDRESS,
COL_ADDRESS_WIDTH);
gtk_widget_set_size_request(clist, -1, 80);
- addressbook_sort_list(GTK_CLIST(clist), COL_NAME, GTK_SORT_ASCENDING);
- g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_NAME].button),
+ addressbook_sort_list(GTK_CMCLIST(clist), COL_NAME, GTK_SORT_ASCENDING);
+ g_signal_connect(G_OBJECT(GTK_CMCLIST(clist)->column[COL_NAME].button),
"clicked", G_CALLBACK(addressbook_name_clicked), clist);
- g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_ADDRESS].button),
+ g_signal_connect(G_OBJECT(GTK_CMCLIST(clist)->column[COL_ADDRESS].button),
"clicked", G_CALLBACK(addressbook_address_clicked), clist);
- g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_REMARKS].button),
+ g_signal_connect(G_OBJECT(GTK_CMCLIST(clist)->column[COL_REMARKS].button),
"clicked", G_CALLBACK(addressbook_remarks_clicked), clist);
g_signal_connect(G_OBJECT(clist), "focus_in_event",
G_CALLBACK(addressbook_address_list_focus_evt_in), NULL);
G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
for (i = 0; i < N_LIST_COLS; i++)
- GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
- GTK_CAN_FOCUS);
+ gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button,
+ FALSE);
g_signal_connect(G_OBJECT(clist), "tree_select_row",
G_CALLBACK(addressbook_list_row_selected), NULL);
hbox = gtk_hbox_new(FALSE, 4);
gtk_box_pack_start(GTK_BOX(clist_vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new(_("Lookup name:"));
+ label = gtk_label_new(_("Search"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
entry = gtk_entry_new();
g_signal_connect(G_OBJECT(entry), "key_press_event",
G_CALLBACK(addressbook_entry_key_pressed),
NULL);
+ g_signal_connect(G_OBJECT(entry), "activate",
+ G_CALLBACK(addressbook_entry_activated), NULL);
if (!prefs_common.addressbook_use_editaddress_dialog) {
editaddress_vbox = gtk_vbox_new(FALSE, 4);
gtkut_stock_button_add_help(hbbox, &help_btn);
edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
- GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(edit_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
- GTK_WIDGET_SET_FLAGS(del_btn, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(del_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), del_btn, TRUE, TRUE, 0);
reg_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
- GTK_WIDGET_SET_FLAGS(reg_btn, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(reg_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), reg_btn, TRUE, TRUE, 0);
lup_btn = gtk_button_new_from_stock(GTK_STOCK_FIND);
- GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(lup_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(help_btn), "clicked",
to_btn = gtk_button_new_with_label
(prefs_common_translated_header_name("To:"));
- GTK_WIDGET_SET_FLAGS(to_btn, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(to_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), to_btn, TRUE, TRUE, 0);
cc_btn = gtk_button_new_with_label
(prefs_common_translated_header_name("Cc:"));
- GTK_WIDGET_SET_FLAGS(cc_btn, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(cc_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), cc_btn, TRUE, TRUE, 0);
bcc_btn = gtk_button_new_with_label
(prefs_common_translated_header_name("Bcc:"));
- GTK_WIDGET_SET_FLAGS(bcc_btn, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(bcc_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(close_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), close_btn, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(to_btn), "clicked",
G_CALLBACK(addressbook_close_clicked), NULL);
/* Build icons for interface */
- stock_pixmap_gdk( window, STOCK_PIXMAP_INTERFACE,
- &interfacexpm, &interfacexpmmask );
/* Build control tables */
addrbookctl_build_map(window);
AddressTypeControlItem *atci = adapter->atci;
text = atci->displayName;
adapter->treeNode =
- gtk_sctree_insert_node( GTK_CTREE(ctree),
+ gtk_sctree_insert_node( GTK_CMCTREE(ctree),
NULL, NULL, &text, FOLDER_SPACING,
- interfacexpm, interfacexpmmask,
- interfacexpm, interfacexpmmask,
+ interfacexpm,
+ interfacexpm,
FALSE, FALSE );
- menu_set_sensitive( menu_factory, atci->menuCommand, adapter->haveLibrary );
- gtk_ctree_node_set_row_data_full(
- GTK_CTREE(ctree), adapter->treeNode, adapter,
+ cm_menu_set_sensitive_full(ui_manager, atci->menuCommand, adapter->haveLibrary );
+ gtk_cmctree_node_set_row_data_full(
+ GTK_CMCTREE(ctree), adapter->treeNode, adapter,
addressbook_free_treenode );
}
}
/* Popup menu */
- n_entries = sizeof(addressbook_tree_popup_entries) /
- sizeof(addressbook_tree_popup_entries[0]);
- tree_popup = menu_create_items(addressbook_tree_popup_entries,
- n_entries,
- "<AddressBookTree>", &tree_factory,
- NULL);
- n_entries = sizeof(addressbook_list_popup_entries) /
- sizeof(addressbook_list_popup_entries[0]);
- list_popup = menu_create_items(addressbook_list_popup_entries,
- n_entries,
- "<AddressBookList>", &list_factory,
- NULL);
+
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Popups", NULL, GTK_UI_MANAGER_MENUBAR);
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups", "ABTreePopup", "ABTreePopup", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "EditBook", "ABTreePopup/EditBook", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "DeleteBook", "ABTreePopup/DeleteBook", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "Separator1", "ABTreePopup/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "NewBook", "ABTreePopup/NewBook", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "NewFolder", "ABTreePopup/NewFolder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "NewGroup", "ABTreePopup/NewGroup", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "Separator2", "ABTreePopup/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "Cut", "ABTreePopup/Cut", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "Copy", "ABTreePopup/Copy", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABTreePopup", "Paste", "ABTreePopup/Paste", GTK_UI_MANAGER_MENUITEM)
+
+ tree_popup = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+ gtk_ui_manager_get_widget(ui_manager, "/Popups/ABTreePopup")));
+
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups", "ABListPopup", "ABListPopup", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "SelectAll", "ABListPopup/SelectAll", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Separator1", "ABListPopup/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Edit", "ABListPopup/Edit", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Delete", "ABListPopup/Delete", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Separator2", "ABListPopup/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "NewAddress", "ABListPopup/NewAddress", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "NewGroup", "ABListPopup/NewGroup", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Separator3", "ABListPopup/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Cut", "ABListPopup/Cut", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Copy", "ABListPopup/Copy", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Paste", "ABListPopup/Paste", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Separator4", "ABListPopup/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Mailto", "ABListPopup/Mailto", GTK_UI_MANAGER_MENUITEM)
+#ifdef USE_LDAP
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "BrowseEntry", "ABListPopup/BrowseEntry", GTK_UI_MANAGER_MENUITEM)
+#endif
+ list_popup = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+ gtk_ui_manager_get_widget(ui_manager, "/Popups/ABListPopup")));
addrbook.window = window;
addrbook.hpaned = hpaned;
addrbook.tree_popup = tree_popup;
addrbook.list_popup = list_popup;
- addrbook.tree_factory = tree_factory;
- addrbook.list_factory = list_factory;
- addrbook.menu_factory = menu_factory;
+ addrbook.ui_manager = ui_manager;
addrbook.listSelected = NULL;
GDK_HINT_MIN_SIZE);
gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
prefs_common.addressbookwin_height);
+#ifdef G_OS_WIN32
+ gtk_window_move(GTK_WINDOW(window), 48, 48);
+#endif
if (!prefs_common.addressbook_use_editaddress_dialog) {
if (prefs_common.addressbook_vpaned_pos > 0)
}
}
-static void addressbook_ds_status_message( AddressDataSource *ds, gchar *msg ) {
- *addressbook_msgbuf = '\0';
- if( ds ) {
- gchar *name;
-
- name = addrindex_ds_get_name( ds );
- g_snprintf( addressbook_msgbuf, sizeof(addressbook_msgbuf),
- "%s: %s", name, msg );
- }
- else {
- g_snprintf( addressbook_msgbuf, sizeof(addressbook_msgbuf),
- "%s", msg );
- }
- addressbook_status_show( addressbook_msgbuf );
-}
-
static void addressbook_ds_show_message( AddressDataSource *ds ) {
gint retVal;
gchar *name;
addressbook_status_show( addressbook_msgbuf );
}
-static void addressbook_button_set_sensitive(void)
+static void addressbook_edit_clicked(GtkButton *button, gpointer data)
{
- gboolean to_sens = FALSE;
- gboolean cc_sens = FALSE;
- gboolean bcc_sens = FALSE;
-
- if (!addrbook.window) return;
-
- if (addrbook.target_compose) {
- to_sens = TRUE;
- cc_sens = TRUE;
- bcc_sens = TRUE;
- }
-
- gtk_widget_set_sensitive(addrbook.to_btn, to_sens);
- gtk_widget_set_sensitive(addrbook.cc_btn, cc_sens);
- gtk_widget_set_sensitive(addrbook.bcc_btn, bcc_sens);
+ addressbook_edit_address_cb(NULL, NULL);
}
-static void addressbook_edit_clicked(GtkButton *button, gpointer data)
+static gboolean find_person(AddrSelectItem *item_a, ItemPerson *person)
{
- addressbook_edit_address_cb(NULL, 0, NULL);
+ return ((ItemPerson *)item_a->addressItem == person)?0:-1;
}
/*
*/
static void addressbook_del_clicked(GtkButton *button, gpointer data)
{
- GtkCTree *clist = GTK_CTREE(addrbook.clist);
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+ GtkCMCTree *clist = GTK_CMCTREE(addrbook.clist);
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
AddressObject *pobj;
AdapterDSource *ads = NULL;
- GtkCTreeNode *nodeList;
+ GtkCMCTreeNode *nodeList;
gboolean procFlag;
AlertValue aval;
AddressBookFile *abf = NULL;
GList *list, *node;
gboolean refreshList = FALSE;
- pobj = gtk_ctree_node_get_row_data(ctree, addrbook.opened );
- g_return_if_fail(pobj != NULL);
+ pobj = gtk_cmctree_node_get_row_data(ctree, addrbook.opened );
+ cm_return_if_fail(pobj != NULL);
/* Test whether anything selected for deletion */
nodeList = addrbook.listSelected;
- aio = gtk_ctree_node_get_row_data( clist, nodeList );
+ aio = gtk_cmctree_node_get_row_data( clist, nodeList );
if( aio == NULL) return;
ds = addressbook_find_datasource( addrbook.treeSelected );
if( ds == NULL ) return;
abf = ds->rawDataSource;
if( abf == NULL ) return;
+ gtk_cmclist_freeze(GTK_CMCLIST(addrbook.clist));
+ g_signal_handlers_block_by_func
+ (G_OBJECT(addrbook.clist),
+ G_CALLBACK(addressbook_list_row_unselected), NULL);
/* Process deletions */
if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
+ GList *groups = NULL, *persons = NULL, *emails = NULL;
gboolean group_delete = TRUE;
/* Items inside folders */
list = addrselect_get_list( _addressSelect_ );
item = node->data;
node = g_list_next( node );
aio = ( AddrItemObject * ) item->addressItem;
- if( aio->type == ADDR_ITEM_PERSON || aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_PERSON || aio->type == ITEMTYPE_EMAIL ) {
group_delete = FALSE;
break;
}
_("Really delete the group(s)?\n"
"The addresses it contains will not be lost."),
GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
- if( aval != G_ALERTALTERNATE ) return;
+ if( aval != G_ALERTALTERNATE ) {
+ goto thaw_ret;
+ }
} else {
aval = alertpanel( _("Delete address(es)"),
_("Really delete the address(es)?"),
GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
- if( aval != G_ALERTALTERNATE ) return;
+ if( aval != G_ALERTALTERNATE ) {
+ goto thaw_ret;
+ }
}
-
+
+ /* first, set lists of groups and persons to remove */
+ node = list;
+ while( node ) {
+ item = node->data;
+ node = g_list_next( node );
+ aio = ( AddrItemObject * ) item->addressItem;
+ if (!aio)
+ continue;
+ if( aio->type == ITEMTYPE_GROUP ) {
+ groups = g_list_prepend(groups, item);
+ }
+ else if( aio->type == ITEMTYPE_PERSON ) {
+ persons = g_list_prepend(persons, item);
+ }
+ }
+ /* then set list of emails to remove *if* they're not children of
+ * persons to remove */
node = list;
while( node ) {
item = node->data;
node = g_list_next( node );
aio = ( AddrItemObject * ) item->addressItem;
- if( aio->type == ADDR_ITEM_GROUP ) {
+ if (!aio)
+ continue;
+ if( aio->type == ITEMTYPE_EMAIL ) {
+ ItemEMail *sitem = ( ItemEMail * ) aio;
+ ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(sitem);
+ if (!g_list_find_custom(persons, person, (GCompareFunc)(find_person))) {
+ emails = g_list_prepend(emails, item);
+ }
+ /* else, the email will be removed via the parent person */
+ }
+ }
+ /* then delete groups */
+ node = groups;
+ while( node ) {
+ item = node->data;
+ node = g_list_next( node );
+ aio = ( AddrItemObject * ) item->addressItem;
+ if (!aio)
+ continue;
+ if( aio->type == ITEMTYPE_GROUP ) {
ItemGroup *item = ( ItemGroup * ) aio;
- GtkCTreeNode *nd = NULL;
-
+ GtkCMCTreeNode *nd = NULL;
nd = addressbook_find_group_node( addrbook.opened, item );
item = addrbook_remove_group( abf, item );
if( item ) {
addritem_free_item_group( item );
}
/* Remove group from parent node */
- gtk_ctree_remove_node( ctree, nd );
+ gtk_cmctree_remove_node( ctree, nd );
refreshList = TRUE;
}
- else if( aio->type == ADDR_ITEM_PERSON ) {
+ }
+ /* then delete persons */
+ node = persons;
+ while( node ) {
+ item = node->data;
+ node = g_list_next( node );
+ aio = ( AddrItemObject * ) item->addressItem;
+ if (!aio)
+ continue;
+ if( aio->type == ITEMTYPE_PERSON ) {
ItemPerson *item = ( ItemPerson * ) aio;
item->status = DELETE_ENTRY;
addressbook_folder_remove_one_person( clist, item );
}
#endif
if( item ) {
+ gchar *filename = addritem_person_get_picture(item);
+ if (filename && is_file_exist(filename))
+ claws_unlink(filename);
+ g_free(filename);
addritem_free_item_person( 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 ) {
- addrcache_remove_email(abf->addressCache, item);
- addritem_free_item_email( item );
+ }
+ /* then delete emails */
+ node = emails;
+ while( node ) {
+ item = node->data;
+ node = g_list_next( node );
+ aio = ( AddrItemObject * ) item->addressItem;
+ if (!aio)
+ continue;
+
+ if( aio->type == ITEMTYPE_EMAIL ) {
+ ItemEMail *sitem = ( ItemEMail * ) aio;
+ ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(sitem);
+ sitem = addrbook_person_remove_email( abf, person, sitem );
+ if( sitem ) {
+ addrcache_remove_email(abf->addressCache, sitem);
+ addritem_free_item_email( sitem );
}
addressbook_folder_refresh_one_person( clist, person );
}
}
+ g_list_free( groups );
+ g_list_free( persons );
+ g_list_free( emails );
g_list_free( list );
addressbook_list_select_clear();
if( refreshList ) {
gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
addressbook_set_clist(
- gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree),
addrbook.opened),
TRUE);
}
addrbook_set_dirty(abf, TRUE);
addressbook_export_to_file();
addressbook_list_menu_setup();
- return;
+ goto thaw_ret;
}
else if( pobj->type == ADDR_ITEM_GROUP ) {
/* Items inside groups */
item = node->data;
node = g_list_next( node );
aio = ( AddrItemObject * ) item->addressItem;
- if( aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_EMAIL ) {
ItemEMail *item = ( ItemEMail * ) aio;
ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(item);
item = addrbook_person_remove_email( abf, person, item );
addressbook_list_select_clear();
gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
addressbook_set_clist(
- gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree),
addrbook.opened),
TRUE);
addrbook_set_dirty(abf, TRUE);
addressbook_export_to_file();
addressbook_list_menu_setup();
- return;
+ goto thaw_ret;
}
- gtk_ctree_node_set_row_data( clist, nodeList, NULL );
- gtk_ctree_remove_node( clist, nodeList );
-
+ gtk_cmctree_node_set_row_data( clist, nodeList, NULL );
+ gtk_cmctree_remove_node( clist, nodeList );
+thaw_ret:
+ gtk_cmclist_thaw(GTK_CMCLIST(addrbook.clist));
+ g_signal_handlers_unblock_by_func
+ (G_OBJECT(addrbook.clist),
+ G_CALLBACK(addressbook_list_row_unselected), NULL);
}
static void addressbook_reg_clicked(GtkButton *button, gpointer data)
{
- addressbook_new_address_cb( NULL, 0, NULL );
+ addressbook_new_address_cb( NULL, NULL );
}
static gchar *addressbook_format_address( AddrItemObject * aio ) {
gchar *name = NULL;
gchar *address = NULL;
- if( aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_EMAIL ) {
ItemPerson *person = NULL;
ItemEMail *email = ( ItemEMail * ) aio;
address = email->address;
}
}
- else if( aio->type == ADDR_ITEM_PERSON ) {
+ else if( aio->type == ITEMTYPE_PERSON ) {
ItemPerson *person = ( ItemPerson * ) aio;
GList *node = person->listEMail;
addr = (char *)gtk_entry_get_text( GTK_ENTRY( addrbook.entry) );
if ( addr ) {
compose_entry_append(
- compose, addr, (ComposeEntryType)data );
+ compose, addr, (ComposeEntryType)data , PREF_NONE);
}
/* Select from address list */
item = node->data;
node = g_list_next( node );
aio = item->addressItem;
- if( aio->type == ADDR_ITEM_PERSON ||
- aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_PERSON ||
+ aio->type == ITEMTYPE_EMAIL ) {
addr = addressbook_format_address( aio );
compose_entry_append(
- compose, addr, (ComposeEntryType) data );
+ compose, addr, (ComposeEntryType) data, PREF_NONE );
g_free( addr );
}
- else if( aio->type == ADDR_ITEM_GROUP ) {
+ else if( aio->type == ITEMTYPE_GROUP ) {
ItemGroup *group = ( ItemGroup * ) aio;
GList *nodeMail = group->listEMail;
while( nodeMail ) {
addr = addressbook_format_address(
( AddrItemObject * ) email );
compose_entry_append(
- compose, addr, (ComposeEntryType) data );
+ compose, addr, (ComposeEntryType) data, PREF_NONE );
g_free( addr );
nodeMail = g_list_next( nodeMail );
}
} else {
AddressObject *obj = NULL;
- obj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+ obj = gtk_cmctree_node_get_row_data( GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected );
if( obj && obj->type == ADDR_ITEM_GROUP ) {
ItemGroup *itemGroup = ADAPTER_GROUP(obj)->itemGroup;
addr = addressbook_format_address(
( AddrItemObject * ) email );
compose_entry_append(
- compose, addr, (ComposeEntryType) data );
+ compose, addr, (ComposeEntryType) data, PREF_NONE );
g_free( addr );
nodeMail = g_list_next( nodeMail );
}
}
static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
- menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book", sensitive );
- menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", sensitive );
- menu_set_sensitive( addrbook.menu_factory, "/Book/New Folder", sensitive );
-
- menu_set_sensitive( addrbook.menu_factory, "/Address/Select all", TRUE );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", sensitive );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", sensitive );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Paste", sensitive );
-
- menu_set_sensitive( addrbook.menu_factory, "/Address/New Address", sensitive );
- menu_set_sensitive( addrbook.menu_factory, "/Address/New Group", sensitive );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To", sensitive );
- gtk_widget_set_sensitive( addrbook.reg_btn, sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/EditBook", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/DeleteBook", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/NewFolder", sensitive );
+
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/SelectAll", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Cut", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Copy", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Paste", sensitive );
+
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/NewAddress", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/NewGroup", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Mailto", sensitive );
gtk_widget_set_sensitive( addrbook.edit_btn, sensitive );
gtk_widget_set_sensitive( addrbook.del_btn, sensitive );
}
-static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode *node ) {
+static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCMCTreeNode *node ) {
gboolean canEdit = FALSE;
gboolean canDelete = TRUE;
gboolean canAdd = FALSE;
if( iface->haveLibrary ) {
/* Enable appropriate File / New command */
atci = adapter->atci;
- menu_set_sensitive( addrbook.menu_factory, atci->menuCommand, TRUE );
+ cm_menu_set_sensitive_full(addrbook.ui_manager, atci->menuCommand, TRUE );
}
}
canEditTr = canExport = FALSE;
}
}
- if( addrbook.listSelected == NULL ) canEdit = FALSE;
+ if( addrbook.listSelected == NULL )
+ canEdit = FALSE;
/* Enable add */
- menu_set_sensitive( addrbook.menu_factory, "/Address/New Address", editAddress );
- menu_set_sensitive( addrbook.menu_factory, "/Address/New Group", canAdd );
- menu_set_sensitive( addrbook.menu_factory, "/Book/New Folder", canAdd );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/NewAddress", editAddress );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/NewGroup", canAdd );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/NewFolder", canAdd );
gtk_widget_set_sensitive( addrbook.reg_btn, editAddress );
/* Enable edit */
- menu_set_sensitive( addrbook.menu_factory, "/Address/Edit", canEdit );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canDelete );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Edit", canEdit );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Delete", canDelete );
gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
- menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book", canEditTr );
- menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", canEditTr );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/EditBook", canEditTr );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/DeleteBook", canEditTr );
/* Export data */
- menu_set_sensitive( addrbook.menu_factory, "/Tools/Export HTML...", canExport );
- menu_set_sensitive( addrbook.menu_factory, "/Tools/Export LDIF...", canExport );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Tools/ExportHTML", canExport );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Tools/ExportLDIF", canExport );
}
-static void addressbook_list_menu_setup( void );
-
/**
* Address book tree callback function that responds to selection of tree
* items.
* \param column Column number where selected occurred.
* \param data Pointer to user data.
*/
-static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
+static void addressbook_tree_selected(GtkCMCTree *ctree, GtkCMCTreeNode *node,
gint column, gpointer data)
{
AddressObject *obj = NULL;
addressbook_status_show( "" );
if( addrbook.entry != NULL ) gtk_entry_set_text(GTK_ENTRY(addrbook.entry), "");
- if( node ) obj = gtk_ctree_node_get_row_data( ctree, node );
+ if( node ) obj = gtk_cmctree_node_get_row_data( ctree, node );
if( obj == NULL ) {
addressbook_set_clist(NULL, TRUE);
return;
static gboolean tVal = TRUE;
ads = ADAPTER_DSOURCE(obj);
- if( ads == NULL ) return;
+
ds = ads->dataSource;
if( ds == NULL ) return;
if( ! addrindex_ds_get_access_flag( ds ) ) {
/* Remove existing folders and groups */
- gtk_clist_freeze( GTK_CLIST(ctree) );
+ gtk_cmclist_freeze( GTK_CMCLIST(ctree) );
addressbook_tree_remove_children( ctree, node );
- gtk_clist_thaw( GTK_CLIST(ctree) );
+ gtk_cmclist_thaw( GTK_CMCLIST(ctree) );
/* Load folders into the tree */
rootFolder = addrindex_ds_get_root_folder( ds );
}
addressbook_node_add_folder( node, ds, rootFolder, aot );
addrindex_ds_set_access_flag( ds, &tVal );
- gtk_ctree_expand( ctree, node );
+ gtk_cmctree_expand( ctree, node );
}
} else {
addressbook_set_clist(NULL, TRUE);
/* Setup main menu selections */
addressbook_menubar_set_sensitive( FALSE );
- addressbook_list_menu_setup();
addressbook_menuitem_set_sensitive( obj, node );
-
addressbook_list_select_clear();
addressbook_list_menu_setup();
return;
* required.
*/
static void addressbook_list_menu_setup( void ) {
- GtkCTree *clist = NULL;
+ GtkCMCTree *clist = NULL;
AddressObject *pobj = NULL;
AddressObject *obj = NULL;
AdapterDSource *ads = NULL;
gboolean canPaste = FALSE;
gboolean canBrowse = FALSE;
- pobj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+ pobj = gtk_cmctree_node_get_row_data( GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected );
if( pobj == NULL ) return;
- clist = GTK_CTREE(addrbook.clist);
- obj = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
+ clist = GTK_CMCTREE(addrbook.clist);
+ obj = gtk_cmctree_node_get_row_data( clist, addrbook.listSelected );
if( obj == NULL ) canEdit = FALSE;
menu_set_insensitive_all( GTK_MENU_SHELL(addrbook.list_popup) );
- menu_set_sensitive( addrbook.list_factory, "/Select all", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/SelectAll", TRUE );
if( pobj->type == ADDR_DATASOURCE ) {
/* Parent object is a data source */
ads = ADAPTER_DSOURCE(pobj);
ds = ads->dataSource;
+ if (!ds)
+ return;
iface = ds->interface;
+ if (!iface)
+ return;
if( ! iface->readOnly ) {
- menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/NewAddress", TRUE );
if (iface->type != ADDR_IF_LDAP)
- menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/NewGroup", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
- if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
- if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
- if( obj ) canEdit = TRUE;
+ if( obj )
+ canEdit = TRUE;
+ canDelete = canEdit;
}
- canDelete = canEdit;
}
else if( pobj->type != ADDR_INTERFACE ) {
/* Parent object is not an interface */
if (!ds)
return;
iface = ds->interface;
+ if (!iface)
+ return;
if( ! iface->readOnly ) {
/* Folder or group */
if( pobj->type == ADDR_ITEM_FOLDER || pobj->type == ADDR_ITEM_GROUP ) {
- menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/NewAddress", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
if( obj ) canEdit = TRUE;
}
/* Folder */
if( pobj->type == ADDR_ITEM_FOLDER ) {
if (iface->type != ADDR_IF_LDAP)
- menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/NewGroup", TRUE );
if( obj ) canEdit = TRUE;
}
- if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
- if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
canDelete = canEdit;
}
- if( iface && iface->type == ADDR_IF_LDAP ) {
+ if( iface->type == ADDR_IF_LDAP ) {
if( obj ) canBrowse = TRUE;
canEdit = TRUE;
canDelete = TRUE;
}
}
- if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
+
+ if( iface ) {
+ /* Enable cut and paste */
+ if( ! addrclip_is_empty( _clipBoard_ ) )
+ canPaste = TRUE;
+ if( ! addrselect_test_empty( _addressSelect_ ) )
+ canCut = TRUE;
+ /* Enable copy if something is selected */
+ if( ! addrselect_test_empty( _addressSelect_ ) )
+ canCopy = TRUE;
+ }
/* Disable edit or browse if more than one row selected */
- if( GTK_CLIST(clist)->selection && GTK_CLIST(clist)->selection->next ) {
+ if( GTK_CMCLIST(clist)->selection && GTK_CMCLIST(clist)->selection->next ) {
canEdit = FALSE;
canBrowse = FALSE;
}
- /* Now go finalize menu items */
- menu_set_sensitive( addrbook.list_factory, "/Edit", canEdit );
- menu_set_sensitive( addrbook.list_factory, "/Delete", canDelete );
+ /* Forbid write changes when read-only */
+ if( iface && iface->readOnly ) {
+ canCut = FALSE;
+ canDelete = FALSE;
+ canPaste = FALSE;
+ }
- menu_set_sensitive( addrbook.list_factory, "/Cut", canCut );
- menu_set_sensitive( addrbook.list_factory, "/Copy", canCopy );
- menu_set_sensitive( addrbook.list_factory, "/Paste", canPaste );
-/* menu_set_sensitive( addrbook.list_factory, "/Paste Address", canPaste );*/
+ /* Now go finalize menu items */
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/Edit", canEdit );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/Delete", canDelete );
- menu_set_sensitive( addrbook.list_factory, "/Mail To", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/Cut", canCut );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/Copy", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/Paste", canPaste );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", canCut );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", canCopy );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Paste", canPaste );
-/* menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", canPaste );*/
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/Mailto", canCopy );
- menu_set_sensitive( addrbook.tree_factory, "/Cut", canCut );
- menu_set_sensitive( addrbook.tree_factory, "/Copy", canCopy );
- menu_set_sensitive( addrbook.tree_factory, "/Paste", canPaste );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Cut", canCut );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Copy", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Paste", canPaste );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Edit", canEdit );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canDelete );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Edit", canEdit );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Delete", canDelete );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Mailto", canCopy );
gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
+ if (addrbook.target_compose) {
+ gtk_widget_set_sensitive(addrbook.to_btn, obj ? TRUE : FALSE);
+ gtk_widget_set_sensitive(addrbook.cc_btn, obj ? TRUE : FALSE);
+ gtk_widget_set_sensitive(addrbook.bcc_btn, obj ? TRUE : FALSE);
+ }
#ifdef USE_LDAP
- menu_set_sensitive( addrbook.list_factory, "/Browse Entry", canBrowse );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/BrowseEntry", canBrowse );
#endif
}
-static void addressbook_select_row_tree (GtkCTree *ctree,
- GtkCTreeNode *node,
+static void addressbook_select_row_tree (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gint column,
gpointer data)
{
* \param listItems List of items.
*/
static void addressbook_treenode_add_list(
- GtkCTreeNode *treeNode, AddressDataSource *ds, GList *listItems )
+ GtkCMCTreeNode *treeNode, AddressDataSource *ds, GList *listItems )
{
GList *node;
node = listItems;
while( node ) {
AddrItemObject *aio;
- GtkCTreeNode *nn;
+ GtkCMCTreeNode *nn;
aio = node->data;
- if( ADDRESS_OBJECT_TYPE(aio) == ITEMTYPE_GROUP ) {
+ if( ADDRESS_OBJECT_TYPE(aio) == ADDR_ITEM_GROUP ) {
ItemGroup *group;
group = ( ItemGroup * ) aio;
nn = addressbook_node_add_group( treeNode, ds, group );
+ if (nn == NULL) {
+ g_message("error adding addressbook group\n");
+ }
}
- else if( ADDRESS_OBJECT_TYPE(aio) == ITEMTYPE_FOLDER ) {
+ else if( ADDRESS_OBJECT_TYPE(aio) == ADDR_ITEM_FOLDER ) {
ItemFolder *folder;
folder = ( ItemFolder * ) aio;
nn = addressbook_node_add_folder(
treeNode, ds, folder, ADDR_ITEM_FOLDER );
+ if (nn == NULL) {
+ g_message("error adding addressbook folder\n");
+ }
}
node = g_list_next( node );
}
}
-static void addressbook_select_all_cb( void ) {
- gtk_clist_select_all(GTK_CLIST(addrbook.clist));
+static void addressbook_select_all_cb( GtkAction *action, gpointer data ) {
+ gtk_cmclist_select_all(GTK_CMCLIST(addrbook.clist));
}
/**
* Cut from address list widget.
*/
-static void addressbook_clip_cut_cb( void ) {
+static void addressbook_clip_cut_cb( GtkAction *action, gpointer data ) {
_clipBoard_->cutFlag = TRUE;
addrclip_clear( _clipBoard_ );
addrclip_add( _clipBoard_, _addressSelect_ );
/**
* Copy from address list widget.
*/
-static void addressbook_clip_copy_cb( void ) {
+static void addressbook_clip_copy_cb(GtkAction *action, gpointer data) {
_clipBoard_->cutFlag = FALSE;
addrclip_clear( _clipBoard_ );
addrclip_add( _clipBoard_, _addressSelect_ );
/**
* Paste clipboard into address list widget.
*/
-static void addressbook_clip_paste_cb( void ) {
- GtkCTree *ctree = GTK_CTREE( addrbook.ctree );
+static void addressbook_clip_paste_cb( GtkAction *action, gpointer data ) {
+ GtkCMCTree *ctree = GTK_CMCTREE( addrbook.ctree );
AddressObject *pobj = NULL;
AddressDataSource *ds = NULL;
AddressBookFile *abf = NULL;
ItemFolder *folder = NULL;
GList *folderGroup = NULL;
- ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+ ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
if( ds == NULL ) return;
if( addrindex_ds_get_readonly( ds ) ) {
- addressbook_ds_status_message(
- ds, _( "Cannot paste. Target address book is readonly." ) );
+ alertpanel_error( _("Cannot paste. Target address book is readonly.") );
return;
}
- pobj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+ pobj = gtk_cmctree_node_get_row_data( ctree, addrbook.treeSelected );
if( pobj ) {
if( pobj->type == ADDR_ITEM_FOLDER ) {
folder = ADAPTER_FOLDER(pobj)->itemFolder;
}
else if( pobj->type == ADDR_ITEM_GROUP ) {
- addressbook_ds_status_message(
- ds, _( "Cannot paste into an address group." ) );
+ alertpanel_error( _("Cannot paste into an address group.") );
return;
}
}
/* Update tree by inserting node for each folder or group */
addressbook_treenode_add_list(
addrbook.treeSelected, ds, folderGroup );
- gtk_ctree_expand( ctree, addrbook.treeSelected );
+ gtk_cmctree_expand( ctree, addrbook.treeSelected );
g_list_free( folderGroup );
folderGroup = NULL;
}
/* Display items pasted */
gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
addressbook_set_clist(
- gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree),
addrbook.opened),
TRUE);
AddressObject *obj = NULL;
AddressDataSource *ds = NULL;
AddrSelectItem *item;
- GtkCTree *ctree = GTK_CTREE( addrbook.ctree );
- GtkCTreeNode *node;
+ GtkCMCTree *ctree = GTK_CMCTREE( addrbook.ctree );
+ GtkCMCTreeNode *node;
node = addrbook.treeSelected;
if( node == NULL ) return;
- obj = gtk_ctree_node_get_row_data( ctree, node );
+ obj = gtk_cmctree_node_get_row_data( ctree, node );
if( obj == NULL ) return;
ds = addressbook_find_datasource( node );
/**
* Cut from tree widget.
*/
-static void addressbook_treenode_cut_cb( void ) {
+static void addressbook_treenode_cut_cb( GtkAction *action, gpointer data ) {
_clipBoard_->cutFlag = TRUE;
addressbook_treenode_to_clipboard();
addrclip_clear( _clipBoard_ );
/**
* Copy from tree widget.
*/
-static void addressbook_treenode_copy_cb( void ) {
+static void addressbook_treenode_copy_cb( GtkAction *action, gpointer data ) {
_clipBoard_->cutFlag = FALSE;
addressbook_treenode_to_clipboard();
addrclip_clear( _clipBoard_ );
/**
* Paste clipboard into address tree widget.
*/
-static void addressbook_treenode_paste_cb( void ) {
- addressbook_clip_paste_cb();
+static void addressbook_treenode_paste_cb( GtkAction *action, gpointer data ) {
+ addressbook_clip_paste_cb(NULL,NULL);
}
/**
/**
* Invoke EMail compose window with addresses in selected address list.
*/
-static void addressbook_mail_to_cb( void ) {
+static void addressbook_mail_to_cb( GtkAction *action, gpointer data ) {
GList *listAddress;
if( ! addrselect_test_empty( _addressSelect_ ) ) {
}
}
-static void addressbook_list_row_selected( GtkCTree *clist,
- GtkCTreeNode *node,
+static void addressbook_list_row_selected( GtkCMCTree *clist,
+ GtkCMCTreeNode *node,
gint column,
gpointer data )
{
- GtkEntry *entry = GTK_ENTRY(addrbook.entry);
AddrItemObject *aio = NULL;
AddressObject *pobj = NULL;
AdapterDSource *ads = NULL;
AddressDataSource *ds = NULL;
- gtk_entry_set_text( entry, "" );
addrbook.listSelected = node;
- pobj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+ pobj = gtk_cmctree_node_get_row_data( GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected );
if( pobj == NULL ) return;
if( pobj->type == ADDR_DATASOURCE ) {
ds = addressbook_find_datasource( addrbook.treeSelected );
}
- aio = gtk_ctree_node_get_row_data( clist, node );
+ aio = gtk_cmctree_node_get_row_data( clist, node );
if( aio ) {
/* g_print( "list select: %d : '%s'\n", aio->type, aio->name ); */
addressbook_list_select_add( aio, ds );
addressbook_list_menu_setup();
- if (!addrbook.target_compose && !prefs_common.addressbook_use_editaddress_dialog)
- addressbook_edit_address(NULL, 0, NULL, FALSE);
+ if (!addrbook.target_compose && !prefs_common.addressbook_use_editaddress_dialog) {
+ AddressObject *obj = gtk_cmctree_node_get_row_data( clist, addrbook.listSelected );
+
+ if (obj && obj->type != ADDR_ITEM_GROUP)
+ addressbook_edit_address(NULL, 0, NULL, FALSE);
+ }
}
-static void addressbook_list_row_unselected( GtkCTree *ctree,
- GtkCTreeNode *node,
+static void addressbook_list_row_unselected( GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gint column,
gpointer data )
{
AddrItemObject *aio;
- aio = gtk_ctree_node_get_row_data( ctree, node );
+ aio = gtk_cmctree_node_get_row_data( ctree, node );
if( aio != NULL ) {
/* g_print( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
addressbook_list_select_remove( aio );
addressbook_edit_person_invalidate(NULL, NULL, NULL);
}
-/* from gdkevents.c */
-#define DOUBLE_CLICK_TIME 250
+static void addressbook_entry_activated(GtkWidget *widget, gpointer data)
+{
+ addressbook_lup_clicked(NULL, NULL);
+}
static gboolean addressbook_list_button_pressed(GtkWidget *widget,
GdkEventButton *event,
gpointer data)
{
- static guint32 lasttime = 0;
if( ! event ) return FALSE;
addressbook_list_menu_setup();
gtk_menu_popup( GTK_MENU(addrbook.list_popup), NULL, NULL, NULL, NULL,
event->button, event->time );
} else if (event->button == 1) {
- if (event->time - lasttime < DOUBLE_CLICK_TIME) {
+ if (event->type == GDK_2BUTTON_PRESS) {
if (prefs_common.add_address_by_click &&
addrbook.target_compose)
addressbook_to_clicked(NULL, GINT_TO_POINTER(COMPOSE_TO));
else
if (prefs_common.addressbook_use_editaddress_dialog)
- addressbook_edit_address_cb(NULL, 0, NULL);
-
- lasttime = 0;
- } else
- lasttime = event->time;
+ addressbook_edit_address_cb(NULL, NULL);
+ else {
+ GtkCMCTree *clist = GTK_CMCTREE(addrbook.clist);
+ AddressObject *obj = gtk_cmctree_node_get_row_data( clist, addrbook.listSelected );
+ if( obj && obj->type == ADDR_ITEM_GROUP )
+ addressbook_edit_address_cb(NULL, NULL);
+ }
+ }
}
return FALSE;
GdkEventButton *event,
gpointer data)
{
- GtkCList *clist = GTK_CLIST(ctree);
+ GtkCMCList *clist = GTK_CMCLIST(ctree);
gint row, column;
AddressObject *obj = NULL;
AdapterDSource *ads = NULL;
gboolean canTreeCopy = FALSE;
gboolean canTreePaste = FALSE;
gboolean canLookup = FALSE;
- GtkCTreeNode *node = NULL;
-
+ GtkCMCTreeNode *node = NULL;
+
if( ! event ) return FALSE;
+/* if( ! event || event->type != GDK_BUTTON_PRESS) return FALSE;*/
+
+ if (event->button == 1) {
+ if (event->type == GDK_2BUTTON_PRESS) {
+ if( gtk_cmclist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
+ gtkut_clist_set_focus_row(clist, row);
+ obj = gtk_cmclist_get_row_data( clist, row );
+ }
+ if( obj == NULL )
+ return FALSE;
+
+ if (obj->type == ADDR_ITEM_GROUP ||
+ obj->type == ADDR_DATASOURCE) {
+ /* edit group */
+ addressbook_treenode_edit_cb(NULL, NULL);
+ } else {
+ /* expand pr collapse */
+ node = gtk_cmctree_node_nth(GTK_CMCTREE(ctree), row);
+ gtk_cmctree_toggle_expansion(GTK_CMCTREE(ctree), node);
+ }
+ return FALSE;
+ }
+ }
+
addressbook_menubar_set_sensitive( FALSE );
- if( gtk_clist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
+ if( gtk_cmclist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
gtkut_clist_set_focus_row(clist, row);
- obj = gtk_clist_get_row_data( clist, row );
+ obj = gtk_cmclist_get_row_data( clist, row );
}
menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.tree_popup));
- if( obj == NULL ) return FALSE;
- node = gtk_ctree_node_nth(GTK_CTREE(clist), row);
+ if( obj == NULL )
+ return FALSE;
+ node = gtk_cmctree_node_nth(GTK_CMCTREE(clist), row);
- if( ! addrclip_is_empty( _clipBoard_ ) ) {
+ if( ! addrclip_is_empty( _clipBoard_ ) )
canTreePaste = TRUE;
- }
if (obj->type == ADDR_INTERFACE) {
AdapterInterface *adapter = ADAPTER_INTERFACE(obj);
iface = adapter->interface;
- canEdit = FALSE;
- canDelete = FALSE;
- canTreeCopy = FALSE;
- if( iface->readOnly ) {
- canTreePaste = FALSE;
- }
- else {
- menu_set_sensitive( addrbook.tree_factory, "/New Book", TRUE );
+ if( !iface )
+ goto just_set_sens;
+ if( !iface->readOnly ) {
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewBook", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
- if( iface->externalQuery ) canLookup = TRUE;
+ if( iface->externalQuery )
+ canLookup = TRUE;
}
if (obj->type == ADDR_DATASOURCE) {
+ canLookup = TRUE;
ads = ADAPTER_DSOURCE(obj);
ds = ads->dataSource;
- if (!ds)
+ if( !ds )
goto just_set_sens;
iface = ds->interface;
- if (!iface)
+ if( !iface )
goto just_set_sens;
- canEdit = TRUE;
- canDelete = TRUE;
- if( iface->readOnly ) {
- canTreePaste = FALSE;
- }
- else {
- menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
- menu_set_sensitive( addrbook.tree_factory, "/New Group", TRUE );
+ if( !iface->readOnly ) {
+ canDelete = TRUE;
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewFolder", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewGroup", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
+ canEdit = TRUE;
canTreeCopy = TRUE;
- if( iface->externalQuery ) canLookup = TRUE;
}
else if (obj->type == ADDR_ITEM_FOLDER) {
+ canLookup = TRUE;
ds = addressbook_find_datasource( node );
- if (!ds) {
+ if( !ds )
goto just_set_sens;
- }
iface = ds->interface;
- if (!iface)
+ if( !iface )
goto just_set_sens;
- if( iface->readOnly ) {
- canTreePaste = FALSE;
- }
- else {
+ if( !iface->readOnly ) {
canEdit = TRUE;
canDelete = TRUE;
canTreeCut = TRUE;
- menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
- menu_set_sensitive( addrbook.tree_factory, "/New Group", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewFolder", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewGroup", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
canTreeCopy = TRUE;
if( iface->externalQuery ) {
/* Enable deletion of LDAP folder */
- canLookup = TRUE;
canDelete = TRUE;
}
}
else if (obj->type == ADDR_ITEM_GROUP) {
+ canLookup = TRUE;
ds = addressbook_find_datasource( node );
- if (!ds)
+ if( !ds )
goto just_set_sens;
iface = ds->interface;
- if (!iface)
+ if( !iface )
goto just_set_sens;
if( ! iface->readOnly ) {
canEdit = TRUE;
canDelete = TRUE;
- menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/NewAddress", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
}
- else if (obj->type == ADDR_INTERFACE) {
- canTreePaste = FALSE;
- }
- if( canEdit ) {
- if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
+ if( canEdit && !addrselect_test_empty( _addressSelect_ ) )
+ canCut = TRUE;
+ if( ! addrselect_test_empty( _addressSelect_ ) )
+ canCopy = TRUE;
+ if( ! addrclip_is_empty( _clipBoard_ ) )
+ canPaste = TRUE;
+
+ /* Forbid write changes when read-only */
+ if( iface && iface->readOnly ) {
+ canTreeCut = FALSE;
+ canTreePaste = FALSE;
+ canCut = FALSE;
+ canDelete = FALSE;
+ canPaste = FALSE;
}
- if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
- if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
just_set_sens:
/* Enable edit */
- menu_set_sensitive( addrbook.tree_factory, "/Edit", canEdit );
- menu_set_sensitive( addrbook.tree_factory, "/Delete", canDelete );
- menu_set_sensitive( addrbook.tree_factory, "/Cut", canTreeCut );
- menu_set_sensitive( addrbook.tree_factory, "/Copy", canTreeCopy );
- menu_set_sensitive( addrbook.tree_factory, "/Paste", canTreePaste );
-
- menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book", canEdit );
- menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", canEdit );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", canCut );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", canCopy );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Paste", canPaste );
-/* menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", canPaste );*/
-
- addressbook_show_buttons(addrbook.target_compose == NULL, canLookup, addrbook.target_compose != NULL);
- if( event->button == 3 ) {
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/EditBook", canEdit );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/DeleteBook", canDelete );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/Cut", canTreeCut );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/Copy", canTreeCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/Paste", canTreePaste );
+
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/EditBook", canEdit );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/DeleteBook", canEdit );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Cut", canCut );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Copy", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Paste", canPaste );
+
+ addressbook_show_buttons(addrbook.target_compose == NULL, canLookup,
+ addrbook.target_compose != NULL);
+
+ if( event->button == 3 )
gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, NULL,
event->button, event->time);
- }
return FALSE;
}
GdkEventButton *event,
gpointer data)
{
- gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree), addrbook.opened);
+ gtkut_ctree_set_focus_row(GTK_CMCTREE(addrbook.ctree), addrbook.opened);
return FALSE;
}
-static void addressbook_new_folder_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void addressbook_new_folder_cb(GtkAction *action, gpointer data)
{
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
AddressObject *obj = NULL;
AddressDataSource *ds = NULL;
AddressBookFile *abf = NULL;
ItemFolder *folder = NULL;
if( ! addrbook.treeSelected ) return;
- obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+ obj = gtk_cmctree_node_get_row_data( ctree, addrbook.treeSelected );
if( obj == NULL ) return;
ds = addressbook_find_datasource( addrbook.treeSelected );
if( ds == NULL ) return;
if( abf == NULL ) return;
folder = addressbook_edit_folder( abf, parentFolder, NULL );
if( folder ) {
- GtkCTreeNode *nn;
+ GtkCMCTreeNode *nn;
nn = addressbook_node_add_folder(
addrbook.treeSelected, ds, folder, ADDR_ITEM_FOLDER );
- gtk_ctree_expand( ctree, addrbook.treeSelected );
+ if (nn == NULL) {
+ g_message("error adding addressbook folder\n");
+ }
+ gtk_cmctree_expand( ctree, addrbook.treeSelected );
if( addrbook.treeSelected == addrbook.opened )
addressbook_set_clist(obj, TRUE);
}
-
}
-static void addressbook_new_group_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void addressbook_new_group_cb(GtkAction *action, gpointer data)
{
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
AddressObject *obj = NULL;
AddressDataSource *ds = NULL;
AddressBookFile *abf = NULL;
ItemGroup *group = NULL;
if( ! addrbook.treeSelected ) return;
- obj = gtk_ctree_node_get_row_data(ctree, addrbook.treeSelected);
+ obj = gtk_cmctree_node_get_row_data(ctree, addrbook.treeSelected);
if( obj == NULL ) return;
ds = addressbook_find_datasource( addrbook.treeSelected );
if( ds == NULL ) return;
if( abf == NULL ) return;
group = addressbook_edit_group( abf, parentFolder, NULL );
if( group ) {
- GtkCTreeNode *nn;
+ GtkCMCTreeNode *nn;
nn = addressbook_node_add_group( addrbook.treeSelected, ds, group );
- gtk_ctree_expand( ctree, addrbook.treeSelected );
+ if (nn == NULL) {
+ g_message("error adding addressbook group\n");
+ }
+ gtk_cmctree_expand( ctree, addrbook.treeSelected );
if( addrbook.treeSelected == addrbook.opened )
addressbook_set_clist(obj, TRUE);
}
-
}
-static void addressbook_change_node_name(GtkCTreeNode *node, const gchar *name)
+static void addressbook_change_node_name(GtkCMCTreeNode *node, const gchar *name)
{
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
gchar *text[1];
guint8 spacing;
- GdkPixmap *pix_cl, *pix_op;
- GdkBitmap *mask_cl, *mask_op;
+ GdkPixbuf *pix_cl, *pix_op;
gboolean is_leaf, expanded;
- gtk_ctree_get_node_info(ctree, node, text, &spacing,
- &pix_cl, &mask_cl, &pix_op, &mask_op,
+ gtk_cmctree_get_node_info(ctree, node, text, &spacing,
+ &pix_cl, &pix_op,
&is_leaf, &expanded);
- gtk_sctree_set_node_info(ctree, node, name, spacing,
- pix_cl, mask_cl, pix_op, mask_op,
+ gtk_cmctree_set_node_info(ctree, node, name, spacing,
+ pix_cl, pix_op,
is_leaf, expanded);
}
* \param 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, GtkCMCTreeNode *node ) {
gchar *newName = NULL;
AddressDataSource *ds = NULL;
AddressInterface *iface = NULL;
/*
* Edit an object that is in the address tree area.
*/
-static void addressbook_treenode_edit_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void addressbook_treenode_edit_cb(GtkAction *action, gpointer data)
{
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
AddressObject *obj;
AddressDataSource *ds = NULL;
AddressBookFile *abf = NULL;
- GtkCTreeNode *node = NULL, *parentNode = NULL;
+ GtkCMCTreeNode *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( GTK_CMCTREE_ROW(node)->level == 1 ) return;
+ obj = gtk_cmctree_node_get_row_data( ctree, node );
if( obj == NULL ) return;
- parentNode = GTK_CTREE_ROW(node)->parent;
+ parentNode = GTK_CMCTREE_ROW(node)->parent;
ds = addressbook_find_datasource( node );
if( ds == NULL ) return;
/* Update node in tree view */
addressbook_change_node_name( node, name );
gtk_sctree_sort_node(ctree, parentNode);
- gtk_ctree_expand( ctree, node );
+ gtk_cmctree_expand( ctree, node );
gtk_sctree_select( GTK_SCTREE( ctree), node );
}
}
* \param action Action.
* \param widget Widget issuing callback.
*/
-static void addressbook_treenode_delete_cb(
- gpointer data, guint action, GtkWidget *widget )
+static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
{
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
- GtkCTreeNode *node = NULL;
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
+ GtkCMCTreeNode *node = NULL;
AddressObject *obj;
gchar *message;
AlertValue aval;
if( ! addrbook.treeSelected ) return;
node = addrbook.treeSelected;
- if( GTK_CTREE_ROW(node)->level == 1 ) return;
+ if( GTK_CMCTREE_ROW(node)->level == 1 ) return;
- obj = gtk_ctree_node_get_row_data( ctree, node );
- g_return_if_fail(obj != NULL);
+ obj = gtk_cmctree_node_get_row_data( ctree, node );
+ cm_return_if_fail(obj != NULL);
if( obj->type == ADDR_DATASOURCE ) {
ads = ADAPTER_DSOURCE(obj);
- if( ads == NULL ) return;
+
ds = ads->dataSource;
if( ds == NULL ) return;
}
/* Confirm deletion */
delType = ADDRTREE_DEL_NONE;
if( obj->type == ADDR_ITEM_FOLDER ) {
- if( iface->externalQuery ) {
+ if( iface && iface->externalQuery ) {
message = g_strdup_printf( _(
"Do you want to delete the query " \
- "results and addresses in '%s' ?" ),
+ "results and addresses in '%s'?" ),
obj->name );
aval = alertpanel( _("Delete"), message,
GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
}
else {
message = g_strdup_printf
- ( _( "Do you want to delete '%s' ?"
+ ( _( "Do you want to delete '%s'? "
"If you delete the folder only, the addresses it contains will be moved into the parent folder." ),
obj->name );
aval = alertpanel( _("Delete folder"), message,
- GTK_STOCK_CANCEL, _("+Delete _folder only"), _("Delete folder and _addresses"));
+ GTK_STOCK_CANCEL, g_strconcat("+",_("Delete _folder only"), NULL), _("Delete folder and _addresses"));
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ONLY;
/* Proceed with deletion */
if( obj->type == ADDR_DATASOURCE ) {
/* Remove node from tree */
- gtk_ctree_remove_node( ctree, node );
-
+ gtk_cmctree_remove_node( ctree, node );
+
+ if (delType == ADDRTREE_DEL_DATA &&
+ ds->interface && ds->interface->type == ADDR_IF_BOOK)
+ addrbook_delete_book_file((AddressBookFile *) ds->rawDataSource);
+
/* Remove data source. */
if( addrindex_index_remove_datasource( _addressIndex_, ds ) ) {
addrindex_free_datasource( ds );
cache = adbase->addressCache;
/* Remove query results folder */
- if( iface->externalQuery ) {
+ if( iface && iface->externalQuery ) {
AdapterFolder *adapter = ADAPTER_FOLDER(obj);
ItemFolder *folder = adapter->itemFolder;
*/
addrindex_remove_results( ds, folder );
/* g_print( "-------------- remove node\n" ); */
- gtk_ctree_remove_node( ctree, node );
+ gtk_cmctree_remove_node( ctree, node );
return;
}
if( remFlag ) {
/* Remove node. */
- gtk_ctree_remove_node(ctree, node );
+ gtk_cmctree_remove_node(ctree, node );
}
}
{
if( person && addrbook.treeSelected == addrbook.opened ) {
person->status = ADD_ENTRY;
- gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
+ gtk_cmclist_unselect_all( GTK_CMCLIST(addrbook.clist) );
addressbook_folder_refresh_one_person(
- GTK_CTREE(addrbook.clist), person );
+ GTK_CMCTREE(addrbook.clist), person );
}
addressbook_address_list_set_focus();
}
person->status = ADD_ENTRY;
gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
addressbook_set_clist(
- gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree),
addrbook.opened),
TRUE);
}
static ItemFolder * addressbook_setup_subf(
AddressDataSource *ds, gchar *title,
- GtkCTreeNode *pNode )
+ GtkCMCTreeNode *pNode )
{
AddrBookBase *adbase;
AddressCache *cache;
ItemFolder *folder;
- GtkCTree *ctree;
- GtkCTreeNode *nNode;
+ GtkCMCTree *ctree;
+ GtkCMCTreeNode *nNode;
gchar *name;
AddressObjectType aoType = ADDR_NONE;
GList *children;
return NULL;
}
- ctree = GTK_CTREE(addrbook.ctree);
+ ctree = GTK_CMCTREE(addrbook.ctree);
/* Get reference to address cache */
adbase = ( AddrBookBase * ) ds->rawDataSource;
cache = adbase->addressCache;
for (; cur; cur = cur->next) {
ItemFolder *child = (ItemFolder *) cur->data;
if (!strcmp2(ADDRITEM_NAME(child), title)) {
- nNode = gtk_ctree_find_by_row_data_custom(
+ nNode = gtk_cmctree_find_by_row_data_custom(
ctree, NULL, child,
addressbook_treenode_find_folder_cb );
if( nNode ) {
/* Now let's see the folder */
nNode = addressbook_node_add_folder( pNode, ds, folder, aoType );
- gtk_ctree_expand( ctree, pNode );
+ gtk_cmctree_expand( ctree, pNode );
if( nNode ) {
gtk_sctree_select( GTK_SCTREE(ctree), nNode );
addrbook.treeSelected = nNode;
return NULL;
}
-static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *widget ) {
+static void addressbook_new_address_cb( GtkAction *action, gpointer data ) {
AddressObject *pobj = NULL;
AddressDataSource *ds = NULL;
AddressBookFile *abf = NULL;
debug_print("adding address\n");
- pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
+ pobj = gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected);
if( pobj == NULL ) {
debug_print("no row data\n");
return;
}
- ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+ ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
if( ds == NULL ) {
debug_print("no datasource\n");
return;
ItemPerson *person;
ItemFolder *folder = NULL;
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
- GtkCTreeNode *parentNode;
- ds = addressbook_find_datasource( GTK_CTREE_NODE( addrbook.treeSelected ) );
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
+ GtkCMCTreeNode *parentNode;
+ ds = addressbook_find_datasource( GTK_CMCTREE_NODE( addrbook.treeSelected ) );
if( ds == NULL ) return;
/* We must have a datasource that is an external interface */
if( ! ds->interface->externalQuery ) return;
if( pobj->type == ADDR_ITEM_FOLDER ) {
- parentNode = GTK_CTREE_ROW(GTK_CTREE_NODE( addrbook.treeSelected ) )->parent;
+ parentNode = GTK_CMCTREE_ROW(GTK_CMCTREE_NODE( addrbook.treeSelected ) )->parent;
}
else {
- parentNode = GTK_CTREE_NODE( addrbook.treeSelected );
+ parentNode = GTK_CMCTREE_NODE( addrbook.treeSelected );
}
folder = addressbook_setup_subf( ds, _("New Contacts"), parentNode );
- pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
- ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
- abf = ds->rawDataSource;
+ ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
+ if (ds)
+ abf = ds->rawDataSource;
}
#endif
person = addressbook_edit_person( abf, folder, NULL, FALSE,
addressbook_new_address_from_book_post_cb,
TRUE );
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (ds && abf && abf->type == ADBOOKTYPE_LDAP) {
LdapServer *server = ds->rawDataSource;
ldapsvr_set_modified(server, TRUE);
ldapsvr_update_book(server, NULL);
ItemFolder *folder = ADAPTER_FOLDER(pobj)->itemFolder;
ItemPerson *person;
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
- GtkCTreeNode *parentNode;
- ds = addressbook_find_datasource( GTK_CTREE_NODE( addrbook.treeSelected ) );
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
+ GtkCMCTreeNode *parentNode;
+ ds = addressbook_find_datasource( GTK_CMCTREE_NODE( addrbook.treeSelected ) );
if( ds == NULL ) return;
/* We must have a datasource that is an external interface */
if( ! ds->interface->externalQuery ) return;
if( pobj->type == ADDR_ITEM_FOLDER ) {
- parentNode = GTK_CTREE_ROW(GTK_CTREE_NODE( addrbook.treeSelected ) )->parent;
+ parentNode = GTK_CMCTREE_ROW(GTK_CMCTREE_NODE( addrbook.treeSelected ) )->parent;
}
else {
- parentNode = GTK_CTREE_NODE( addrbook.treeSelected );
+ parentNode = GTK_CMCTREE_NODE( addrbook.treeSelected );
}
folder = addressbook_setup_subf( ds, _("New Contacts"), parentNode );
if (!folder)
return;
- pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
- ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
- abf = ds->rawDataSource;
+
+ ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
+ if (ds)
+ abf = ds->rawDataSource;
}
#endif
person = addressbook_edit_person( abf, folder, NULL, FALSE,
addressbook_new_address_from_folder_post_cb,
TRUE );
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (ds && abf && abf->type == ADBOOKTYPE_LDAP) {
LdapServer *server = ds->rawDataSource;
ldapsvr_set_modified(server, TRUE);
ldapsvr_update_book(server, NULL);
addressbook_change_node_name( addrbook.treeSelected, ADDRITEM_NAME(group) );
gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
addressbook_set_clist(
- gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree),
addrbook.opened),
TRUE);
}
* \param parent Parent node.
* \param group Group to find.
*/
-static GtkCTreeNode *addressbook_find_group_node( GtkCTreeNode *parent, ItemGroup *group ) {
- GtkCTreeNode *node = NULL;
- GtkCTreeRow *currRow;
+static GtkCMCTreeNode *addressbook_find_group_node( GtkCMCTreeNode *parent, ItemGroup *group ) {
+ GtkCMCTreeNode *node = NULL;
+ GtkCMCTreeRow *currRow;
- currRow = GTK_CTREE_ROW( parent );
+ currRow = GTK_CMCTREE_ROW( parent );
if( currRow ) {
node = currRow->children;
while( node ) {
AddressObject *obj;
- obj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), node );
- if( obj->type == ADDR_ITEM_GROUP ) {
+ obj = gtk_cmctree_node_get_row_data( GTK_CMCTREE(addrbook.ctree), node );
+ if(obj && obj->type == ADDR_ITEM_GROUP ) {
ItemGroup *g = ADAPTER_GROUP(obj)->itemGroup;
if( g == group ) return node;
}
- currRow = GTK_CTREE_ROW(node);
+ currRow = GTK_CMCTREE_ROW(node);
node = currRow->sibling;
}
}
return abf;
}
-static void addressbook_tree_remove_children( GtkCTree *ctree, GtkCTreeNode *parent ) {
- GtkCTreeNode *node;
- GtkCTreeRow *row;
+static void addressbook_tree_remove_children( GtkCMCTree *ctree, GtkCMCTreeNode *parent ) {
+ GtkCMCTreeNode *node;
+ GtkCMCTreeRow *row;
/* Remove existing folders and groups */
- row = GTK_CTREE_ROW( parent );
+ row = GTK_CMCTREE_ROW( parent );
if( row ) {
while( (node = row->children) ) {
- gtk_ctree_remove_node( ctree, node );
+ gtk_cmctree_remove_node( ctree, node );
}
}
}
-static void addressbook_move_nodes_up( GtkCTree *ctree, GtkCTreeNode *node ) {
- GtkCTreeNode *parent, *child;
- GtkCTreeRow *currRow;
- currRow = GTK_CTREE_ROW( node );
+static void addressbook_move_nodes_up( GtkCMCTree *ctree, GtkCMCTreeNode *node ) {
+ GtkCMCTreeNode *parent, *child;
+ GtkCMCTreeRow *currRow;
+ currRow = GTK_CMCTREE_ROW( node );
if( currRow ) {
parent = currRow->parent;
while( (child = currRow->children) ) {
- gtk_ctree_move( ctree, child, parent, node );
+ gtk_cmctree_move( ctree, child, parent, node );
}
gtk_sctree_sort_node( ctree, parent );
}
static void addressbook_edit_address_post_cb( ItemPerson *person )
{
if( person ) {
+#ifdef USE_LDAP
+ AddressBookFile *abf = addressbook_get_book_file();
- addressbook_folder_refresh_one_person( GTK_CTREE(addrbook.clist), person );
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
+ if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
+ addritem_person_set_nick_name( person, ADDRITEM_NAME(person));
+ }
+#endif
+ addressbook_folder_refresh_one_person( GTK_CMCTREE(addrbook.clist), person );
invalidate_address_completion();
}
addressbook_address_list_set_focus();
void addressbook_address_list_disable_some_actions(void)
{
/* disable address copy/pasting when editing contact's detail (embedded form) */
- menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", FALSE );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", FALSE );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Paste", FALSE );
-
- /* we're already editing contact's detail here */
- menu_set_sensitive( addrbook.menu_factory, "/Address/Edit", FALSE );
- gtk_widget_set_sensitive( addrbook.edit_btn, FALSE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Cut", FALSE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Copy", FALSE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Paste", FALSE );
}
-static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget *widget ) {
- addressbook_edit_address(data, action, widget, TRUE);
+static void addressbook_edit_address_cb( GtkAction *action, gpointer data ) {
+ addressbook_edit_address(data, 0, NULL, TRUE);
}
static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
gboolean force_focus ) {
- GtkCTree *clist = GTK_CTREE(addrbook.clist);
- GtkCTree *ctree;
+ GtkCMCTree *clist = GTK_CMCTREE(addrbook.clist);
+ GtkCMCTree *ctree;
AddressObject *obj = NULL, *pobj = NULL;
AddressDataSource *ds = NULL;
- GtkCTreeNode *node = NULL, *parentNode = NULL;
+ GtkCMCTreeNode *node = NULL, *parentNode = NULL;
gchar *name = NULL;
AddressBookFile *abf = NULL;
if( addrbook.listSelected == NULL ) return;
- obj = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
- g_return_if_fail(obj != NULL);
+ obj = gtk_cmctree_node_get_row_data( clist, addrbook.listSelected );
+ cm_return_if_fail(obj != NULL);
- ctree = GTK_CTREE( addrbook.ctree );
- pobj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
- node = gtk_ctree_find_by_row_data( ctree, addrbook.treeSelected, obj );
+ ctree = GTK_CMCTREE( addrbook.ctree );
+ pobj = gtk_cmctree_node_get_row_data( ctree, addrbook.treeSelected );
- ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+ ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
if( ds == NULL ) return;
abf = addressbook_get_book_file();
if( obj->type == ADDR_ITEM_EMAIL ) {
ItemEMail *email = ( ItemEMail * ) obj;
- if( email == NULL ) return;
+
if( pobj && pobj->type == ADDR_ITEM_GROUP ) {
/* Edit parent group */
AdapterGroup *adapter = ADAPTER_GROUP(pobj);
if( addressbook_edit_group( abf, NULL, itemGrp ) == NULL ) return;
name = ADDRITEM_NAME(itemGrp);
node = addrbook.treeSelected;
- parentNode = GTK_CTREE_ROW(node)->parent;
+ parentNode = GTK_CMCTREE_ROW(node)->parent;
}
else {
/* Edit person - email page */
(prefs_common.addressbook_use_editaddress_dialog||force_focus) )
!= NULL ) {
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
ldapsvr_set_modified( (LdapServer *) abf, TRUE );
person->status = UPDATE_ENTRY;
}
(prefs_common.addressbook_use_editaddress_dialog||force_focus) )
!= NULL ) {
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
ldapsvr_set_modified( (LdapServer *) abf, TRUE );
person->status = UPDATE_ENTRY;
}
gtk_sctree_sort_node( ctree, parentNode );
gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
addressbook_set_clist(
- gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree),
addrbook.opened),
TRUE);
}
-static void addressbook_delete_address_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void addressbook_delete_address_cb(GtkAction *action, gpointer data)
{
- gtk_clist_freeze(GTK_CLIST(addrbook.clist));
addressbook_del_clicked(NULL, NULL);
- gtk_clist_thaw(GTK_CLIST(addrbook.clist));
}
-static void close_cb(gpointer data, guint action, GtkWidget *widget)
+static void close_cb(GtkAction *action, gpointer data)
{
addressbook_close();
}
-static void addressbook_file_save_cb( gpointer data, guint action, GtkWidget *widget ) {
+static void addressbook_file_save_cb( GtkAction *action, gpointer data ) {
addressbook_export_to_file();
}
-static void addressbook_person_expand_node( GtkCTree *ctree, GList *node, gpointer *data ) {
+static void addressbook_person_expand_node( GtkCMCTree *ctree, GList *node, gpointer *data ) {
if( node ) {
- ItemPerson *person = gtk_ctree_node_get_row_data( ctree, GTK_CTREE_NODE(node) );
+ ItemPerson *person = gtk_cmctree_node_get_row_data( ctree, GTK_CMCTREE_NODE(node) );
if( person ) addritem_person_set_opened( person, TRUE );
}
}
-static void addressbook_person_collapse_node( GtkCTree *ctree, GList *node, gpointer *data ) {
+static void addressbook_person_collapse_node( GtkCMCTree *ctree, GList *node, gpointer *data ) {
if( node ) {
- ItemPerson *person = gtk_ctree_node_get_row_data( ctree, GTK_CTREE_NODE(node) );
+ ItemPerson *person = gtk_cmctree_node_get_row_data( ctree, GTK_CMCTREE_NODE(node) );
if( person ) addritem_person_set_opened( person, FALSE );
}
}
return str;
}
-static void addressbook_load_group( GtkCTree *clist, ItemGroup *itemGroup ) {
+static gboolean addressbook_match_item(const gchar *name,
+ const gchar *email_alias,
+ const gchar *addr,
+ const gchar *remarks,
+ const gchar *str)
+{
+ if (!name)
+ return FALSE;
+ if (!str || str[0] == '\0')
+ return TRUE;
+ if (strcasestr(name, str))
+ return TRUE;
+ else if (email_alias && strcasestr(email_alias, str))
+ return TRUE;
+ else if (addr && strcasestr(addr, str))
+ return TRUE;
+ else if (remarks && strcasestr(remarks, str))
+ return TRUE;
+
+ return FALSE;
+}
+
+static void addressbook_load_group( GtkCMCTree *clist, ItemGroup *itemGroup ) {
GList *items = itemGroup->listEMail;
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+ const gchar *search_str = gtk_entry_get_text(GTK_ENTRY(addrbook.entry));
for( ; items != NULL; items = g_list_next( items ) ) {
- GtkCTreeNode *nodeEMail = NULL;
+ GtkCMCTreeNode *nodeEMail = NULL;
gchar *text[N_LIST_COLS];
ItemEMail *email = items->data;
ItemPerson *person;
if( ! email ) continue;
person = ( ItemPerson * ) ADDRITEM_PARENT(email);
+
+ if( !addressbook_match_item(ADDRITEM_NAME(person),
+ ADDRITEM_NAME(email),
+ email->address, email->remarks,
+ search_str))
+ continue;
+
str = addressbook_format_item_clist( person, email );
if( str ) {
- text[COL_NAME] = str;
+ text[COL_NAME] = addressbook_set_col_name_guard(str);
}
else {
- text[COL_NAME] = ADDRITEM_NAME(person);
+ text[COL_NAME] = addressbook_set_col_name_guard(ADDRITEM_NAME(person));
}
text[COL_ADDRESS] = email->address;
text[COL_REMARKS] = email->remarks;
nodeEMail = gtk_sctree_insert_node(
clist, NULL, NULL,
text, FOLDER_SPACING,
- atci->iconXpm, atci->maskXpm,
- atci->iconXpmOpen, atci->maskXpmOpen,
+ atci->iconXpm,
+ atci->iconXpmOpen,
FALSE, FALSE );
- gtk_ctree_node_set_row_data( clist, nodeEMail, email );
+ gtk_cmctree_node_set_row_data( clist, nodeEMail, email );
g_free( str );
str = NULL;
}
}
+gchar *addressbook_set_col_name_guard(gchar *value)
+{
+ gchar *ret = "<not set>";
+ gchar *tmp = g_strdup(value);
+ g_strstrip(tmp);
+ if (tmp !=NULL && *tmp != '\0')
+ ret = value;
+ g_free(tmp);
+ return ret;
+}
+
static void addressbook_folder_load_one_person(
- GtkCTree *clist, ItemPerson *person,
+ GtkCMCTree *clist, ItemPerson *person,
AddressTypeControlItem *atci,
AddressTypeControlItem *atciMail )
{
- GtkCTreeNode *nodePerson = NULL;
- GtkCTreeNode *nodeEMail = NULL;
+ GtkCMCTreeNode *nodePerson = NULL;
+ GtkCMCTreeNode *nodeEMail = NULL;
gchar *text[N_LIST_COLS];
gboolean flgFirst = TRUE, haveAddr = FALSE;
GList *node;
+#ifdef USE_LDAP
AddressBookFile *abf = addressbook_get_book_file();
+#endif
if( person == NULL ) return;
/* First email belongs with person */
gchar *str = addressbook_format_item_clist( person, email );
if( str ) {
- text[COL_NAME] = str;
+ text[COL_NAME] = addressbook_set_col_name_guard(str);
}
#ifdef USE_LDAP
- else if( abf && abf->type == ADDR_IF_LDAP &&
+ else if( abf && abf->type == ADBOOKTYPE_LDAP &&
person && person->nickName ) {
if (person->nickName) {
if (strcmp(person->nickName, "") != 0) {
- text[COL_NAME] = person->nickName;
+ text[COL_NAME] = addressbook_set_col_name_guard(person->nickName);
}
else {
- text[COL_NAME] = ADDRITEM_NAME(person);
+ text[COL_NAME] = addressbook_set_col_name_guard(ADDRITEM_NAME(person));
}
}
}
#endif
else {
- text[COL_NAME] = ADDRITEM_NAME(person);
+ text[COL_NAME] = addressbook_set_col_name_guard(ADDRITEM_NAME(person));
}
nodePerson = gtk_sctree_insert_node(
clist, NULL, NULL,
text, FOLDER_SPACING,
- atci->iconXpm, atci->maskXpm,
- atci->iconXpmOpen, atci->maskXpmOpen,
+ atci->iconXpm,
+ atci->iconXpmOpen,
FALSE, person->isOpened );
g_free( str );
str = NULL;
- gtk_ctree_node_set_row_data(clist, nodePerson, person );
+ gtk_cmctree_node_set_row_data(clist, nodePerson, person );
}
else {
/* Subsequent email is a child node of person */
nodeEMail = gtk_sctree_insert_node(
clist, nodePerson, NULL,
text, FOLDER_SPACING,
- atciMail->iconXpm, atciMail->maskXpm,
- atciMail->iconXpmOpen, atciMail->maskXpmOpen,
+ atciMail->iconXpm,
+ atciMail->iconXpmOpen,
FALSE, TRUE );
- gtk_ctree_node_set_row_data(clist, nodeEMail, email );
+ gtk_cmctree_node_set_row_data(clist, nodeEMail, email );
}
flgFirst = FALSE;
haveAddr = TRUE;
}
if( ! haveAddr ) {
/* Have name without EMail */
- text[COL_NAME] = ADDRITEM_NAME(person);
+ text[COL_NAME] = addressbook_set_col_name_guard(ADDRITEM_NAME(person));
text[COL_ADDRESS] = "";
text[COL_REMARKS] = "";
nodePerson = gtk_sctree_insert_node(
clist, NULL, NULL,
text, FOLDER_SPACING,
- atci->iconXpm, atci->maskXpm,
- atci->iconXpmOpen, atci->maskXpmOpen,
+ atci->iconXpm,
+ atci->iconXpmOpen,
FALSE, person->isOpened );
- gtk_ctree_node_set_row_data(clist, nodePerson, person );
+ gtk_cmctree_node_set_row_data(clist, nodePerson, person );
}
return;
}
-static void addressbook_folder_load_person( GtkCTree *clist, ItemFolder *itemFolder ) {
+static void addressbook_folder_load_person( GtkCMCTree *clist, ItemFolder *itemFolder ) {
GList *items;
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+ const gchar *search_str;
if( atci == NULL ) return;
if( atciMail == NULL ) return;
+ search_str = gtk_entry_get_text(GTK_ENTRY(addrbook.entry));
+
/* Load email addresses */
items = addritem_folder_get_person_list( itemFolder );
for( ; items != NULL; items = g_list_next( items ) ) {
+ ItemPerson *person;
+ GList *node;
+ ItemEMail *email;
+
+ person = (ItemPerson *)items->data;
+ if (!person)
+ continue;
+ node = person->listEMail;
+ if (node && node->data) {
+ email = node->data;
+ if (!addressbook_match_item(ADDRITEM_NAME(person), ADDRITEM_NAME(email), email->address, email->remarks, search_str))
+ continue;
+ } else {
+ if (!addressbook_match_item(ADDRITEM_NAME(person), NULL, NULL, NULL, search_str))
+ continue;
+ }
+
addressbook_folder_load_one_person( clist, items->data, atci, atciMail );
}
/* Free up the list */
g_list_free( items );
}
-static void addressbook_folder_remove_node( GtkCTree *clist, GtkCTreeNode *node ) {
+static void addressbook_folder_remove_node( GtkCMCTree *clist, GtkCMCTreeNode *node ) {
addrbook.listSelected = NULL;
- gtk_ctree_remove_node( clist, node );
+ gtk_cmctree_remove_node( clist, node );
addressbook_menubar_set_sensitive( FALSE );
addressbook_menuitem_set_sensitive(
- gtk_ctree_node_get_row_data(
- GTK_CTREE(clist), addrbook.treeSelected ),
+ gtk_cmctree_node_get_row_data(
+ GTK_CMCTREE(clist), addrbook.treeSelected ),
addrbook.treeSelected );
}
-static void addressbook_folder_refresh_one_person( GtkCTree *clist, ItemPerson *person ) {
+static void addressbook_folder_refresh_one_person( GtkCMCTree *clist, ItemPerson *person ) {
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
- GtkCTreeNode *node;
+ GtkCMCTreeNode *node;
if( atci == NULL ) return;
if( atciMail == NULL ) return;
if( person == NULL ) return;
/* unload the person */
- node = gtk_ctree_find_by_row_data( clist, NULL, person );
+ node = gtk_cmctree_find_by_row_data( clist, NULL, person );
if( node )
addressbook_folder_remove_node( clist, node );
addressbook_folder_load_one_person( clist, person, atci, atciMail );
gtk_sctree_sort_node( clist, NULL );
- node = gtk_ctree_find_by_row_data( clist, NULL, person );
+ node = gtk_cmctree_find_by_row_data( clist, NULL, person );
if( node ) {
gtk_sctree_select( GTK_SCTREE(clist), node );
- if (!gtk_ctree_node_is_visible( clist, node ) )
- gtk_ctree_node_moveto( clist, node, 0, 0, 0 );
+ if (!gtk_cmctree_node_is_visible( clist, node ) )
+ gtk_cmctree_node_moveto( clist, node, 0, 0, 0 );
}
}
-static void addressbook_folder_remove_one_person( GtkCTree *clist, ItemPerson *person ) {
- GtkCTreeNode *node;
- gint row;
+static void addressbook_folder_remove_one_person( GtkCMCTree *clist, ItemPerson *person ) {
+ GtkCMCTreeNode *node;
if( person == NULL ) return;
- node = gtk_ctree_find_by_row_data( clist, NULL, person );
- row = gtk_clist_find_row_from_data( GTK_CLIST(clist), person );
+ node = gtk_cmctree_find_by_row_data( clist, NULL, person );
if( node ) {
addressbook_folder_remove_node( clist, node );
}
}
-static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFolder ) {
+static void addressbook_folder_load_group( GtkCMCTree *clist, ItemFolder *itemFolder ) {
GList *items;
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_GROUP );
+ const gchar *search_str;
/* Load any groups */
if( ! atci ) return;
+
+ search_str = gtk_entry_get_text(GTK_ENTRY(addrbook.entry));
+
items = addritem_folder_get_group_list( itemFolder );
for( ; items != NULL; items = g_list_next( items ) ) {
- GtkCTreeNode *nodeGroup = NULL;
+ GtkCMCTreeNode *nodeGroup = NULL;
gchar *text[N_LIST_COLS];
ItemGroup *group = items->data;
if( group == NULL ) continue;
+ if( !addressbook_match_item(ADDRITEM_NAME(group),
+ NULL, NULL, NULL, search_str) )
+ continue;
+
text[COL_NAME] = ADDRITEM_NAME(group);
text[COL_ADDRESS] = "";
text[COL_REMARKS] = "";
nodeGroup = gtk_sctree_insert_node(clist, NULL, NULL,
text, FOLDER_SPACING,
- atci->iconXpm, atci->maskXpm,
- atci->iconXpmOpen, atci->maskXpmOpen,
+ atci->iconXpm,
+ atci->iconXpmOpen,
FALSE, FALSE);
- gtk_ctree_node_set_row_data(clist, nodeGroup, group );
+ gtk_cmctree_node_set_row_data(clist, nodeGroup, group );
gtk_sctree_sort_node(clist, NULL);
}
/* Free up the list */
AddrSelectItem *cutItem;
AddressCache *cache;
AddrItemObject *aio;
- GtkCTree *ctree = GTK_CTREE( addrbook.ctree );
- GtkCTreeNode *tn;
+ GtkCMCTree *ctree = GTK_CMCTREE( addrbook.ctree );
+ GtkCMCTreeNode *tn;
node = _clipBoard_->objectList;
while( node ) {
ItemFolder *folder;
folder = ( ItemFolder * ) aio;
- tn = gtk_ctree_find_by_row_data_custom(
+ tn = gtk_cmctree_find_by_row_data_custom(
ctree, NULL, folder,
addressbook_treenode_find_folder_cb );
}
ItemGroup *group;
group = ( ItemGroup * ) aio;
- tn = gtk_ctree_find_by_row_data_custom(
+ tn = gtk_cmctree_find_by_row_data_custom(
ctree, NULL, group,
addressbook_treenode_find_group_cb );
}
if( tn ) {
/* Free up adapter and remove node. */
- gtk_ctree_remove_node( ctree, tn );
+ gtk_cmctree_remove_node( ctree, tn );
}
}
}
* \param node Node to test.
* \return Data source, or NULL if not found.
*/
-static AddressDataSource *addressbook_find_datasource( GtkCTreeNode *node ) {
+static AddressDataSource *addressbook_find_datasource( GtkCMCTreeNode *node ) {
AddressDataSource *ds = NULL;
AddressObject *ao;
- g_return_val_if_fail(addrbook.ctree != NULL, NULL);
+ cm_return_val_if_fail(addrbook.ctree != NULL, NULL);
while( node ) {
- if( GTK_CTREE_ROW(node)->level < 2 ) return NULL;
- ao = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), node );
+ if( GTK_CMCTREE_ROW(node)->level < 2 ) return NULL;
+ ao = gtk_cmctree_node_get_row_data( GTK_CMCTREE(addrbook.ctree), node );
if( ao ) {
/* g_print( "ao->type = %d\n", ao->type ); */
if( ao->type == ADDR_DATASOURCE ) {
break;
}
}
- node = GTK_CTREE_ROW(node)->parent;
+ node = GTK_CMCTREE_ROW(node)->parent;
}
return ds;
}
* \param obj Parent object to be loaded.
*/
static void addressbook_set_clist( AddressObject *obj, gboolean refresh ) {
- GtkCTree *ctreelist = GTK_CTREE(addrbook.clist);
- GtkCList *clist = GTK_CLIST(addrbook.clist);
+ GtkCMCTree *ctreelist = GTK_CMCTREE(addrbook.clist);
+ GtkCMCList *clist = GTK_CMCLIST(addrbook.clist);
AddressDataSource *ds = NULL;
AdapterDSource *ads = NULL;
static AddressObject *last_obj = NULL;
last_obj = obj;
if( obj == NULL ) {
- gtk_clist_clear(clist);
+ gtk_cmclist_clear(clist);
return;
}
if( obj->type == ADDR_INTERFACE ) {
/* g_print( "set_clist: loading datasource...\n" ); */
- /* addressbook_node_load_datasource( GTK_CTREE(clist), obj ); */
+ /* addressbook_node_load_datasource( GTK_CMCTREE(clist), obj ); */
return;
}
- gtk_clist_freeze(clist);
- gtk_clist_clear(clist);
+ gtk_cmclist_freeze(clist);
+ gtk_cmclist_clear(clist);
if( obj->type == ADDR_DATASOURCE ) {
ads = ADAPTER_DSOURCE(obj);
- ds = ADAPTER_DSOURCE(obj)->dataSource;
+ ds = ads->dataSource;
if( ds ) {
/* Load root folder */
ItemFolder *rootFolder = NULL;
rootFolder = addrindex_ds_get_root_folder( ds );
addressbook_folder_load_person(
- ctreelist, addrindex_ds_get_root_folder( ds ) );
+ ctreelist, rootFolder );
addressbook_folder_load_group(
- ctreelist, addrindex_ds_get_root_folder( ds ) );
+ ctreelist, rootFolder );
}
}
else {
addressbook_folder_load_group( ctreelist, itemFolder );
}
}
- gtk_sctree_sort_recursive(GTK_CTREE(clist), NULL);
+ gtk_sctree_sort_recursive(GTK_CMCTREE(clist), NULL);
clist->focus_row = -1;
- gtk_clist_thaw(clist);
+ gtk_cmclist_thaw(clist);
}
/**
* Call back function to free adaptor. Call back is setup by function
- * gtk_ctree_node_set_row_data_full() when node is populated. This function is
+ * gtk_cmctree_node_set_row_data_full() when node is populated. This function is
* called when the address book tree widget node is removed by calling
- * function gtk_ctree_remove_node().
+ * function gtk_cmctree_remove_node().
*
* \param data Tree node's row data.
*/
* Load tree from address index with the initial data.
*/
static void addressbook_load_tree( void ) {
- GtkCTree *ctree = GTK_CTREE( addrbook.ctree );
+ GtkCMCTree *ctree = GTK_CMCTREE( addrbook.ctree );
GList *nodeIf, *nodeDS;
AdapterInterface *adapter;
AddressInterface *iface;
AddressTypeControlItem *atci;
AddressDataSource *ds;
AdapterDSource *ads;
- GtkCTreeNode *node, *newNode;
+ GtkCMCTreeNode *node, *newNode;
gchar *name;
nodeIf = _addressInterfaceList_;
nodeDS = iface->listSource;
while( nodeDS ) {
ds = nodeDS->data;
- newNode = NULL;
name = addrindex_ds_get_name( ds );
ads = addressbook_create_ds_adapter(
ds, atci->objectType, name );
newNode = addressbook_add_object(
node, ADDRESS_OBJECT(ads) );
+ if (newNode == NULL) {
+ g_message("error adding addressbook object\n");
+ }
nodeDS = g_list_next( nodeDS );
}
- gtk_ctree_expand( ctree, node );
+ gtk_cmctree_expand( ctree, node );
}
}
nodeIf = g_list_next( nodeIf );
return retVal;
}
+static gboolean migrate_addrbook(const gchar *origdir, const gchar *destdir)
+{
+ GDir *dp;
+ const gchar *d;
+ gboolean failed = FALSE;
+ GError *error = NULL;
+
+ if( ( dp = g_dir_open( origdir, 0, &error ) ) == NULL ) {
+ debug_print("opening '%s' failed: %d (%s)\n", origdir,
+ error->code, error->message);
+ g_error_free(error);
+ return FALSE;
+ }
+
+ while( ( d = g_dir_read_name( dp ) ) != NULL ) {
+ if (strncmp(d, "addrbook-", strlen("addrbook-")))
+ continue;
+ else {
+ gchar *orig_file = g_strconcat(origdir, G_DIR_SEPARATOR_S,
+ d, NULL);
+ gchar *dest_file = g_strconcat(destdir, G_DIR_SEPARATOR_S,
+ d, NULL);
+ if (copy_file(orig_file, dest_file, FALSE) < 0) {
+ failed = TRUE;
+ }
+ g_free(orig_file);
+ g_free(dest_file);
+ if (failed) {
+ break;
+ }
+ }
+ }
+ g_dir_close( dp );
+
+ if (!failed) {
+ /* all copies succeeded, we can remove source files */
+ if( ( dp = g_dir_open( origdir, 0, &error ) ) == NULL ) {
+ debug_print("opening '%s' failed: %d (%s)\n", origdir,
+ error->code, error->message);
+ g_error_free(error);
+ return FALSE;
+ }
+ while( ( d = g_dir_read_name( dp ) ) != NULL ) {
+ if (strncmp(d, "addrbook-", strlen("addrbook-")))
+ continue;
+ else {
+ gchar *orig_file = g_strconcat(origdir, G_DIR_SEPARATOR_S,
+ d, NULL);
+ claws_unlink(orig_file);
+ g_free(orig_file);
+ }
+ }
+ g_dir_close( dp );
+ }
+
+ return !failed;
+}
+
void addressbook_read_file( void ) {
AddressIndex *addrIndex = NULL;
-
+ gchar *indexdir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, NULL);
+
debug_print( "Reading address index...\n" );
if( _addressIndex_ ) {
debug_print( "address book already read!!!\n" );
addrindex_initialize();
/* Use new address book index. */
- addrindex_set_file_path( addrIndex, get_rc_dir() );
+
+ if ( !is_dir_exist(indexdir) ) {
+ if ( make_dir(indexdir) < 0 ) {
+ addrindex_set_file_path( addrIndex, get_rc_dir() );
+ g_warning( "couldn't create dir '%s'", indexdir);
+ } else {
+ if (!migrate_addrbook(get_rc_dir(), indexdir)) {
+ remove_dir_recursive(indexdir);
+ addrindex_set_file_path( addrIndex, get_rc_dir() );
+ g_error("couldn't migrate dir %s", indexdir);
+ } else {
+ addrindex_set_file_path( addrIndex, indexdir);
+ }
+ }
+ } else {
+ addrindex_set_file_path( addrIndex, indexdir);
+ }
+ g_free(indexdir);
addrindex_set_file_name( addrIndex, ADDRESSBOOK_INDEX_FILE );
addrindex_read_data( addrIndex );
if( addrIndex->retVal == MGU_NO_FILE ) {
* obj Object to add.
* Return: Node that was added, or NULL if object not added.
*/
-static GtkCTreeNode *addressbook_add_object(GtkCTreeNode *node,
+static GtkCMCTreeNode *addressbook_add_object(GtkCMCTreeNode *node,
AddressObject *obj)
{
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
- GtkCTreeNode *added;
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
+ GtkCMCTreeNode *added;
AddressObject *pobj;
AddressObjectType otype;
AddressTypeControlItem *atci = NULL;
- g_return_val_if_fail(node != NULL, NULL);
- g_return_val_if_fail(obj != NULL, NULL);
+ cm_return_val_if_fail(node != NULL, NULL);
+ cm_return_val_if_fail(obj != NULL, NULL);
- pobj = gtk_ctree_node_get_row_data(ctree, node);
- g_return_val_if_fail(pobj != NULL, NULL);
+ pobj = gtk_cmctree_node_get_row_data(ctree, node);
+ cm_return_val_if_fail(pobj != NULL, NULL);
/* Determine object type to be displayed */
if( obj->type == ADDR_DATASOURCE ) {
gchar **name;
name = &obj->name;
added = gtk_sctree_insert_node( ctree, node, NULL, name, FOLDER_SPACING,
- atci->iconXpm, atci->maskXpm, atci->iconXpmOpen, atci->maskXpmOpen,
+ atci->iconXpm, atci->iconXpmOpen,
atci->treeLeaf, atci->treeExpand );
- gtk_ctree_node_set_row_data_full( ctree, added, obj,
+ gtk_cmctree_node_set_row_data_full( ctree, added, obj,
addressbook_free_treenode );
}
}
* \param itemGroup Group to add.
* \return Inserted node.
*/
-static GtkCTreeNode *addressbook_node_add_group(
- GtkCTreeNode *node, AddressDataSource *ds,
+static GtkCMCTreeNode *addressbook_node_add_group(
+ GtkCMCTreeNode *node, AddressDataSource *ds,
ItemGroup *itemGroup )
{
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
- GtkCTreeNode *newNode;
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
+ GtkCMCTreeNode *newNode;
AdapterGroup *adapter;
AddressTypeControlItem *atci = NULL;
gchar **name;
adapter->itemGroup = itemGroup;
newNode = gtk_sctree_insert_node( ctree, node, NULL, name, FOLDER_SPACING,
- atci->iconXpm, atci->maskXpm, atci->iconXpm, atci->maskXpm,
+ atci->iconXpm, atci->iconXpm,
atci->treeLeaf, atci->treeExpand );
- gtk_ctree_node_set_row_data_full( ctree, newNode, adapter,
+ gtk_cmctree_node_set_row_data_full( ctree, newNode, adapter,
addressbook_free_treenode );
gtk_sctree_sort_node( ctree, node );
return newNode;
* \param otype Object type to display.
* \return Inserted node for the folder.
*/
-static GtkCTreeNode *addressbook_node_add_folder(
- GtkCTreeNode *node, AddressDataSource *ds,
+static GtkCMCTreeNode *addressbook_node_add_folder(
+ GtkCMCTreeNode *node, AddressDataSource *ds,
ItemFolder *itemFolder, AddressObjectType otype )
{
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
- GtkCTreeNode *newNode = NULL;
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
+ GtkCMCTreeNode *newNode = NULL;
AdapterFolder *adapter;
AddressTypeControlItem *atci = NULL;
GList *listItems = NULL;
ItemFolder *rootFolder;
/* Only visible folders */
- if( itemFolder->isHidden ) return NULL;
+ if( itemFolder == NULL || itemFolder->isHidden )
+ return NULL;
- if( ds == NULL ) return NULL;
- if( node == NULL || itemFolder == NULL ) return NULL;
+ if( ds == NULL )
+ return NULL;
+ if( node == NULL || itemFolder == NULL )
+ return NULL;
/* Determine object type */
atci = addrbookctl_lookup( otype );
- if( atci == NULL ) return NULL;
+ if( atci == NULL )
+ return NULL;
rootFolder = addrindex_ds_get_root_folder( ds );
if( itemFolder == rootFolder ) {
name = ADDRITEM_NAME(itemFolder);
newNode = gtk_sctree_insert_node( ctree, node, NULL, &name, FOLDER_SPACING,
- atci->iconXpm, atci->maskXpm, atci->iconXpm, atci->maskXpm,
+ atci->iconXpm, atci->iconXpm,
atci->treeLeaf, atci->treeExpand );
if( newNode ) {
- gtk_ctree_node_set_row_data_full( ctree, newNode, adapter,
+ gtk_cmctree_node_set_row_data_full( ctree, newNode, adapter,
addressbook_free_treenode );
}
}
static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter))
+ if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter))
addressbook_lup_clicked(NULL, NULL);
return FALSE;
}
* address index widget.
*/
static gint addressbook_treenode_compare_func(
- GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
+ GtkCMCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
{
- GtkCell *cell1 = ((GtkCListRow *)ptr1)->cell;
- GtkCell *cell2 = ((GtkCListRow *)ptr2)->cell;
+ GtkCMCell *cell1 = ((GtkCMCListRow *)ptr1)->cell;
+ GtkCMCell *cell2 = ((GtkCMCListRow *)ptr2)->cell;
gchar *name1 = NULL, *name2 = NULL;
if( cell1 ) name1 = cell1->u.text;
if( cell2 ) name2 = cell2->u.text;
return g_utf8_collate( name1, name2 );
}
-static void addressbook_new_book_cb( gpointer data, guint action, GtkWidget *widget ) {
+static void addressbook_new_book_cb( GtkAction *action, gpointer data ) {
AdapterDSource *ads;
AdapterInterface *adapter;
- GtkCTreeNode *newNode;
+ GtkCMCTreeNode *newNode;
adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
if( adapter == NULL ) return;
}
}
-static void addressbook_new_vcard_cb( gpointer data, guint action, GtkWidget *widget ) {
+static void addressbook_new_vcard_cb( GtkAction *action, gpointer data ) {
AdapterDSource *ads;
AdapterInterface *adapter;
- GtkCTreeNode *newNode;
+ GtkCMCTreeNode *newNode;
adapter = addrbookctl_find_interface( ADDR_IF_VCARD );
if( adapter == NULL ) return;
}
#ifdef USE_JPILOT
-static void addressbook_new_jpilot_cb( gpointer data, guint action, GtkWidget *widget ) {
+static void addressbook_new_jpilot_cb( GtkAction *action, gpointer data ) {
AdapterDSource *ads;
AdapterInterface *adapter;
AddressInterface *iface;
- GtkCTreeNode *newNode;
+ GtkCMCTreeNode *newNode;
adapter = addrbookctl_find_interface( ADDR_IF_JPILOT );
if( adapter == NULL ) return;
#endif
#ifdef USE_LDAP
-static void addressbook_new_ldap_cb( gpointer data, guint action, GtkWidget *widget ) {
+static void addressbook_new_ldap_cb( GtkAction *action, gpointer data ) {
AdapterDSource *ads;
AdapterInterface *adapter;
AddressInterface *iface;
- GtkCTreeNode *newNode;
+ GtkCMCTreeNode *newNode;
adapter = addrbookctl_find_interface( ADDR_IF_LDAP );
if( adapter == NULL ) return;
*/
static void addressbook_refresh_current( void ) {
AddressObject *obj;
- GtkCTree *ctree;
+ GtkCMCTree *ctree;
- ctree = GTK_CTREE(addrbook.ctree);
- obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+ ctree = GTK_CMCTREE(addrbook.ctree);
+ obj = gtk_cmctree_node_get_row_data( ctree, addrbook.treeSelected );
if( obj == NULL ) return;
addressbook_set_clist( obj, TRUE );
}
*/
static void addressbook_perform_search(
AddressDataSource *ds, gchar *searchTerm,
- GtkCTreeNode *pNode )
+ GtkCMCTreeNode *pNode )
{
- AddrBookBase *adbase;
- AddressCache *cache;
ItemFolder *folder;
gchar *name;
gint queryID;
guint idleID;
-#ifdef USE_LDAP
- AddressObjectType aoType = ADDR_NONE;
-#endif
/* Setup a query */
if( *searchTerm == '\0' || strlen( searchTerm ) < 1 ) return;
- if( ds && ds->type == ADDR_IF_LDAP ) {
-#if USE_LDAP
- aoType = ADDR_LDAP_QUERY;
-#endif
- }
- else {
- return;
- }
- /* Get reference to address cache */
- adbase = ( AddrBookBase * ) ds->rawDataSource;
- cache = adbase->addressCache;
+ if( !ds || ds->type != ADDR_IF_LDAP ) return;
/* Create a folder for the search results */
name = g_strdup_printf( _queryFolderLabel_, searchTerm );
/* Set up idler function */
idleID = g_idle_add(
- ( GtkFunction ) addressbook_search_idle,
+ (GSourceFunc) addressbook_search_idle,
GINT_TO_POINTER( queryID ) );
+ if (idleID == 0) {
+ g_message("error adding addressbook_search_idle\n");
+ }
/* Start search, sit back and wait for something to happen */
addrindex_start_search( queryID );
* \param data Data object.
*/
static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
- GtkCTree *ctree;
+ GtkCMCTree *ctree;
AddressObject *obj;
AddressDataSource *ds;
AddressInterface *iface;
gchar *searchTerm;
- GtkCTreeNode *node, *parentNode;
+ GtkCMCTreeNode *node, *parentNode;
node = addrbook.treeSelected;
if( ! node ) return;
- if( GTK_CTREE_ROW(node)->level == 1 ) return;
+ if( GTK_CMCTREE_ROW(node)->level == 1 ) return;
- ctree = GTK_CTREE(addrbook.ctree);
- obj = gtk_ctree_node_get_row_data( ctree, node );
+ ctree = GTK_CMCTREE(addrbook.ctree);
+ obj = gtk_cmctree_node_get_row_data( ctree, node );
if( obj == NULL ) return;
+ if (obj->type != ADDR_DATASOURCE ||
+ ADAPTER_DSOURCE(obj)->subType != ADDR_LDAP) {
+ addressbook_set_clist(
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree),
+ addrbook.treeSelected),
+ TRUE);
+ }
+
ds = addressbook_find_datasource( node );
if( ds == NULL ) return;
g_strchomp( searchTerm );
if( obj->type == ADDR_ITEM_FOLDER ) {
- parentNode = GTK_CTREE_ROW(node)->parent;
+ parentNode = GTK_CMCTREE_ROW(node)->parent;
}
else {
parentNode = node;
/**
* Browse address entry for highlighted entry.
*/
-static void addressbook_browse_entry_cb(void)
+static void addressbook_browse_entry_cb( GtkAction *action, gpointer data)
{
- GtkCTree *clist = GTK_CTREE(addrbook.clist);
+ GtkCMCTree *clist = GTK_CMCTREE(addrbook.clist);
AddressObject *obj;
AddressDataSource *ds;
AddressInterface *iface;
if(addrbook.listSelected == NULL)
return;
- obj = gtk_ctree_node_get_row_data(clist, addrbook.listSelected);
+ obj = gtk_cmctree_node_get_row_data(clist, addrbook.listSelected);
if (obj == NULL)
return;
- ds = addressbook_find_datasource(GTK_CTREE_NODE(addrbook.treeSelected));
+ ds = addressbook_find_datasource(GTK_CMCTREE_NODE(addrbook.treeSelected));
if(ds == NULL)
return;
iface = ds->interface;
- if(! iface->haveLibrary )
+ if(!iface || !iface->haveLibrary )
return;
person = NULL;
if (obj->type == ADDR_ITEM_EMAIL) {
email = ( ItemEMail * ) obj;
- if (email == NULL)
- return;
person = (ItemPerson *) ADDRITEM_PARENT(email);
}
return ioType;
}
+#define UPDATE_ICON_ATCI(id,icon,iconopen) { \
+ atci = addrbookctl_lookup(id); \
+ if (atci) { \
+ atci->iconXpm = icon; \
+ atci->iconXpmOpen = iconopen; \
+ } else { \
+ g_warning("can't get atci %d", id); \
+ } \
+}
+
/*
* Build table that controls the rendering of object types.
*/
-static void addrbookctl_build_map( GtkWidget *window ) {
+static void addrbookctl_build_icons( GtkWidget *window ) {
AddressTypeControlItem *atci;
/* Build icons */
- stock_pixmap_gdk(window, STOCK_PIXMAP_DIR_CLOSE, &folderxpm, &folderxpmmask);
- stock_pixmap_gdk(window, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm, &folderopenxpmmask);
- stock_pixmap_gdk(window, STOCK_PIXMAP_GROUP, &groupxpm, &groupxpmmask);
- stock_pixmap_gdk(window, STOCK_PIXMAP_VCARD, &vcardxpm, &vcardxpmmask);
- stock_pixmap_gdk(window, STOCK_PIXMAP_BOOK, &bookxpm, &bookxpmmask);
- stock_pixmap_gdk(window, STOCK_PIXMAP_ADDRESS, &addressxpm, &addressxpmmask);
- stock_pixmap_gdk(window, STOCK_PIXMAP_JPILOT, &jpilotxpm, &jpilotxpmmask);
- stock_pixmap_gdk(window, STOCK_PIXMAP_CATEGORY, &categoryxpm, &categoryxpmmask);
- stock_pixmap_gdk(window, STOCK_PIXMAP_LDAP, &ldapxpm, &ldapxpmmask);
- stock_pixmap_gdk(window, STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm, &addrsearchxpmmask);
+ if (interfacexpm)
+ g_object_unref(interfacexpm);
+ if (folderxpm)
+ g_object_unref(folderxpm);
+ if (folderopenxpm)
+ g_object_unref(folderopenxpm);
+ if (groupxpm)
+ g_object_unref(groupxpm);
+ if (vcardxpm)
+ g_object_unref(vcardxpm);
+ if (bookxpm)
+ g_object_unref(bookxpm);
+ if (addressxpm)
+ g_object_unref(addressxpm);
+ if (jpilotxpm)
+ g_object_unref(jpilotxpm);
+ if (categoryxpm)
+ g_object_unref(categoryxpm);
+ if (ldapxpm)
+ g_object_unref(ldapxpm);
+ if (addrsearchxpm)
+ g_object_unref(addrsearchxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_INTERFACE, &interfacexpm );
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_CLOSE, &folderxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_GROUP, &groupxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_VCARD, &vcardxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_BOOK, &bookxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_ADDRESS, &addressxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_JPILOT, &jpilotxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_CATEGORY, &categoryxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_LDAP, &ldapxpm);
+ stock_pixbuf_gdk(window, STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm);
+
+ UPDATE_ICON_ATCI(ADDR_INTERFACE,folderxpm,folderopenxpm);
+ UPDATE_ICON_ATCI(ADDR_BOOK,bookxpm,bookxpm);
+ UPDATE_ICON_ATCI(ADDR_ITEM_PERSON,NULL,NULL);
+ UPDATE_ICON_ATCI(ADDR_ITEM_EMAIL,addressxpm,addressxpm);
+ UPDATE_ICON_ATCI(ADDR_ITEM_GROUP,groupxpm,groupxpm);
+ UPDATE_ICON_ATCI(ADDR_ITEM_FOLDER,folderxpm,folderopenxpm);
+ UPDATE_ICON_ATCI(ADDR_VCARD,vcardxpm,vcardxpm);
+ UPDATE_ICON_ATCI(ADDR_JPILOT,jpilotxpm,jpilotxpm);
+ UPDATE_ICON_ATCI(ADDR_CATEGORY,categoryxpm,categoryxpm);
+ UPDATE_ICON_ATCI(ADDR_LDAP,ldapxpm,ldapxpm);
+ UPDATE_ICON_ATCI(ADDR_LDAP_QUERY,addrsearchxpm,addrsearchxpm);
+
+}
+
+/*
+* Build table that controls the rendering of object types.
+*/
+static void addrbookctl_build_map( GtkWidget *window ) {
+ AddressTypeControlItem *atci;
_addressBookTypeHash_ = g_hash_table_new( g_int_hash, g_int_equal );
_addressBookTypeList_ = NULL;
atci->treeExpand = TRUE;
atci->treeLeaf = FALSE;
atci->displayName = _( "Interface" );
- atci->iconXpm = folderxpm;
- atci->maskXpm = folderxpmmask;
- atci->iconXpmOpen = folderopenxpm;
- atci->maskXpmOpen = folderopenxpmmask;
atci->menuCommand = NULL;
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->treeExpand = TRUE;
atci->treeLeaf = FALSE;
atci->displayName = _( "Address Book" );
- atci->iconXpm = bookxpm;
- atci->maskXpm = bookxpmmask;
- atci->iconXpmOpen = bookxpm;
- atci->maskXpmOpen = bookxpmmask;
- atci->menuCommand = "/Book/New Book";
+ atci->menuCommand = "Menu/Book/NewBook";
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->treeExpand = FALSE;
atci->treeLeaf = FALSE;
atci->displayName = _( "Person" );
- atci->iconXpm = NULL;
- atci->maskXpm = NULL;
- atci->iconXpmOpen = NULL;
- atci->maskXpmOpen = NULL;
atci->menuCommand = NULL;
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->showInTree = FALSE;
atci->treeExpand = FALSE;
atci->treeLeaf = TRUE;
- atci->displayName = _( "EMail Address" );
- atci->iconXpm = addressxpm;
- atci->maskXpm = addressxpmmask;
- atci->iconXpmOpen = addressxpm;
- atci->maskXpmOpen = addressxpmmask;
+ atci->displayName = _( "Email Address" );
atci->menuCommand = NULL;
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->treeExpand = FALSE;
atci->treeLeaf = FALSE;
atci->displayName = _( "Group" );
- atci->iconXpm = groupxpm;
- atci->maskXpm = groupxpmmask;
- atci->iconXpmOpen = groupxpm;
- atci->maskXpmOpen = groupxpmmask;
atci->menuCommand = NULL;
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->treeExpand = FALSE;
atci->treeLeaf = FALSE;
atci->displayName = _( "Folder" );
- atci->iconXpm = folderxpm;
- atci->maskXpm = folderxpmmask;
- atci->iconXpmOpen = folderopenxpm;
- atci->maskXpmOpen = folderopenxpmmask;
atci->menuCommand = NULL;
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->treeExpand = TRUE;
atci->treeLeaf = TRUE;
atci->displayName = _( "vCard" );
- atci->iconXpm = vcardxpm;
- atci->maskXpm = vcardxpmmask;
- atci->iconXpmOpen = vcardxpm;
- atci->maskXpmOpen = vcardxpmmask;
- atci->menuCommand = "/Book/New vCard";
+ atci->menuCommand = "Menu/Book/NewVCard";
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->treeExpand = TRUE;
atci->treeLeaf = FALSE;
atci->displayName = _( "JPilot" );
- atci->iconXpm = jpilotxpm;
- atci->maskXpm = jpilotxpmmask;
- atci->iconXpmOpen = jpilotxpm;
- atci->maskXpmOpen = jpilotxpmmask;
- atci->menuCommand = "/Book/New JPilot";
+ atci->menuCommand = "Menu/Book/NewJPilot";
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->treeExpand = TRUE;
atci->treeLeaf = TRUE;
atci->displayName = _( "JPilot" );
- atci->iconXpm = categoryxpm;
- atci->maskXpm = categoryxpmmask;
- atci->iconXpmOpen = categoryxpm;
- atci->maskXpmOpen = categoryxpmmask;
atci->menuCommand = NULL;
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->treeExpand = TRUE;
atci->treeLeaf = FALSE;
atci->displayName = _( "LDAP servers" );
- atci->iconXpm = ldapxpm;
- atci->maskXpm = ldapxpmmask;
- atci->iconXpmOpen = ldapxpm;
- atci->maskXpmOpen = ldapxpmmask;
- atci->menuCommand = "/Book/New LDAP Server";
+ atci->menuCommand = "Menu/Book/NewLDAPServer";
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
atci->treeExpand = FALSE;
atci->treeLeaf = TRUE;
atci->displayName = _( "LDAP Query" );
- atci->iconXpm = addrsearchxpm;
- atci->maskXpm = addrsearchxpmmask;
- atci->iconXpmOpen = addrsearchxpm;
- atci->maskXpmOpen = addrsearchxpmmask;
atci->menuCommand = NULL;
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+ addrbookctl_build_icons(window);
+}
+
+void addressbook_reflect_prefs_pixmap_theme(void)
+{
+ if (addrbook.window)
+ addrbookctl_build_icons(addrbook.window);
}
/*
gint ifType;
gint i;
gchar *endptr = NULL;
- gboolean enabled;
+ /* gboolean enabled; */
AdapterInterface *adapter;
selectStr = g_strdup( ADDRESSBOOK_IFACE_SELECTION );
if( splitStr[i] ) {
/* g_print( "%d : %s\n", i, splitStr[i] ); */
ifType = strtol( splitStr[i], &endptr, 10 );
- enabled = TRUE;
+ /* enabled = TRUE;
if( *endptr ) {
if( strcmp( endptr, "/n" ) == 0 ) {
enabled = FALSE;
}
}
+ */
/* g_print( "\t%d : %s\n", ifType, enabled ? "yes" : "no" ); */
adapter = addrbookctl_find_interface( ifType );
if( adapter ) {
* This function is used by the Add sender to address book function.
*/
gboolean addressbook_add_contact(
- const gchar *name, const gchar *address, const gchar *remarks )
+ const gchar *name, const gchar *address, const gchar *remarks,
+ GdkPixbuf *picture )
{
debug_print( "addressbook_add_contact: name/address: %s - %s\n", name, address );
- if( addressadd_selection( _addressIndex_, name, address, remarks ) ) {
+ if( addressadd_selection( _addressIndex_, name, address, remarks, picture ) ) {
debug_print( "addressbook_add_contact - added\n" );
addressbook_refresh();
}
/*
* This function is used by the matcher dialog to select a book/folder.
*/
-gboolean addressbook_folder_selection( gchar **folderpath )
+gchar *addressbook_folder_selection( const gchar *folderpath)
{
AddressBookFile *book = NULL;
ItemFolder *folder = NULL;
- gchar *path;
+ gchar *path = NULL;
- g_return_val_if_fail( folderpath != NULL, FALSE);
+ cm_return_val_if_fail( folderpath != NULL, NULL);
- path = *folderpath;
- *folderpath = NULL;
- if ( addressbook_foldersel_selection( _addressIndex_, &book, &folder, path )
+ if ( addressbook_foldersel_selection( _addressIndex_, &book, &folder, folderpath )
&& book != NULL ) {
if ( folder != NULL) {
gchar *tmp = NULL;
g_free(oldtmp);
}
}
- *folderpath = g_strdup_printf("%s/%s", book->fileName, tmp);
+ path = g_strdup_printf("%s/%s", book->fileName, tmp);
g_free(tmp);
} else {
- *folderpath = g_strdup_printf("%s", book->fileName);
+ path = g_strdup_printf("%s", book->fileName);
}
- debug_print( "addressbook_foldersel: %s\n", *folderpath?*folderpath:"(null)");
- return (*folderpath != NULL);
+ debug_print( "addressbook_foldersel: %s\n", path?path:"(null)");
+ return path;
}
- return FALSE;
+ return NULL;
}
/* ***********************************************************************
if ( folderpath == NULL )
return FALSE;
- if ( strcasecmp(folderpath, _("Any")) == 0 || *folderpath == '\0' )
+ if ( strcasecmp(folderpath, "Any") == 0 || *folderpath == '\0' )
return TRUE;
/* split the folder path we've received, we'll try to match this path, subpath by
/**
* Import LDIF file.
*/
-static void addressbook_import_ldif_cb( void ) {
+static void addressbook_import_ldif_cb( GtkAction *action, gpointer data ) {
AddressDataSource *ds = NULL;
AdapterDSource *ads = NULL;
AddressBookFile *abf = NULL;
AdapterInterface *adapter;
- GtkCTreeNode *newNode;
+ GtkCMCTreeNode *newNode;
adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
if( adapter ) {
/**
* Import MUTT file.
*/
-static void addressbook_import_mutt_cb( void ) {
+static void addressbook_import_mutt_cb( GtkAction *action, gpointer data ) {
AddressDataSource *ds = NULL;
AdapterDSource *ads = NULL;
AddressBookFile *abf = NULL;
AdapterInterface *adapter;
- GtkCTreeNode *newNode;
+ GtkCMCTreeNode *newNode;
adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
if( adapter ) {
/**
* Import Pine file.
*/
-static void addressbook_import_pine_cb( void ) {
+static void addressbook_import_pine_cb( GtkAction *action, gpointer data ) {
AddressDataSource *ds = NULL;
AdapterDSource *ads = NULL;
AddressBookFile *abf = NULL;
AdapterInterface *adapter;
- GtkCTreeNode *newNode;
+ GtkCMCTreeNode *newNode;
adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
if( adapter ) {
AdapterDSource *ads = NULL;
AddressBookFile *abf = NULL;
AdapterInterface *adapter;
- GtkCTreeNode *newNode;
+ GtkCMCTreeNode *newNode;
abf = addrgather_dlg_execute(
folderItem, _addressIndex_, sourceInd, msgList );
newNode = addressbook_add_object(
adapter->treeNode,
ADDRESS_OBJECT(ads) );
+ if (newNode == NULL) {
+ g_message("error adding addressbook object\n");
+ }
}
}
/**
* Export HTML file.
*/
-static void addressbook_export_html_cb( void ) {
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+static void addressbook_export_html_cb( GtkAction *action, gpointer data ) {
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
AddressObject *obj;
AddressDataSource *ds = NULL;
AddrBookBase *adbase;
AddressCache *cache;
- GtkCTreeNode *node = NULL;
+ GtkCMCTreeNode *node = 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( GTK_CMCTREE_ROW(node)->level == 1 ) return;
+ obj = gtk_cmctree_node_get_row_data( ctree, node );
if( obj == NULL ) return;
ds = addressbook_find_datasource( node );
/**
* Export LDIF file.
*/
-static void addressbook_export_ldif_cb( void ) {
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+static void addressbook_export_ldif_cb( GtkAction *action, gpointer data ) {
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
AddressObject *obj;
AddressDataSource *ds = NULL;
AddrBookBase *adbase;
AddressCache *cache;
- GtkCTreeNode *node = NULL;
+ GtkCMCTreeNode *node = 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( GTK_CMCTREE_ROW(node)->level == 1 ) return;
+ obj = gtk_cmctree_node_get_row_data( ctree, node );
if( obj == NULL ) return;
ds = addressbook_find_datasource( node );
addressbook_exp_ldif( cache );
}
+static void addressbook_find_duplicates_cb(GtkAction *action, gpointer data)
+{
+ addrduplicates_find(GTK_WINDOW(addrbook.window));
+}
+
+static void addressbook_edit_custom_attr_cb(GtkAction *action, gpointer data)
+{
+ addressbook_custom_attr_edit();
+}
+
static void addressbook_start_drag(GtkWidget *widget, gint button,
GdkEvent *event,
void *data)
AddressDataSource *ds = NULL;
GList *cur;
- pobj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+ pobj = gtk_cmctree_node_get_row_data( GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected );
if( pobj == NULL ) return;
return;
}
- for(cur = GTK_CLIST(addrbook.clist)->selection; cur; cur = cur->next) {
- aio = (AddrItemObject *)gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.clist),
- GTK_CTREE_NODE(cur->data));
- while (aio && aio->type != ADDR_ITEM_PERSON) {
+ for(cur = GTK_CMCLIST(addrbook.clist)->selection; cur; cur = cur->next) {
+ aio = (AddrItemObject *)gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.clist),
+ GTK_CMCTREE_NODE(cur->data));
+ while (aio && aio->type != ITEMTYPE_PERSON) {
aio = aio->parent;
}
}
- if (aio && aio->type == ADDR_ITEM_PERSON) {
+ if (aio && aio->type == ITEMTYPE_PERSON) {
if( ds && ds->interface && ds->interface->readOnly)
gtk_selection_data_set(selection_data,
- selection_data->target, 8,
- "Dummy_addr_copy", 15);
+ gtk_selection_data_get_target(selection_data), 8,
+ (const guchar *)"Dummy_addr_copy", 15);
else
gtk_selection_data_set(selection_data,
- selection_data->target, 8,
- "Dummy_addr_move", 15);
+ gtk_selection_data_get_target(selection_data), 8,
+ (const guchar *)"Dummy_addr_move", 15);
}
}
guint time,
void *data)
{
+ GtkAllocation allocation;
+ GtkRequisition requisition;
gint row, column;
- GtkCTreeNode *node = NULL;
+ GtkCMCTreeNode *node = NULL;
gboolean acceptable = FALSE;
- gint height = addrbook.ctree->allocation.height;
- gint total_height = addrbook.ctree->requisition.height;
+ gtk_widget_get_allocation(GTK_WIDGET(addrbook.ctree), &allocation);
+ gint height = allocation.height;
+ gtk_widget_get_requisition(GTK_WIDGET(addrbook.ctree), &requisition);
+ gint total_height = requisition.height;
GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(addrbook.ctree_swin));
- gfloat vpos = pos->value;
+ gfloat vpos = gtk_adjustment_get_value(pos);
- if (gtk_clist_get_selection_info
- (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
+ if (gtk_cmclist_get_selection_info
+ (GTK_CMCLIST(widget), x - 24, y - 24, &row, &column)) {
- if (y > height - 24 && height + vpos < total_height)
+ if (y > height - 24 && height + vpos < total_height) {
gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
-
- if (y < 24 && y > 0)
+ gtk_adjustment_changed(pos);
+ }
+ if (y < 24 && y > 0) {
gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
-
- node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
+ gtk_adjustment_changed(pos);
+ }
+ node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
if (node != NULL) {
- AddressObject *obj = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node );
+ AddressObject *obj = gtk_cmctree_node_get_row_data(GTK_CMCTREE(widget), node );
if( obj->type == ADDR_ITEM_FOLDER
|| obj->type == ADDR_ITEM_GROUP)
acceptable = TRUE;
(G_OBJECT(widget),
G_CALLBACK(addressbook_tree_selected), NULL);
gdk_drag_status(context,
- (context->actions == GDK_ACTION_COPY ?
+ (gdk_drag_context_get_actions(context) == GDK_ACTION_COPY ?
GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
} else {
gdk_drag_status(context, 0, time);
}
-
return acceptable;
}
void *pdata)
{
gint row, column;
- GtkCTreeNode *node;
- GtkCTreeNode *lastopened = addrbook.opened;
+ GtkCMCTreeNode *node;
+ GtkCMCTreeNode *lastopened = addrbook.opened;
- if (!strncmp(data->data, "Dummy_addr", 10)) {
- if (gtk_clist_get_selection_info
- (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0) {
+ if (!strncmp(gtk_selection_data_get_data(data), "Dummy_addr", 10)) {
+ if (gtk_cmclist_get_selection_info
+ (GTK_CMCLIST(widget), x - 24, y - 24, &row, &column) == 0) {
return;
}
- node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
- if( !node || !gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), node))
+ node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
+ if( !node || !gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree), node))
return;
- gtk_clist_freeze(GTK_CLIST(addrbook.clist));
- if (drag_context->action == GDK_ACTION_COPY ||
- !strcmp(data->data, "Dummy_addr_copy"))
- addressbook_clip_copy_cb();
+ gtk_cmclist_freeze(GTK_CMCLIST(addrbook.clist));
+ if (gdk_drag_context_get_selected_action(drag_context) == GDK_ACTION_COPY ||
+ !strcmp(gtk_selection_data_get_data(data), "Dummy_addr_copy"))
+ addressbook_clip_copy_cb(NULL, NULL);
else
- addressbook_clip_cut_cb();
+ addressbook_clip_cut_cb(NULL, NULL);
gtk_sctree_select( GTK_SCTREE(addrbook.ctree), node);
- addressbook_clip_paste_cb();
+ addressbook_clip_paste_cb(NULL,NULL);
gtk_sctree_select( GTK_SCTREE(addrbook.ctree), lastopened);
- gtk_clist_thaw(GTK_CLIST(addrbook.clist));
+ gtk_cmclist_thaw(GTK_CMCLIST(addrbook.clist));
gtk_drag_finish(drag_context, TRUE, TRUE, time);
}
}
/*
* End of Source.
*/
-
projects / claws.git / blobdiff