/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 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 "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;
void addressbook_set_target_compose(Compose *target)
{
addrbook.target_compose = target;
- addressbook_button_set_sensitive();
}
Compose *addressbook_get_target_compose(void)
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;
/* Address index */
ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
- GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[0].button,
- GTK_CAN_FOCUS);
+ gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[0].button, FALSE);
gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), 0, COL_FOLDER_WIDTH);
- if (prefs_common.enable_dotted_lines) {
- gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_DOTTED);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
- GTK_CMCTREE_EXPANDER_SQUARE);
- } else {
- 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_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),
clist = gtk_sctree_new_with_titles(N_LIST_COLS, 0, list_titles);
gtk_container_add(GTK_CONTAINER(clist_swin), clist);
gtk_cmclist_set_selection_mode(GTK_CMCLIST(clist), GTK_SELECTION_EXTENDED);
- if (prefs_common.enable_dotted_lines) {
- gtk_cmctree_set_line_style(GTK_CMCTREE(clist), GTK_CMCTREE_LINES_DOTTED);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(clist),
- GTK_CMCTREE_EXPANDER_SQUARE);
- } else {
- 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_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,
G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
for (i = 0; i < N_LIST_COLS; i++)
- GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(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);
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);
adapter->treeNode =
gtk_sctree_insert_node( GTK_CMCTREE(ctree),
NULL, NULL, &text, FOLDER_SPACING,
- interfacexpm, interfacexpmmask,
- interfacexpm, interfacexpmmask,
+ interfacexpm,
+ interfacexpm,
FALSE, FALSE );
cm_menu_set_sensitive_full(ui_manager, atci->menuCommand, adapter->haveLibrary );
gtk_cmctree_node_set_row_data_full(
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)
addressbook_status_show( addressbook_msgbuf );
}
-static void addressbook_button_set_sensitive(void)
-{
- 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);
-}
-
static void addressbook_edit_clicked(GtkButton *button, gpointer data)
{
addressbook_edit_address_cb(NULL, NULL);
gboolean refreshList = FALSE;
pobj = gtk_cmctree_node_get_row_data(ctree, addrbook.opened );
- g_return_if_fail(pobj != NULL);
+ cm_return_if_fail(pobj != NULL);
/* Test whether anything selected for deletion */
nodeList = addrbook.listSelected;
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;
}
aio = ( AddrItemObject * ) item->addressItem;
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_GROUP ) {
+ if( aio->type == ITEMTYPE_GROUP ) {
groups = g_list_prepend(groups, item);
}
- else if( aio->type == ADDR_ITEM_PERSON ) {
+ else if( aio->type == ITEMTYPE_PERSON ) {
persons = g_list_prepend(persons, item);
}
}
aio = ( AddrItemObject * ) item->addressItem;
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_EMAIL ) {
+ 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))) {
aio = ( AddrItemObject * ) item->addressItem;
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_GROUP ) {
+ if( aio->type == ITEMTYPE_GROUP ) {
ItemGroup *item = ( ItemGroup * ) aio;
GtkCMCTreeNode *nd = NULL;
nd = addressbook_find_group_node( addrbook.opened, item );
aio = ( AddrItemObject * ) item->addressItem;
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_PERSON ) {
+ if( aio->type == ITEMTYPE_PERSON ) {
ItemPerson *item = ( ItemPerson * ) aio;
item->status = DELETE_ENTRY;
addressbook_folder_remove_one_person( clist, item );
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_EMAIL ) {
ItemEMail *sitem = ( ItemEMail * ) aio;
ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(sitem);
sitem = addrbook_person_remove_email( abf, person, sitem );
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 );
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 );
}
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 );
}
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
cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/BrowseEntry", canBrowse );
#endif
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 );
}
if (obj->type == ADDR_INTERFACE) {
AdapterInterface *adapter = ADAPTER_INTERFACE(obj);
- if( !adapter )
- goto just_set_sens;
iface = adapter->interface;
if( !iface )
goto just_set_sens;
GtkCMCTreeNode *nn;
nn = addressbook_node_add_folder(
addrbook.treeSelected, ds, folder, ADDR_ITEM_FOLDER );
+ 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);
if( group ) {
GtkCMCTreeNode *nn;
nn = addressbook_node_add_group( addrbook.treeSelected, ds, group );
+ 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);
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_cmctree_get_node_info(ctree, node, text, &spacing,
- &pix_cl, &mask_cl, &pix_op, &mask_op,
+ &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);
}
if( GTK_CMCTREE_ROW(node)->level == 1 ) return;
obj = gtk_cmctree_node_get_row_data( ctree, node );
- g_return_if_fail(obj != NULL);
+ cm_return_if_fail(obj != NULL);
if( obj->type == ADDR_DATASOURCE ) {
ads = ADAPTER_DSOURCE(obj);
/* 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' ?" ),
if( obj->type == ADDR_DATASOURCE ) {
/* Remove node from tree */
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;
ItemPerson *person;
ItemFolder *folder = NULL;
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
GtkCMCTreeNode *parentNode;
ds = addressbook_find_datasource( GTK_CMCTREE_NODE( addrbook.treeSelected ) );
if( ds == NULL ) return;
pobj = gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected);
ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
- abf = ds->rawDataSource;
+ 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) {
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
GtkCMCTreeNode *parentNode;
ds = addressbook_find_datasource( GTK_CMCTREE_NODE( addrbook.treeSelected ) );
if( ds == NULL ) return;
return;
pobj = gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected);
ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
- abf = ds->rawDataSource;
+ 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);
#ifdef USE_LDAP
AddressBookFile *abf = addressbook_get_book_file();
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
addritem_person_set_nick_name( person, ADDRITEM_NAME(person));
}
if( addrbook.listSelected == NULL ) return;
obj = gtk_cmctree_node_get_row_data( clist, addrbook.listSelected );
- g_return_if_fail(obj != NULL);
+ cm_return_if_fail(obj != NULL);
ctree = GTK_CMCTREE( addrbook.ctree );
pobj = gtk_cmctree_node_get_row_data( ctree, addrbook.treeSelected );
(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;
}
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_cmctree_node_set_row_data( clist, nodeEMail, email );
g_free( 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) {
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;
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_cmctree_node_set_row_data(clist, nodeEMail, email );
}
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_cmctree_node_set_row_data(clist, nodePerson, person );
}
static void addressbook_folder_remove_one_person( GtkCMCTree *clist, ItemPerson *person ) {
GtkCMCTreeNode *node;
- gint row;
if( person == NULL ) return;
node = gtk_cmctree_find_by_row_data( clist, NULL, person );
- row = gtk_cmclist_find_row_from_data( GTK_CMCLIST(clist), person );
if( node ) {
addressbook_folder_remove_node( clist, node );
}
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_cmctree_node_set_row_data(clist, nodeGroup, group );
gtk_sctree_sort_node(clist, NULL);
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_CMCTREE_ROW(node)->level < 2 ) return NULL;
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 {
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_cmctree_expand( ctree, node );
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_cmctree_node_get_row_data(ctree, node);
- g_return_val_if_fail(pobj != NULL, NULL);
+ 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_cmctree_node_set_row_data_full( ctree, added, obj,
addressbook_free_treenode );
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_cmctree_node_set_row_data_full( ctree, newNode, adapter,
addressbook_free_treenode );
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_cmctree_node_set_row_data_full( ctree, newNode, adapter,
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;
}
AddressDataSource *ds, gchar *searchTerm,
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 );
return;
iface = ds->interface;
- if(! iface->haveLibrary )
+ if(!iface || !iface->haveLibrary )
return;
person = NULL;
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\n", 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 = "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->treeExpand = FALSE;
atci->treeLeaf = TRUE;
atci->displayName = _( "Email Address" );
- atci->iconXpm = addressxpm;
- atci->maskXpm = addressxpmmask;
- atci->iconXpmOpen = addressxpm;
- atci->maskXpmOpen = addressxpmmask;
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 = "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 = "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 = "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 ) {
ItemFolder *folder = NULL;
gchar *path = NULL;
- g_return_val_if_fail( folderpath != NULL, NULL);
+ cm_return_val_if_fail( folderpath != NULL, NULL);
if ( addressbook_foldersel_selection( _addressIndex_, &book, &folder, folderpath )
&& book != NULL ) {
newNode = addressbook_add_object(
adapter->treeNode,
ADDRESS_OBJECT(ads) );
+ if (newNode == NULL) {
+ g_message("error adding addressbook object\n");
+ }
}
}
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 != ADDR_ITEM_PERSON) {
+ 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,
+ 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,
+ 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;
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_cmclist_get_selection_info
(GTK_CMCLIST(widget), x - 24, y - 24, &row, &column)) {
(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);
GtkCMCTreeNode *node;
GtkCMCTreeNode *lastopened = addrbook.opened;
- if (!strncmp(data->data, "Dummy_addr", 10)) {
+ 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;
return;
gtk_cmclist_freeze(GTK_CMCLIST(addrbook.clist));
- if (drag_context->action == GDK_ACTION_COPY ||
- !strcmp(data->data, "Dummy_addr_copy"))
+ 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(NULL, NULL);