/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2007 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2011 Match Grun 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
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
#include "gtkutils.h"
#include "stock_pixmap.h"
#include "prefs_common.h"
#include "prefs_gtk.h"
#include "addressadd.h"
-#include "addritem.h"
-#include "addrbook.h"
-#include "addrindex.h"
+#ifndef USE_NEW_ADDRBOOK
+ #include "addritem.h"
+ #include "addrbook.h"
+ #include "addrindex.h"
+ #include "ldapserver.h"
+ #include "ldapupdate.h"
+#else
+ #include "addressbook-dbus.h"
+#endif
#include "manage_window.h"
-#include "ldapserver.h"
-#include "ldapupdate.h"
#include "alertpanel.h"
+#ifndef USE_NEW_ADDRBOOK
typedef struct {
AddressBookFile *book;
ItemFolder *folder;
} FolderInfo;
+#else
+typedef struct {
+ gchar* book;
+} FolderInfo;
+#endif
static struct _AddressAdd_dlg {
GtkWidget *window;
FolderInfo *fiSelected;
} addressadd_dlg;
-static GdkPixmap *folderXpm;
-static GdkBitmap *folderXpmMask;
-static GdkPixmap *bookXpm;
-static GdkBitmap *bookXpmMask;
+static GdkPixbuf *folderXpm;
+static GdkPixbuf *bookXpm;
static gboolean addressadd_cancelled;
+#ifndef USE_NEW_ADDRBOOK
static FolderInfo *addressadd_create_folderinfo( AddressBookFile *abf, ItemFolder *folder )
{
FolderInfo *fi = g_new0( FolderInfo, 1 );
fi->folder = folder;
return fi;
}
+#else
+static FolderInfo *addressadd_create_folderinfo(gchar* book) {
+ FolderInfo *fi = g_new0( FolderInfo, 1 );
+ fi->book = book;
+ return fi;
+}
+#endif
+#ifndef USE_NEW_ADDRBOOK
static void addressadd_free_folderinfo( FolderInfo *fi ) {
fi->book = NULL;
fi->folder = NULL;
g_free( fi );
}
+#else
+static void addressadd_free_folderinfo( FolderInfo *fi ) {
+ fi->book = NULL;
+ g_free( fi );
+}
+#endif
static gint addressadd_delete_event( GtkWidget *widget, GdkEventAny *event, gboolean *cancelled ) {
addressadd_cancelled = TRUE;
}
static gboolean addressadd_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
addressadd_cancelled = TRUE;
gtk_main_quit();
}
static void addressadd_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.addressaddwin_width = allocation->width;
prefs_common.addressaddwin_height = allocation->height;
gtk_container_set_border_width( GTK_CONTAINER(window), VBOX_BORDER );
gtk_window_set_title( GTK_WINDOW(window), _("Add to address book") );
gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
- gtk_window_set_modal( GTK_WINDOW(window), TRUE );
g_signal_connect( G_OBJECT(window), "delete_event",
G_CALLBACK(addressadd_delete_event), NULL );
g_signal_connect( G_OBJECT(window), "key_press_event",
tree_folder = gtk_sctree_new_with_titles( 1, 0, titles );
gtk_container_add( GTK_CONTAINER(tree_win), tree_folder );
gtk_cmclist_column_titles_show( GTK_CMCLIST(tree_folder) );
- if (prefs_common.enable_dotted_lines) {
- gtk_cmctree_set_line_style(GTK_CMCTREE(tree_folder), GTK_CMCTREE_LINES_DOTTED);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(tree_folder),
- GTK_CMCTREE_EXPANDER_SQUARE);
- } else {
- gtk_cmctree_set_line_style(GTK_CMCTREE(tree_folder), GTK_CMCTREE_LINES_NONE);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(tree_folder),
+ gtk_cmctree_set_line_style(GTK_CMCTREE(tree_folder), GTK_CMCTREE_LINES_NONE);
+ gtk_cmctree_set_expander_style(GTK_CMCTREE(tree_folder),
GTK_CMCTREE_EXPANDER_TRIANGLE);
- }
gtk_sctree_set_stripes(GTK_SCTREE(tree_folder), prefs_common.use_stripes_everywhere);
gtk_cmclist_set_selection_mode( GTK_CMCLIST(tree_folder), GTK_SELECTION_BROWSE );
gtk_cmctree_set_indent( GTK_CMCTREE(tree_folder), CTREE_INDENT );
gtk_widget_show_all( window );
- stock_pixmap_gdk( window, STOCK_PIXMAP_BOOK, &bookXpm, &bookXpmMask );
- stock_pixmap_gdk( window, STOCK_PIXMAP_DIR_OPEN,
- &folderXpm, &folderXpmMask );
+ stock_pixbuf_gdk( window, STOCK_PIXMAP_BOOK, &bookXpm );
+ stock_pixbuf_gdk( window, STOCK_PIXMAP_DIR_OPEN,
+ &folderXpm );
}
+#ifndef USE_NEW_ADDRBOOK
static void addressadd_load_folder( GtkCMCTreeNode *parentNode, ItemFolder *parentFolder,
FolderInfo *fiParent )
{
fName = g_strdup( ADDRITEM_NAME(folder) );
name = &fName;
node = gtk_sctree_insert_node( tree, parentNode, NULL, name, FOLDER_SPACING,
- folderXpm, folderXpmMask, folderXpm, folderXpmMask,
+ folderXpm, folderXpm,
FALSE, TRUE );
g_free( fName );
fi = addressadd_create_folderinfo( fiParent->book, folder );
gtk_cmctree_node_set_row_data_full( tree, node, fi,
- ( GtkDestroyNotify ) addressadd_free_folderinfo );
+ ( GDestroyNotify ) addressadd_free_folderinfo );
addressadd_load_folder( node, folder, fi );
list = g_list_next( list );
}
gtk_cmclist_clear( GTK_CMCLIST( tree ) );
list = addrindex_get_interface_list( addrIndex );
while( list ) {
- AddressInterface *interface = list->data;
- if( interface->type == ADDR_IF_BOOK ||
- interface->type == ADDR_IF_LDAP ) {
- nodeDS = interface->listSource;
+ AddressInterface *ainterface = list->data;
+ if( ainterface->type == ADDR_IF_BOOK ||
+ ainterface->type == ADDR_IF_LDAP ) {
+ nodeDS = ainterface->listSource;
while( nodeDS ) {
ds = nodeDS->data;
dsName = g_strdup( addrindex_ds_get_name( ds ) );
name = &dsName;
node = gtk_cmctree_insert_node( tree, NULL, NULL,
name, FOLDER_SPACING, bookXpm,
- bookXpmMask, bookXpm, bookXpmMask,
+ bookXpm,
FALSE, TRUE );
g_free( dsName );
fi = addressadd_create_folderinfo( abf, NULL );
gtk_cmctree_node_set_row_data_full( tree, node, fi,
- ( GtkDestroyNotify ) addressadd_free_folderinfo );
+ ( GDestroyNotify ) addressadd_free_folderinfo );
rootFolder = addrindex_ds_get_root_folder( ds );
addressadd_load_folder( node, rootFolder, fi );
list = g_list_next( list );
}
}
+#else
+static void addressadd_load_data() {
+ GSList *list;
+ gchar *name;
+ GtkCMCTree *tree = GTK_CMCTREE(addressadd_dlg.tree_folder);
+ GtkCMCTreeNode *node;
+ FolderInfo *fi = NULL;
+ GError* error = NULL;
+
+ gtk_cmclist_clear(GTK_CMCLIST(tree));
+ list = addressbook_dbus_get_books(&error);
+ for (; list; list = g_slist_next(list)) {
+ name = (gchar *) list->data;
+ node = gtk_cmctree_insert_node(tree, NULL, NULL,
+ &name, FOLDER_SPACING, bookXpm,
+ bookXpm, FALSE, TRUE);
+ fi = addressadd_create_folderinfo(name);
+ gtk_cmctree_node_set_row_data_full(tree, node, fi,
+ ( GDestroyNotify ) addressadd_free_folderinfo );
+ }
+}
+#endif
+#ifndef USE_NEW_ADDRBOOK
gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name,
const gchar *address, const gchar *remarks, GdkPixbuf *picture ) {
+#else
+gboolean addressadd_selection(const gchar *name, const gchar *address,
+ const gchar *remarks, GdkPixbuf *picture ) {
+#endif
gboolean retVal = FALSE;
+#ifndef USE_NEW_ADDRBOOK
ItemPerson *person = NULL;
+#endif
FolderInfo *fi = NULL;
addressadd_cancelled = FALSE;
if( ! addressadd_dlg.window ) addressadd_create();
- gtk_widget_grab_focus(addressadd_dlg.ok_btn);
- gtk_widget_show(addressadd_dlg.window);
- manage_window_set_transient(GTK_WINDOW(addressadd_dlg.window));
addressadd_dlg.fiSelected = NULL;
+#ifndef USE_NEW_ADDRBOOK
addressadd_load_data( addrIndex );
+#else
+ addressadd_load_data();
+#endif
gtk_cmclist_select_row( GTK_CMCLIST( addressadd_dlg.tree_folder ), 0, 0 );
gtk_widget_show(addressadd_dlg.window);
+ gtk_window_set_modal(GTK_WINDOW(addressadd_dlg.window), TRUE);
+ gtk_widget_grab_focus(addressadd_dlg.ok_btn);
+
+ manage_window_set_transient(GTK_WINDOW(addressadd_dlg.window));
gtk_entry_set_text( GTK_ENTRY(addressadd_dlg.entry_name ), "" );
gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_address ), "" );
}
gtk_main();
gtk_widget_hide( addressadd_dlg.window );
-
+ gtk_window_set_modal(GTK_WINDOW(addressadd_dlg.window), FALSE);
if( ! addressadd_cancelled ) {
if( addressadd_dlg.fiSelected ) {
gchar *returned_name;
fi = addressadd_dlg.fiSelected;
+#ifndef USE_NEW_ADDRBOOK
person = addrbook_add_contact( fi->book, fi->folder,
returned_name,
address,
addritem_person_set_picture( person, ADDRITEM_ID(person) ) ;
g_free( name );
}
+#else
+ ContactData* contact = g_new0(ContactData, 1);
+ GError* error = NULL;
+
+ if (returned_name)
+ contact->cn = g_strdup(returned_name);
+ else
+ contact->cn = g_strdup(address);
+
+ contact->name = g_strdup(returned_name);
+ contact->email = g_strdup(address);
+ contact->remarks = g_strdup(returned_remarks);
+ contact->book = g_strdup(fi->book);
+ contact->picture = picture;
+
+ if (addressbook_dbus_add_contact(contact, &error) == 0) {
+ debug_print("Added to addressbook:\n%s\n%s\n%s\n%s\n",
+ returned_name, address, returned_remarks, fi->book);
+ retVal = TRUE;
+ }
+ else {
+ retVal = FALSE;
+ if (error) {
+ GtkWidget* dialog = gtk_message_dialog_new (
+ GTK_WINDOW(addressadd_dlg.window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "%s", error->message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ g_error_free(error);
+ }
+ }
+ contact_data_free(&contact);
+#endif
#ifdef USE_LDAP
if (fi->book->type == ADBOOKTYPE_LDAP) {
LdapServer *server = (LdapServer *) fi->book;
#endif
g_free(returned_name);
g_free(returned_remarks);
+#ifndef USE_NEW_ADDRBOOK
if( person ) retVal = TRUE;
+#endif
}
}
projects / claws.git / blobdiff