commit 30cf4486e2729659609146dfc746d8d50012f239
parent e89ae048d98669ce0b04d99d4d179c10d3054d46
Author: Oliver Lowe <o@olowe.co>
Date: Wed, 13 Aug 2025 12:54:55 +1000
Edit person dialogue in the file where it's called
Diffstat:
5 files changed, 51 insertions(+), 106 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -43,7 +43,6 @@ abook_source = \
addrduplicates.c \
addrmerge.c \
editaddress.c \
- editaddress_other_attributes_ldap.c \
editbook.c \
editgroup.c \
editvcard.c \
@@ -64,7 +63,6 @@ abook_headers = \
addrduplicates.h \
addrmerge.h \
editaddress.h \
- editaddress_other_attributes_ldap.h \
editbook.h \
editgroup.h \
editvcard.h \
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -40,12 +40,60 @@
#include "filesel.h"
#include "codeconv.h"
#include "editaddress.h"
-#include "editaddress_other_attributes_ldap.h"
#include "prefs_common.h"
#include "menu.h"
#include "combobox.h"
#include "file-utils.h"
+enum {
+ ATTRIB_COL_NAME,
+ ATTRIB_COL_VALUE,
+ ATTRIB_COL_PTR,
+ ATTRIB_N_COLS
+};
+
+typedef struct _PersonEdit_dlg PersonEditDlg;
+struct _PersonEdit_dlg {
+ GtkWidget *container;
+ GtkWidget *notebook;
+ GtkWidget *ok_btn;
+ GtkWidget *cancel_btn;
+ GtkWidget *statusbar; /* used when prefs_common.addressbook_use_editaddress_dialog is TRUE */
+ GtkWidget *title; /* used when prefs_common.addressbook_use_editaddress_dialog is FALSE */
+ gint status_cid;
+
+ /* User data tab */
+ GtkWidget *image;
+ gboolean picture_set;
+ GtkWidget *entry_name;
+ GtkWidget *entry_first;
+ GtkWidget *entry_last;
+ GtkWidget *entry_nick;
+
+ /* EMail data tab */
+ GtkWidget *entry_email;
+ GtkWidget *entry_alias;
+ GtkWidget *entry_remarks;
+ GtkWidget *view_email;
+ GtkWidget *email_up;
+ GtkWidget *email_down;
+ GtkWidget *email_del;
+ GtkWidget *email_mod;
+ GtkWidget *email_add;
+
+ /* Attribute data tab */
+ GtkWidget *entry_atname;
+ GtkWidget *entry_atvalue;
+ GtkWidget *view_attrib;
+ GtkWidget *attrib_add;
+ GtkWidget *attrib_del;
+ GtkWidget *attrib_mod;
+
+ gboolean editNew;
+ gboolean read_only;
+ gboolean ldap;
+};
+
/* transient data */
static struct _PersonEdit_dlg personeditdlg;
static AddressBookFile *current_abf = NULL;
diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c
@@ -1,22 +0,0 @@
-/*
- * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 Michael Rasmussen 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#include "claws-features.h"
-#endif
diff --git a/src/editaddress_other_attributes_ldap.h b/src/editaddress_other_attributes_ldap.h
@@ -1,81 +0,0 @@
-/*
- * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Michael Rasmussen 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/*
- * Edit address item data.
- */
-
-#ifndef __EDITADDRESS_OTHER_ATTRIBUTES_LDAP_H__
-#define __EDITADDRESS_OTHER_ATTRIBUTES_LDAP_H__
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-enum {
- ATTRIB_COL_NAME,
- ATTRIB_COL_VALUE,
- ATTRIB_COL_PTR,
- ATTRIB_N_COLS
-};
-
-typedef struct _PersonEdit_dlg PersonEditDlg;
-struct _PersonEdit_dlg {
- GtkWidget *container;
- GtkWidget *notebook;
- GtkWidget *ok_btn;
- GtkWidget *cancel_btn;
- GtkWidget *statusbar; /* used when prefs_common.addressbook_use_editaddress_dialog is TRUE */
- GtkWidget *title; /* used when prefs_common.addressbook_use_editaddress_dialog is FALSE */
- gint status_cid;
-
- /* User data tab */
- GtkWidget *image;
- gboolean picture_set;
- GtkWidget *entry_name;
- GtkWidget *entry_first;
- GtkWidget *entry_last;
- GtkWidget *entry_nick;
-
- /* EMail data tab */
- GtkWidget *entry_email;
- GtkWidget *entry_alias;
- GtkWidget *entry_remarks;
- GtkWidget *view_email;
- GtkWidget *email_up;
- GtkWidget *email_down;
- GtkWidget *email_del;
- GtkWidget *email_mod;
- GtkWidget *email_add;
-
- /* Attribute data tab */
- GtkWidget *entry_atname;
- GtkWidget *entry_atvalue;
- GtkWidget *view_attrib;
- GtkWidget *attrib_add;
- GtkWidget *attrib_del;
- GtkWidget *attrib_mod;
-
- gboolean editNew;
- gboolean read_only;
- gboolean ldap;
-};
-
-#endif /* __EDITADDRESS_OTHER_ATTRIBUTES_LDAP_H__ */
diff --git a/src/prefs_other.c b/src/prefs_other.c
@@ -485,6 +485,8 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON (vbox2, checkbtn_askonfilter,
_("Ask about account specific filtering rules when "
"filtering manually"));
+ PACK_CHECK_BUTTON (vbox2, checkbtn_real_time_sync,
+ _("Synchronise offline folders as soon as possible"));
hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox1);
